~ubuntu-branches/debian/sid/swt-gtk/sid : revision 8

1

diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/eclipse/swt/accessibility/AccessibleFactory.java

2

--- x86/org/eclipse/swt/accessibility/AccessibleFactory.java 2009-05-29 17:30:30.000000000 -0400

3

+++ x86_64/org/eclipse/swt/accessibility/AccessibleFactory.java 2009-09-17 08:48:16.000000000 -0400

4

@@ -18,16 +18,16 @@

5

import org.eclipse.swt.*;

6

7

class AccessibleFactory {

8

- int /*long*/ handle;

9

- int /*long*/ objectParentType;

10

- int /*long*/ widgetTypeName;

11

+ long /*int*/ handle;

12

+ long /*int*/ objectParentType;

13

+ long /*int*/ widgetTypeName;

14

Callback atkObjectFactoryCB_create_accessible;

15

Callback gTypeInfo_base_init_factory;

16

Hashtable accessibles = new Hashtable (9);

17

18

static final Hashtable Types = new Hashtable (9);

19

static final Hashtable Factories = new Hashtable (9);

20

- static final int /*long*/ DefaultParentType = OS.g_type_from_name (Converter.wcsToMbcs (null, "GtkAccessible", true)); //$NON-NLS-1$

21

+ static final long /*int*/ DefaultParentType = OS.g_type_from_name (Converter.wcsToMbcs (null, "GtkAccessible", true)); //$NON-NLS-1$

22

static final byte[] FACTORY_PARENTTYPENAME = Converter.wcsToMbcs (null, "AtkObjectFactory", true); //$NON-NLS-1$

23

static final byte[] SWT_TYPE_PREFIX = Converter.wcsToMbcs (null, "SWT", false); //$NON-NLS-1$

24

static final byte[] CHILD_TYPENAME = Converter.wcsToMbcs (null, "Child", false); //$NON-NLS-1$

25

@@ -83,12 +83,12 @@

26

static final Callback InitSelectionIfaceCB;

27

static final Callback InitTextIfaceCB;

28

/* interface definitions */

29

- static int /*long*/ ObjectIfaceDefinition;

30

- static final int /*long*/ ActionIfaceDefinition;

31

- static final int /*long*/ ComponentIfaceDefinition;

32

- static final int /*long*/ HypertextIfaceDefinition;

33

- static final int /*long*/ SelectionIfaceDefinition;

34

- static final int /*long*/ TextIfaceDefinition;

35

+ static long /*int*/ ObjectIfaceDefinition;

36

+ static final long /*int*/ ActionIfaceDefinition;

37

+ static final long /*int*/ ComponentIfaceDefinition;

38

+ static final long /*int*/ HypertextIfaceDefinition;

39

+ static final long /*int*/ SelectionIfaceDefinition;

40

+ static final long /*int*/ TextIfaceDefinition;

41

static {

42

AtkActionCB_get_keybinding = newCallback (AccessibleObject.class, "atkAction_get_keybinding", 2); //$NON-NLS-1$

43

AtkActionCB_get_name = newCallback (AccessibleObject.class, "atkAction_get_name", 2); //$NON-NLS-1$

44

@@ -158,7 +158,7 @@

45

return callback;

46

}

47

48

- private AccessibleFactory (int /*long*/ widgetType) {

49

+ private AccessibleFactory (long /*int*/ widgetType) {

50

super ();

51

widgetTypeName = OS.g_type_name (widgetType);

52

int widgetTypeNameLength = OS.strlen (widgetTypeName) + 1;

53

@@ -169,40 +169,40 @@

54

System.arraycopy (buffer, 0, factoryName, FACTORY_TYPENAME.length - 1, widgetTypeNameLength);

55

if (OS.g_type_from_name (factoryName) == 0) {

56

/* register the factory */

57

- int /*long*/ registry = ATK.atk_get_default_registry ();

58

- int /*long*/ previousFactory = ATK.atk_registry_get_factory (registry, widgetType);

59

+ long /*int*/ registry = ATK.atk_get_default_registry ();

60

+ long /*int*/ previousFactory = ATK.atk_registry_get_factory (registry, widgetType);

61

objectParentType = ATK.atk_object_factory_get_accessible_type (previousFactory);

62

if (objectParentType == 0) objectParentType = DefaultParentType;

63

- int /*long*/ factoryParentType = OS.g_type_from_name (FACTORY_PARENTTYPENAME);

64

+ long /*int*/ factoryParentType = OS.g_type_from_name (FACTORY_PARENTTYPENAME);

65

gTypeInfo_base_init_factory = new Callback (this, "gTypeInfo_base_init_factory", 1); //$NON-NLS-1$

66

- int /*long*/ address = gTypeInfo_base_init_factory.getAddress ();

67

+ long /*int*/ address = gTypeInfo_base_init_factory.getAddress ();

68

if (address == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);

69

GTypeInfo typeInfo = new GTypeInfo ();

70

typeInfo.base_init = address;

71

typeInfo.class_size = (short)ATK.AtkObjectFactoryClass_sizeof ();

72

typeInfo.instance_size = (short)ATK.AtkObjectFactory_sizeof ();

73

- int /*long*/ info = OS.g_malloc (GTypeInfo.sizeof);

74

+ long /*int*/ info = OS.g_malloc (GTypeInfo.sizeof);

75

OS.memmove (info, typeInfo, GTypeInfo.sizeof);

76

- int /*long*/ swtFactoryType = OS.g_type_register_static (factoryParentType, factoryName, info, 0);

77

+ long /*int*/ swtFactoryType = OS.g_type_register_static (factoryParentType, factoryName, info, 0);

78

ATK.atk_registry_set_factory_type (registry, widgetType, swtFactoryType);

79

handle = ATK.atk_registry_get_factory (registry, widgetType);

80

}

81

}

82

83

void addAccessible (Accessible accessible) {

84

- int /*long*/ controlHandle = accessible.getControlHandle ();

85

+ long /*int*/ controlHandle = accessible.getControlHandle ();

86

accessibles.put (new LONG (controlHandle), accessible);

87

ATK.atk_object_factory_create_accessible (handle, controlHandle);

88

}

89

90

- int /*long*/ atkObjectFactory_create_accessible (int /*long*/ widget) {

91

+ long /*int*/ atkObjectFactory_create_accessible (long /*int*/ widget) {

92

Accessible accessible = (Accessible) accessibles.get (new LONG (widget));

93

if (accessible == null) {

94

/*

95

* we don't care about this control, so create it with the parent's

96

* type so that its accessibility callbacks will not pass though here

97

*/

98

- int /*long*/ result = OS.g_object_new (objectParentType, 0);

99

+ long /*int*/ result = OS.g_object_new (objectParentType, 0);

100

ATK.atk_object_initialize (result, widget);

101

return result;

102

}

103

@@ -213,21 +213,21 @@

104

int typeNameLength = OS.strlen (widgetTypeName);

105

byte[] buffer = new byte [typeNameLength];

106

OS.memmove (buffer, widgetTypeName, typeNameLength);

107

- int /*long*/ type = getType (buffer, accessible, objectParentType, ACC.CHILDID_SELF);

108

+ long /*int*/ type = getType (buffer, accessible, objectParentType, ACC.CHILDID_SELF);

109

AccessibleObject object = new AccessibleObject (type, widget, accessible, objectParentType, false);

110

accessible.accessibleObject = object;

111

return object.handle;

112

}

113

114

- static int /*long*/ getChildType (Accessible accessible, int childIndex) {

115

+ static long /*int*/ getChildType (Accessible accessible, int childIndex) {

116

return getType (CHILD_TYPENAME, accessible, DefaultParentType, childIndex);

117

}

118

119

- static int /*long*/ getDefaultParentType () {

120

+ static long /*int*/ getDefaultParentType () {

121

return DefaultParentType;

122

}

123

124

- static int /*long*/ getType (byte[] widgetTypeName, Accessible accessible, int /*long*/ parentType, int childId) {

125

+ static long /*int*/ getType (byte[] widgetTypeName, Accessible accessible, long /*int*/ parentType, int childId) {

126

AccessibleControlEvent event = new AccessibleControlEvent (accessible);

127

event.childID = childId;

128

AccessibleControlListener[] listeners = accessible.getControlListeners ();

129

@@ -270,13 +270,13 @@

130

if (selection) swtTypeName += "Selection"; //$NON-NLS-1$

131

if (text) swtTypeName += "Text"; //$NON-NLS-1$

132

133

- int /*long*/ type = 0;

134

+ long /*int*/ type = 0;

135

LONG typeInt = (LONG)Types.get (swtTypeName);

136

if (typeInt != null) {

137

type = typeInt.value;

138

} else {

139

/* define the type */

140

- int /*long*/ queryPtr = OS.g_malloc (GTypeQuery.sizeof);

141

+ long /*int*/ queryPtr = OS.g_malloc (GTypeQuery.sizeof);

142

OS.g_type_query (parentType, queryPtr);

143

GTypeQuery query = new GTypeQuery ();

144

OS.memmove (query, queryPtr, GTypeQuery.sizeof);

145

@@ -299,19 +299,19 @@

146

return type;

147

}

148

149

- int /*long*/ gTypeInfo_base_init_factory (int /*long*/ klass) {

150

- int /*long*/ atkObjectFactoryClass = ATK.ATK_OBJECT_FACTORY_CLASS (klass);

151

+ long /*int*/ gTypeInfo_base_init_factory (long /*int*/ klass) {

152

+ long /*int*/ atkObjectFactoryClass = ATK.ATK_OBJECT_FACTORY_CLASS (klass);

153

AtkObjectFactoryClass objectFactoryClassStruct = new AtkObjectFactoryClass ();

154

ATK.memmove (objectFactoryClassStruct, atkObjectFactoryClass);

155

atkObjectFactoryCB_create_accessible = new Callback (this, "atkObjectFactory_create_accessible", 1); //$NON-NLS-1$

156

- int /*long*/ address = atkObjectFactoryCB_create_accessible.getAddress ();

157

+ long /*int*/ address = atkObjectFactoryCB_create_accessible.getAddress ();

158

if (address == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);

159

objectFactoryClassStruct.create_accessible = address;

160

ATK.memmove (atkObjectFactoryClass, objectFactoryClassStruct);

161

return 0;

162

}

163

164

- static int /*long*/ gTypeInfo_base_init_type (int /*long*/ klass) {

165

+ static long /*int*/ gTypeInfo_base_init_type (long /*int*/ klass) {

166

AtkObjectClass objectClass = new AtkObjectClass ();

167

ATK.memmove (objectClass, klass);

168

objectClass.get_name = AtkObjectCB_get_name.getAddress ();

169

@@ -322,7 +322,7 @@

170

objectClass.ref_state_set = AtkObjectCB_ref_state_set.getAddress ();

171

objectClass.get_index_in_parent = AtkObjectCB_get_index_in_parent.getAddress ();

172

objectClass.ref_child = AtkObjectCB_ref_child.getAddress ();

173

- int /*long*/ gObjectClass = OS.G_OBJECT_CLASS (klass);

174

+ long /*int*/ gObjectClass = OS.G_OBJECT_CLASS (klass);

175

GObjectClass objectClassStruct = new GObjectClass ();

176

OS.memmove (objectClassStruct, gObjectClass);

177

objectClassStruct.finalize = GObjectClass_finalize.getAddress ();

178

@@ -331,7 +331,7 @@

179

return 0;

180

}

181

182

- static int /*long*/ initActionIfaceCB (int /*long*/ iface) {

183

+ static long /*int*/ initActionIfaceCB (long /*int*/ iface) {

184

AtkActionIface actionIface = new AtkActionIface ();

185

ATK.memmove (actionIface, iface);

186

actionIface.get_keybinding = AtkActionCB_get_keybinding.getAddress ();

187

@@ -340,7 +340,7 @@

188

return 0;

189

}

190

191

- static int /*long*/ initComponentIfaceCB (int /*long*/ iface) {

192

+ static long /*int*/ initComponentIfaceCB (long /*int*/ iface) {

193

AtkComponentIface componentIface = new AtkComponentIface ();

194

ATK.memmove (componentIface, iface);

195

componentIface.get_extents = AtkComponentCB_get_extents.getAddress ();

196

@@ -351,7 +351,7 @@

197

return 0;

198

}

199

200

- static int /*long*/ initHypertextIfaceCB (int /*long*/ iface) {

201

+ static long /*int*/ initHypertextIfaceCB (long /*int*/ iface) {

202

AtkHypertextIface hypertextIface = new AtkHypertextIface ();

203

ATK.memmove (hypertextIface, iface);

204

hypertextIface.get_link = AtkHypertextCB_get_link.getAddress ();

205

@@ -361,7 +361,7 @@

206

return 0;

207

}

208

209

- static int /*long*/ initSelectionIfaceCB (int /*long*/ iface) {

210

+ static long /*int*/ initSelectionIfaceCB (long /*int*/ iface) {

211

AtkSelectionIface selectionIface = new AtkSelectionIface ();

212

ATK.memmove (selectionIface, iface);

213

selectionIface.is_child_selected = AtkSelectionCB_is_child_selected.getAddress ();

214

@@ -370,7 +370,7 @@

215

return 0;

216

}

217

218

- static int /*long*/ initTextIfaceCB (int /*long*/ iface) {

219

+ static long /*int*/ initTextIfaceCB (long /*int*/ iface) {

220

AtkTextIface textInterface = new AtkTextIface ();

221

ATK.memmove (textInterface, iface);

222

textInterface.get_caret_offset = AtkTextCB_get_caret_offset.getAddress ();

223

@@ -389,8 +389,8 @@

224

static void registerAccessible (Accessible accessible) {

225

/* If DefaultParentType is 0 then OS accessibility is not active */

226

if (DefaultParentType == 0) return;

227

- int /*long*/ controlHandle = accessible.getControlHandle ();

228

- int /*long*/ widgetType = OS.G_OBJECT_TYPE (controlHandle);

229

+ long /*int*/ controlHandle = accessible.getControlHandle ();

230

+ long /*int*/ widgetType = OS.G_OBJECT_TYPE (controlHandle);

231

AccessibleFactory factory = (AccessibleFactory) Factories.get (new LONG (widgetType));

232

if (factory == null) {

233

factory = new AccessibleFactory (widgetType);

234

@@ -404,8 +404,8 @@

235

}

236

237

static void unregisterAccessible (Accessible accessible) {

238

- int /*long*/ controlHandle = accessible.getControlHandle ();

239

- int /*long*/ widgetType = OS.G_OBJECT_TYPE (controlHandle);

240

+ long /*int*/ controlHandle = accessible.getControlHandle ();

241

+ long /*int*/ widgetType = OS.G_OBJECT_TYPE (controlHandle);

242

AccessibleFactory factory = (AccessibleFactory) Factories.get (new LONG (widgetType));

243

if (factory != null) {

244

factory.removeAccessible (accessible);

245

diff -urN x86/org/eclipse/swt/accessibility/Accessible.java x86_64/org/eclipse/swt/accessibility/Accessible.java

246

--- x86/org/eclipse/swt/accessibility/Accessible.java 2009-05-29 17:30:30.000000000 -0400

247

+++ x86_64/org/eclipse/swt/accessibility/Accessible.java 2009-09-17 08:48:16.000000000 -0400

248

@@ -169,7 +169,7 @@

249

return result;

250

}

251

252

- int /*long*/ getControlHandle () {

253

+ long /*int*/ getControlHandle () {

254

return control.handle;

255

}

256

257

diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/eclipse/swt/accessibility/AccessibleObject.java

258

--- x86/org/eclipse/swt/accessibility/AccessibleObject.java 2009-05-29 17:30:30.000000000 -0400

259

+++ x86_64/org/eclipse/swt/accessibility/AccessibleObject.java 2009-09-17 08:48:16.000000000 -0400

260

@@ -18,8 +18,8 @@

261

import org.eclipse.swt.widgets.*;

262

263

class AccessibleObject {

264

- int /*long*/ handle;

265

- int /*long*/ parentType;

266

+ long /*int*/ handle;

267

+ long /*int*/ parentType;

268

int index = -1, id = ACC.CHILDID_SELF;

269

Accessible accessible;

270

AccessibleObject parent;

271

@@ -30,19 +30,19 @@

272

*/

273

boolean isLightweight = false;

274

275

- static int /*long*/ actionNamePtr = -1;

276

- static int /*long*/ descriptionPtr = -1;

277

- static int /*long*/ keybindingPtr = -1;

278

- static int /*long*/ namePtr = -1;

279

+ static long /*int*/ actionNamePtr = -1;

280

+ static long /*int*/ descriptionPtr = -1;

281

+ static long /*int*/ keybindingPtr = -1;

282

+ static long /*int*/ namePtr = -1;

283

static final Hashtable AccessibleObjects = new Hashtable (9);

284

- static final int /*long*/ ATK_ACTION_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkAction", true));

285

- static final int /*long*/ ATK_COMPONENT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkComponent", true));

286

- static final int /*long*/ ATK_HYPERTEXT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkHypertext", true));

287

- static final int /*long*/ ATK_SELECTION_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkSelection", true));

288

- static final int /*long*/ ATK_TEXT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkText", true));

289

+ static final long /*int*/ ATK_ACTION_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkAction", true));

290

+ static final long /*int*/ ATK_COMPONENT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkComponent", true));

291

+ static final long /*int*/ ATK_HYPERTEXT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkHypertext", true));

292

+ static final long /*int*/ ATK_SELECTION_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkSelection", true));

293

+ static final long /*int*/ ATK_TEXT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkText", true));

294

static final boolean DEBUG = Display.DEBUG;

295

296

- AccessibleObject (int /*long*/ type, int /*long*/ widget, Accessible accessible, int /*long*/ parentType, boolean isLightweight) {

297

+ AccessibleObject (long /*int*/ type, long /*int*/ widget, Accessible accessible, long /*int*/ parentType, boolean isLightweight) {

298

super ();

299

handle = ATK.g_object_new (type, 0);

300

this.parentType = parentType;

301

@@ -58,13 +58,13 @@

302

child.setParent (this);

303

}

304

305

- static int /*long*/ atkAction_get_keybinding (int /*long*/ atkObject, int /*long*/ index) {

306

+ static long /*int*/ atkAction_get_keybinding (long /*int*/ atkObject, long /*int*/ index) {

307

if (DEBUG) System.out.println ("-->atkAction_get_keybinding");

308

AccessibleObject object = getAccessibleObject (atkObject);

309

if (object == null) return 0;

310

- int /*long*/ parentResult = 0;

311

+ long /*int*/ parentResult = 0;

312

if (ATK.g_type_is_a (object.parentType, ATK_ACTION_TYPE)) {

313

- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_ACTION_GET_IFACE (object.handle));

314

+ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_ACTION_GET_IFACE (object.handle));

315

AtkActionIface actionIface = new AtkActionIface ();

316

ATK.memmove (actionIface, superType);

317

if (actionIface.get_keybinding != 0) {

318

@@ -93,13 +93,13 @@

319

return keybindingPtr;

320

}

321

322

- static int /*long*/ atkAction_get_name (int /*long*/ atkObject, int /*long*/ index) {

323

+ static long /*int*/ atkAction_get_name (long /*int*/ atkObject, long /*int*/ index) {

324

if (DEBUG) System.out.println ("-->atkAction_get_name");

325

AccessibleObject object = getAccessibleObject (atkObject);

326

if (object == null) return 0;

327

- int /*long*/ parentResult = 0;

328

+ long /*int*/ parentResult = 0;

329

if (ATK.g_type_is_a (object.parentType, ATK_ACTION_TYPE)) {

330

- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_ACTION_GET_IFACE (object.handle));

331

+ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_ACTION_GET_IFACE (object.handle));

332

AtkActionIface actionIface = new AtkActionIface ();

333

ATK.memmove (actionIface, superType);

334

if (actionIface.get_name != 0) {

335

@@ -128,7 +128,7 @@

336

return actionNamePtr;

337

}

338

339

- 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) {

340

+ 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) {

341

if (DEBUG) System.out.println ("-->atkComponent_get_extents");

342

AccessibleObject object = getAccessibleObject (atkObject);

343

if (object == null) return 0;

344

@@ -137,7 +137,7 @@

345

OS.memmove (width, new int[] {0}, 4);

346

OS.memmove (height, new int[] {0}, 4);

347

if (ATK.g_type_is_a (object.parentType, ATK_COMPONENT_TYPE)) {

348

- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle));

349

+ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle));

350

AtkComponentIface componentIface = new AtkComponentIface ();

351

ATK.memmove (componentIface, superType);

352

if (componentIface.get_extents != 0) {

353

@@ -159,11 +159,11 @@

354

event.width = parentWidth [0]; event.height = parentHeight [0];

355

if (coord_type == ATK.ATK_XY_WINDOW) {

356

/* translate control -> display, for filling in event to be dispatched */

357

- int /*long*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle);

358

+ long /*int*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle);

359

GtkAccessible gtkAccessible = new GtkAccessible ();

360

ATK.memmove (gtkAccessible, gtkAccessibleHandle);

361

- int /*long*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget);

362

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topLevel);

363

+ long /*int*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget);

364

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topLevel);

365

int[] topWindowX = new int [1], topWindowY = new int [1];

366

OS.gdk_window_get_origin (window, topWindowX, topWindowY);

367

event.x += topWindowX [0];

368

@@ -174,11 +174,11 @@

369

}

370

if (coord_type == ATK.ATK_XY_WINDOW) {

371

/* translate display -> control, for answering to the OS */

372

- int /*long*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle);

373

+ long /*int*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle);

374

GtkAccessible gtkAccessible = new GtkAccessible ();

375

ATK.memmove (gtkAccessible, gtkAccessibleHandle);

376

- int /*long*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget);

377

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topLevel);

378

+ long /*int*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget);

379

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topLevel);

380

int[] topWindowX = new int [1], topWindowY = new int [1];

381

OS.gdk_window_get_origin (window, topWindowX, topWindowY);

382

event.x -= topWindowX [0];

383

@@ -191,14 +191,14 @@

384

return 0;

385

}

386

387

- static int /*long*/ atkComponent_get_position (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ coord_type) {

388

+ static long /*int*/ atkComponent_get_position (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, long /*int*/ coord_type) {

389

if (DEBUG) System.out.println ("-->atkComponent_get_position, object: " + atkObject + " x: " + x + " y: " + y + " coord: " + coord_type);

390

AccessibleObject object = getAccessibleObject (atkObject);

391

if (object == null) return 0;

392

OS.memmove (x, new int[] {0}, 4);

393

OS.memmove (y, new int[] {0}, 4);

394

if (ATK.g_type_is_a (object.parentType, ATK_COMPONENT_TYPE)) {

395

- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle));

396

+ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle));

397

AtkComponentIface componentIface = new AtkComponentIface ();

398

ATK.memmove (componentIface, superType);

399

if (componentIface.get_extents != 0) {

400

@@ -216,11 +216,11 @@

401

event.x = parentX [0]; event.y = parentY [0];

402

if (coord_type == ATK.ATK_XY_WINDOW) {

403

/* translate control -> display, for filling in event to be dispatched */

404

- int /*long*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle);

405

+ long /*int*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle);

406

GtkAccessible gtkAccessible = new GtkAccessible ();

407

ATK.memmove (gtkAccessible, gtkAccessibleHandle);

408

- int /*long*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget);

409

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topLevel);

410

+ long /*int*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget);

411

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topLevel);

412

int[] topWindowX = new int [1], topWindowY = new int [1];

413

OS.gdk_window_get_origin (window, topWindowX, topWindowY);

414

event.x += topWindowX [0];

415

@@ -231,11 +231,11 @@

416

}

417

if (coord_type == ATK.ATK_XY_WINDOW) {

418

/* translate display -> control, for answering to the OS */

419

- int /*long*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle);

420

+ long /*int*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle);

421

GtkAccessible gtkAccessible = new GtkAccessible ();

422

ATK.memmove (gtkAccessible, gtkAccessibleHandle);

423

- int /*long*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget);

424

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topLevel);

425

+ long /*int*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget);

426

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topLevel);

427

int[] topWindowX = new int [1], topWindowY = new int [1];

428

OS.gdk_window_get_origin (window, topWindowX, topWindowY);

429

event.x -= topWindowX [0];

430

@@ -246,14 +246,14 @@

431

return 0;

432

}

433

434

- static int /*long*/ atkComponent_get_size (int /*long*/ atkObject, int /*long*/ width, int /*long*/ height, int /*long*/ coord_type) {

435

+ static long /*int*/ atkComponent_get_size (long /*int*/ atkObject, long /*int*/ width, long /*int*/ height, long /*int*/ coord_type) {

436

if (DEBUG) System.out.println ("-->atkComponent_get_size");

437

AccessibleObject object = getAccessibleObject (atkObject);

438

if (object == null) return 0;

439

OS.memmove (width, new int[] {0}, 4);

440

OS.memmove (height, new int[] {0}, 4);

441

if (ATK.g_type_is_a (object.parentType, ATK_COMPONENT_TYPE)) {

442

- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle));

443

+ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle));

444

AtkComponentIface componentIface = new AtkComponentIface ();

445

ATK.memmove (componentIface, superType);

446

if (componentIface.get_extents != 0) {

447

@@ -277,13 +277,13 @@

448

return 0;

449

}

450

451

- static int /*long*/ atkComponent_ref_accessible_at_point (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ coord_type) {

452

+ static long /*int*/ atkComponent_ref_accessible_at_point (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, long /*int*/ coord_type) {

453

if (DEBUG) System.out.println ("-->atkComponent_ref_accessible_at_point");

454

AccessibleObject object = getAccessibleObject (atkObject);

455

if (object == null) return 0;

456

- int /*long*/ parentResult = 0;

457

+ long /*int*/ parentResult = 0;

458

if (ATK.g_type_is_a (object.parentType, ATK_COMPONENT_TYPE)) {

459

- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle));

460

+ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle));

461

AtkComponentIface componentIface = new AtkComponentIface ();

462

ATK.memmove (componentIface, superType);

463

if (componentIface.ref_accessible_at_point != 0) {

464

@@ -298,11 +298,11 @@

465

event.x = (int)/*64*/x; event.y = (int)/*64*/y;

466

if (coord_type == ATK.ATK_XY_WINDOW) {

467

/* translate control -> display, for filling in the event to be dispatched */

468

- int /*long*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle);

469

+ long /*int*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle);

470

GtkAccessible gtkAccessible = new GtkAccessible ();

471

ATK.memmove (gtkAccessible, gtkAccessibleHandle);

472

- int /*long*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget);

473

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topLevel);

474

+ long /*int*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget);

475

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topLevel);

476

int[] topWindowX = new int [1], topWindowY = new int [1];

477

OS.gdk_window_get_origin (window, topWindowX, topWindowY);

478

event.x += topWindowX [0];

479

@@ -321,27 +321,27 @@

480

return parentResult;

481

}

482

483

- static int /*long*/ atkHypertext_get_link (int /*long*/ atkObject, int /*long*/ link_index) {

484

+ static long /*int*/ atkHypertext_get_link (long /*int*/ atkObject, long /*int*/ link_index) {

485

if (DEBUG) System.out.println ("-->atkHypertext_get_link");

486

return 0;

487

}

488

489

- static int /*long*/ atkHypertext_get_n_links (int /*long*/ atkObject) {

490

+ static long /*int*/ atkHypertext_get_n_links (long /*int*/ atkObject) {

491

if (DEBUG) System.out.println ("-->atkHypertext_get_n_links");

492

return 0; /* read hyperlink's name */

493

}

494

495

- static int /*long*/ atkHypertext_get_link_index (int /*long*/ atkObject, int /*long*/ char_index) {

496

+ static long /*int*/ atkHypertext_get_link_index (long /*int*/ atkObject, long /*int*/ char_index) {

497

if (DEBUG) System.out.println ("-->atkHypertext_get_link_index");

498

return 0;

499

}

500

501

- static int /*long*/ atkObject_get_description (int /*long*/ atkObject) {

502

+ static long /*int*/ atkObject_get_description (long /*int*/ atkObject) {

503

if (DEBUG) System.out.println ("-->atkObject_get_description");

504

AccessibleObject object = getAccessibleObject (atkObject);

505

if (object == null) return 0;

506

- int /*long*/ parentResult = 0;

507

- int /*long*/ superType = ATK.g_type_class_peek (object.parentType);

508

+ long /*int*/ parentResult = 0;

509

+ long /*int*/ superType = ATK.g_type_class_peek (object.parentType);

510

AtkObjectClass objectClass = new AtkObjectClass ();

511

ATK.memmove (objectClass, superType);

512

if (objectClass.get_description != 0) {

513

@@ -369,12 +369,12 @@

514

return descriptionPtr;

515

}

516

517

- static int /*long*/ atkObject_get_name (int /*long*/ atkObject) {

518

+ static long /*int*/ atkObject_get_name (long /*int*/ atkObject) {

519

if (DEBUG) System.out.println ("-->atkObject_get_name: " + atkObject);

520

AccessibleObject object = getAccessibleObject (atkObject);

521

if (object == null) return 0;

522

- int /*long*/ parentResult = 0;

523

- int /*long*/ superType = ATK.g_type_class_peek (object.parentType);

524

+ long /*int*/ parentResult = 0;

525

+ long /*int*/ superType = ATK.g_type_class_peek (object.parentType);

526

AtkObjectClass objectClass = new AtkObjectClass ();

527

ATK.memmove (objectClass, superType);

528

if (objectClass.get_name != 0) {

529

@@ -402,12 +402,12 @@

530

return namePtr;

531

}

532

533

- static int /*long*/ atkObject_get_n_children (int /*long*/ atkObject) {

534

+ static long /*int*/ atkObject_get_n_children (long /*int*/ atkObject) {

535

if (DEBUG) System.out.println ("-->atkObject_get_n_children: " + atkObject);

536

AccessibleObject object = getAccessibleObject (atkObject);

537

if (object == null) return 0;

538

- int /*long*/ parentResult = 0;

539

- int /*long*/ superType = ATK.g_type_class_peek (object.parentType);

540

+ long /*int*/ parentResult = 0;

541

+ long /*int*/ superType = ATK.g_type_class_peek (object.parentType);

542

AtkObjectClass objectClass = new AtkObjectClass ();

543

ATK.memmove (objectClass, superType);

544

if (objectClass.get_n_children != 0) {

545

@@ -425,31 +425,31 @@

546

return event.detail;

547

}

548

549

- static int /*long*/ atkObject_get_index_in_parent (int /*long*/ atkObject) {

550

+ static long /*int*/ atkObject_get_index_in_parent (long /*int*/ atkObject) {

551

if (DEBUG) System.out.println ("-->atkObjectCB_get_index_in_parent. ");

552

AccessibleObject object = getAccessibleObject (atkObject);

553

if (object == null) return 0;

554

if (object.index != -1) return object.index;

555

- int /*long*/ superType = ATK.g_type_class_peek (object.parentType);

556

+ long /*int*/ superType = ATK.g_type_class_peek (object.parentType);

557

AtkObjectClass objectClass = new AtkObjectClass ();

558

ATK.memmove (objectClass, superType);

559

if (objectClass.get_index_in_parent == 0) return 0;

560

return ATK.call (objectClass.get_index_in_parent,object. handle);

561

}

562

563

- static int /*long*/ atkObject_get_parent (int /*long*/ atkObject) {

564

+ static long /*int*/ atkObject_get_parent (long /*int*/ atkObject) {

565

if (DEBUG) System.out.println ("-->atkObject_get_parent: " + atkObject);

566

AccessibleObject object = getAccessibleObject (atkObject);

567

if (object == null) return 0;

568

if (object.parent != null) return object.parent.handle;

569

- int /*long*/ superType = ATK.g_type_class_peek (object.parentType);

570

+ long /*int*/ superType = ATK.g_type_class_peek (object.parentType);

571

AtkObjectClass objectClass = new AtkObjectClass ();

572

ATK.memmove (objectClass, superType);

573

if (objectClass.get_parent == 0) return 0;

574

return ATK.call (objectClass.get_parent, object.handle);

575

}

576

577

- static int /*long*/ atkObject_get_role (int /*long*/ atkObject) {

578

+ static long /*int*/ atkObject_get_role (long /*int*/ atkObject) {

579

if (DEBUG) System.out.println ("-->atkObject_get_role: " + atkObject);

580

AccessibleObject object = getAccessibleObject (atkObject);

581

if (object == null) return 0;

582

@@ -497,14 +497,14 @@

583

}

584

}

585

}

586

- int /*long*/ superType = ATK.g_type_class_peek (object.parentType);

587

+ long /*int*/ superType = ATK.g_type_class_peek (object.parentType);

588

AtkObjectClass objectClass = new AtkObjectClass ();

589

ATK.memmove (objectClass, superType);

590

if (objectClass.get_role == 0) return 0;

591

return ATK.call (objectClass.get_role, object.handle);

592

}

593

594

- static int /*long*/ atkObject_ref_child (int /*long*/ atkObject, int /*long*/ index) {

595

+ static long /*int*/ atkObject_ref_child (long /*int*/ atkObject, long /*int*/ index) {

596

if (DEBUG) System.out.println ("-->atkObject_ref_child: " + index + " of: " + atkObject);

597

AccessibleObject object = getAccessibleObject (atkObject);

598

if (object == null) return 0;

599

@@ -514,19 +514,19 @@

600

OS.g_object_ref (accObject.handle);

601

return accObject.handle;

602

}

603

- int /*long*/ superType = ATK.g_type_class_peek (object.parentType);

604

+ long /*int*/ superType = ATK.g_type_class_peek (object.parentType);

605

AtkObjectClass objectClass = new AtkObjectClass ();

606

ATK.memmove (objectClass, superType);

607

if (objectClass.ref_child == 0) return 0;

608

return ATK.call (objectClass.ref_child, object.handle, index);

609

}

610

611

- static int /*long*/ atkObject_ref_state_set (int /*long*/ atkObject) {

612

+ static long /*int*/ atkObject_ref_state_set (long /*int*/ atkObject) {

613

if (DEBUG) System.out.println ("-->atkObject_ref_state_set");

614

AccessibleObject object = getAccessibleObject (atkObject);

615

if (object == null) return 0;

616

- int /*long*/ parentResult = 0;

617

- int /*long*/ superType = ATK.g_type_class_peek (object.parentType);

618

+ long /*int*/ parentResult = 0;

619

+ long /*int*/ superType = ATK.g_type_class_peek (object.parentType);

620

AtkObjectClass objectClass = new AtkObjectClass ();

621

ATK.memmove (objectClass, superType);

622

if (objectClass.ref_state_set != 0) {

623

@@ -535,7 +535,7 @@

624

AccessibleControlListener[] listeners = object.getControlListeners ();

625

if (listeners.length == 0) return parentResult;

626

627

- int /*long*/ set = parentResult;

628

+ long /*int*/ set = parentResult;

629

AccessibleControlEvent event = new AccessibleControlEvent (object.accessible);

630

event.childID = object.id;

631

event.detail = -1;

632

@@ -564,13 +564,13 @@

633

return set;

634

}

635

636

- static int /*long*/ atkSelection_is_child_selected (int /*long*/ atkObject, int /*long*/ index) {

637

+ static long /*int*/ atkSelection_is_child_selected (long /*int*/ atkObject, long /*int*/ index) {

638

if (DEBUG) System.out.println ("-->atkSelection_is_child_selected");

639

AccessibleObject object = getAccessibleObject (atkObject);

640

if (object == null) return 0;

641

- int /*long*/ parentResult = 0;

642

+ long /*int*/ parentResult = 0;

643

if (ATK.g_type_is_a (object.parentType, ATK_SELECTION_TYPE)) {

644

- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_SELECTION_GET_IFACE (object.handle));

645

+ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_SELECTION_GET_IFACE (object.handle));

646

AtkSelectionIface selectionIface = new AtkSelectionIface ();

647

ATK.memmove (selectionIface, superType);

648

if (selectionIface.is_child_selected != 0) {

649

@@ -592,13 +592,13 @@

650

return parentResult;

651

}

652

653

- static int /*long*/ atkSelection_ref_selection (int /*long*/ atkObject, int /*long*/ index) {

654

+ static long /*int*/ atkSelection_ref_selection (long /*int*/ atkObject, long /*int*/ index) {

655

if (DEBUG) System.out.println ("-->atkSelection_ref_selection");

656

AccessibleObject object = getAccessibleObject (atkObject);

657

if (object == null) return 0;

658

- int /*long*/ parentResult = 0;

659

+ long /*int*/ parentResult = 0;

660

if (ATK.g_type_is_a (object.parentType, ATK_SELECTION_TYPE)) {

661

- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_SELECTION_GET_IFACE (object.handle));

662

+ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_SELECTION_GET_IFACE (object.handle));

663

AtkSelectionIface selectionIface = new AtkSelectionIface ();

664

ATK.memmove (selectionIface, superType);

665

if (selectionIface.ref_selection != 0) {

666

@@ -622,13 +622,13 @@

667

return parentResult;

668

}

669

670

- static int /*long*/ atkText_get_caret_offset (int /*long*/ atkObject) {

671

+ static long /*int*/ atkText_get_caret_offset (long /*int*/ atkObject) {

672

if (DEBUG) System.out.println ("-->atkText_get_caret_offset");

673

AccessibleObject object = getAccessibleObject (atkObject);

674

if (object == null) return 0;

675

- int /*long*/ parentResult = 0;

676

+ long /*int*/ parentResult = 0;

677

if (ATK.g_type_is_a (object.parentType, ATK_TEXT_TYPE)) {

678

- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (object.handle));

679

+ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (object.handle));

680

AtkTextIface textIface = new AtkTextIface ();

681

ATK.memmove (textIface, superType);

682

if (textIface.get_caret_offset != 0) {

683

@@ -647,14 +647,14 @@

684

return event.offset;

685

}

686

687

- static int /*long*/ atkText_get_character_at_offset (int /*long*/ atkObject, int /*long*/ offset) {

688

+ static long /*int*/ atkText_get_character_at_offset (long /*int*/ atkObject, long /*int*/ offset) {

689

if (DEBUG) System.out.println ("-->atkText_get_character_at_offset");

690

AccessibleObject object = getAccessibleObject (atkObject);

691

if (object == null) return 0;

692

String text = object.getText ();

693

if (text != null) return text.charAt ((int)/*64*/offset); // TODO

694

if (ATK.g_type_is_a (object.parentType, ATK_TEXT_TYPE)) {

695

- int /*long*/ superType = ATK.g_type_class_peek (object.parentType);

696

+ long /*int*/ superType = ATK.g_type_class_peek (object.parentType);

697

AtkTextIface textIface = new AtkTextIface ();

698

ATK.memmove (textIface, superType);

699

if (textIface.get_character_at_offset != 0) {

700

@@ -664,14 +664,14 @@

701

return 0;

702

}

703

704

- static int /*long*/ atkText_get_character_count (int /*long*/ atkObject) {

705

+ static long /*int*/ atkText_get_character_count (long /*int*/ atkObject) {

706

if (DEBUG) System.out.println ("-->atkText_get_character_count");

707

AccessibleObject object = getAccessibleObject (atkObject);

708

if (object == null) return 0;

709

String text = object.getText ();

710

if (text != null) return text.length ();

711

if (ATK.g_type_is_a (object.parentType, ATK_TEXT_TYPE)) {

712

- int /*long*/ superType = ATK.g_type_class_peek (object.parentType);

713

+ long /*int*/ superType = ATK.g_type_class_peek (object.parentType);

714

AtkTextIface textIface = new AtkTextIface ();

715

ATK.memmove (textIface, superType);

716

if (textIface.get_character_count != 0) {

717

@@ -681,13 +681,13 @@

718

return 0;

719

}

720

721

- static int /*long*/ atkText_get_n_selections (int /*long*/ atkObject) {

722

+ static long /*int*/ atkText_get_n_selections (long /*int*/ atkObject) {

723

if (DEBUG) System.out.println ("-->atkText_get_n_selections");

724

AccessibleObject object = getAccessibleObject (atkObject);

725

if (object == null) return 0;

726

- int /*long*/ parentResult = 0;

727

+ long /*int*/ parentResult = 0;

728

if (ATK.g_type_is_a (object.parentType, ATK_TEXT_TYPE)) {

729

- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (object.handle));

730

+ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (object.handle));

731

AtkTextIface textIface = new AtkTextIface ();

732

ATK.memmove (textIface, superType);

733

if (textIface.get_n_selections != 0) {

734

@@ -705,14 +705,14 @@

735

return event.length == 0 ? parentResult : 1;

736

}

737

738

- static int /*long*/ atkText_get_selection (int /*long*/ atkObject, int /*long*/ selection_num, int /*long*/ start_offset, int /*long*/ end_offset) {

739

+ static long /*int*/ atkText_get_selection (long /*int*/ atkObject, long /*int*/ selection_num, long /*int*/ start_offset, long /*int*/ end_offset) {

740

if (DEBUG) System.out.println ("-->atkText_get_selection");

741

AccessibleObject object = getAccessibleObject (atkObject);

742

if (object == null) return 0;

743

OS.memmove (start_offset, new int[] {0}, 4);

744

OS.memmove (end_offset, new int[] {0}, 4);

745

if (ATK.g_type_is_a (object.parentType, ATK_TEXT_TYPE)) {

746

- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (object.handle));

747

+ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (object.handle));

748

AtkTextIface textIface = new AtkTextIface ();

749

ATK.memmove (textIface, superType);

750

if (textIface.get_selection != 0) {

751

@@ -738,7 +738,7 @@

752

return 0;

753

}

754

755

- static int /*long*/ atkText_get_text (int /*long*/ atkObject, int /*long*/ start_offset, int /*long*/ end_offset) {

756

+ static long /*int*/ atkText_get_text (long /*int*/ atkObject, long /*int*/ start_offset, long /*int*/ end_offset) {

757

if (DEBUG) System.out.println ("-->atkText_get_text: " + start_offset + "," + end_offset);

758

AccessibleObject object = getAccessibleObject (atkObject);

759

if (object == null) return 0;

760

@@ -752,14 +752,14 @@

761

start_offset = Math.min (start_offset, end_offset);

762

text = text.substring ((int)/*64*/start_offset, (int)/*64*/end_offset);

763

byte[] bytes = Converter.wcsToMbcs (null, text, true);

764

- int /*long*/ result = OS.g_malloc (bytes.length);

765

+ long /*int*/ result = OS.g_malloc (bytes.length);

766

OS.memmove (result, bytes, bytes.length);

767

return result;

768

}

769

return 0;

770

}

771

772

- 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) {

773

+ 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) {

774

if (DEBUG) System.out.println ("-->atkText_get_text_after_offset");

775

AccessibleObject object = getAccessibleObject (atkObject);

776

if (object == null) return 0;

777

@@ -925,14 +925,14 @@

778

OS.memmove (end_offset, new int[] {endBounds}, 4);

779

text = text.substring (startBounds, endBounds);

780

byte[] bytes = Converter.wcsToMbcs (null, text, true);

781

- int /*long*/ result = OS.g_malloc (bytes.length);

782

+ long /*int*/ result = OS.g_malloc (bytes.length);

783

OS.memmove (result, bytes, bytes.length);

784

return result;

785

}

786

return 0;

787

}

788

789

- 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) {

790

+ 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) {

791

if (DEBUG) System.out.println ("-->atkText_get_text_at_offset: " + offset_value + " start: " + start_offset + " end: " + end_offset);

792

AccessibleObject object = getAccessibleObject (atkObject);

793

if (object == null) return 0;

794

@@ -1041,14 +1041,14 @@

795

OS.memmove (end_offset, new int[] {endBounds}, 4);

796

text = text.substring (startBounds, endBounds);

797

byte[] bytes = Converter.wcsToMbcs (null, text, true);

798

- int /*long*/ result = OS.g_malloc (bytes.length);

799

+ long /*int*/ result = OS.g_malloc (bytes.length);

800

OS.memmove (result, bytes, bytes.length);

801

return result;

802

}

803

return 0;

804

}

805

806

- 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) {

807

+ 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) {

808

if (DEBUG) System.out.println ("-->atkText_get_text_before_offset");

809

AccessibleObject object = getAccessibleObject (atkObject);

810

if (object == null) return 0;

811

@@ -1162,7 +1162,7 @@

812

OS.memmove (end_offset, new int[] {endBounds}, 4);

813

text = text.substring (startBounds, endBounds);

814

byte[] bytes = Converter.wcsToMbcs (null, text, true);

815

- int /*long*/ result = OS.g_malloc (bytes.length);

816

+ long /*int*/ result = OS.g_malloc (bytes.length);

817

OS.memmove (result, bytes, bytes.length);

818

return result;

819

}

820

@@ -1175,11 +1175,11 @@

821

return result != null ? result : new AccessibleListener [0];

822

}

823

824

- static AccessibleObject getAccessibleObject (int /*long*/ atkObject) {

825

+ static AccessibleObject getAccessibleObject (long /*int*/ atkObject) {

826

return (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));

827

}

828

829

- AccessibleObject getChildByHandle (int /*long*/ handle) {

830

+ AccessibleObject getChildByHandle (long /*int*/ handle) {

831

return (AccessibleObject) children.get (new LONG (handle));

832

}

833

834

@@ -1209,13 +1209,13 @@

835

}

836

837

String getText () {

838

- int /*long*/ parentResult = 0;

839

+ long /*int*/ parentResult = 0;

840

String parentText = ""; //$NON-NLS-1$

841

if (ATK.g_type_is_a (parentType, ATK_TEXT_TYPE)) {

842

- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (handle));

843

+ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (handle));

844

AtkTextIface textIface = new AtkTextIface ();

845

ATK.memmove (textIface, superType);

846

- int /*long*/ characterCount = 0;

847

+ long /*int*/ characterCount = 0;

848

if (textIface.get_character_count != 0) {

849

characterCount = ATK.call (textIface.get_character_count, handle);

850

}

851

@@ -1246,9 +1246,9 @@

852

return result != null ? result : new AccessibleTextListener [0];

853

}

854

855

- static int /*long*/ gObjectClass_finalize (int /*long*/ atkObject) {

856

- int /*long*/ superType = ATK.g_type_class_peek_parent (ATK.G_OBJECT_GET_CLASS (atkObject));

857

- int /*long*/ gObjectClass = ATK.G_OBJECT_CLASS (superType);

858

+ static long /*int*/ gObjectClass_finalize (long /*int*/ atkObject) {

859

+ long /*int*/ superType = ATK.g_type_class_peek_parent (ATK.G_OBJECT_GET_CLASS (atkObject));

860

+ long /*int*/ gObjectClass = ATK.G_OBJECT_CLASS (superType);

861

GObjectClass objectClassStruct = new GObjectClass ();

862

ATK.memmove (objectClassStruct, gObjectClass);

863

ATK.call (objectClassStruct.finalize, atkObject);

864

@@ -1365,11 +1365,11 @@

865

Vector idsToKeep = new Vector (children.size ());

866

if (event.children [0] instanceof Integer) {

867

/* an array of child id's (Integers) was answered */

868

- int /*long*/ parentType = AccessibleFactory.getDefaultParentType ();

869

+ long /*int*/ parentType = AccessibleFactory.getDefaultParentType ();

870

for (int i = 0; i < event.children.length; i++) {

871

AccessibleObject object = getChildByIndex (i);

872

if (object == null) {

873

- int /*long*/ childType = AccessibleFactory.getChildType (accessible, i);

874

+ long /*int*/ childType = AccessibleFactory.getChildType (accessible, i);

875

object = new AccessibleObject (childType, 0, accessible, parentType, true);

876

AccessibleObjects.put (new LONG (object.handle), object);

877

addChild (object);

878

diff -urN x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AWT.java

879

--- x86/org/eclipse/swt/awt/SWT_AWT.java 2008-11-26 15:56:54.000000000 -0500

880

+++ x86_64/org/eclipse/swt/awt/SWT_AWT.java 2009-09-17 08:48:16.000000000 -0400

881

@@ -64,7 +64,7 @@

882

883

static boolean loaded, swingInitialized;

884

885

-static native final int /*long*/ getAWTHandle (Object canvas);

886

+static native final long /*int*/ getAWTHandle (Object canvas);

887

static native final void setDebug (Frame canvas, boolean debug);

888

889

static synchronized void loadLibrary () {

890

@@ -152,7 +152,7 @@

891

if ((parent.getStyle () & SWT.EMBEDDED) == 0) {

892

SWT.error (SWT.ERROR_INVALID_ARGUMENT);

893

}

894

- int /*long*/ handle = parent.embeddedHandle;

895

+ long /*int*/ handle = parent.embeddedHandle;

896

/*

897

* Some JREs have implemented the embedded frame constructor to take an integer

898

* and other JREs take a long. To handle this binary incompatibility, use

899

@@ -200,9 +200,9 @@

900

if (parent.isDisposed()) return;

901

Shell shell = parent.getShell();

902

loadLibrary();

903

- int /*long*/ awtHandle = getAWTHandle(window);

904

+ long /*int*/ awtHandle = getAWTHandle(window);

905

if (awtHandle == 0) return;

906

- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid(OS.GTK_WIDGET_WINDOW(OS.gtk_widget_get_toplevel(shell.handle)));

907

+ long /*int*/ xWindow = OS.gdk_x11_drawable_get_xid(OS.GTK_WIDGET_WINDOW(OS.gtk_widget_get_toplevel(shell.handle)));

908

OS.XSetTransientForHint(OS.GDK_DISPLAY(), awtHandle, xWindow);

909

}

910

});

911

@@ -300,7 +300,7 @@

912

public static Shell new_Shell (final Display display, final Canvas parent) {

913

if (display == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);

914

if (parent == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);

915

- int /*long*/ handle = 0;

916

+ long /*int*/ handle = 0;

917

try {

918

loadLibrary ();

919

handle = getAWTHandle (parent);

920

diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/swt/browser/AppFileLocProvider.java

921

--- x86/org/eclipse/swt/browser/AppFileLocProvider.java 2009-08-20 15:16:38.000000000 -0400

922

+++ x86_64/org/eclipse/swt/browser/AppFileLocProvider.java 2009-09-17 08:48:20.000000000 -0400

923

@@ -54,24 +54,24 @@

924

void createCOMInterfaces () {

925

/* Create each of the interfaces that this object implements */

926

supports = new XPCOMObject (new int[] {2, 0, 0}) {

927

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

928

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

929

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

930

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

931

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

932

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

933

};

934

935

directoryServiceProvider = new XPCOMObject (new int[] {2, 0, 0, 3}) {

936

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

937

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

938

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

939

- public int /*long*/ method3 (int /*long*/[] args) {return getFile (args[0], args[1], args[2]);}

940

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

941

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

942

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

943

+ public long /*int*/ method3 (long /*int*/[] args) {return getFile (args[0], args[1], args[2]);}

944

};

945

946

directoryServiceProvider2 = new XPCOMObject (new int[] {2, 0, 0, 3, 2}) {

947

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

948

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

949

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

950

- public int /*long*/ method3 (int /*long*/[] args) {return getFile (args[0], args[1], args[2]);}

951

- public int /*long*/ method4 (int /*long*/[] args) {return getFiles (args[0], args[1]);}

952

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

953

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

954

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

955

+ public long /*int*/ method3 (long /*int*/[] args) {return getFile (args[0], args[1], args[2]);}

956

+ public long /*int*/ method4 (long /*int*/[] args) {return getFiles (args[0], args[1]);}

957

};

958

}

959

960

@@ -90,32 +90,32 @@

961

}

962

}

963

964

-int /*long*/ getAddress () {

965

+long /*int*/ getAddress () {

966

return directoryServiceProvider.getAddress ();

967

}

968

969

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

970

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

971

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

972

nsID guid = new nsID ();

973

XPCOM.memmove (guid, riid, nsID.sizeof);

974

975

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

976

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

977

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

978

AddRef ();

979

return XPCOM.NS_OK;

980

}

981

if (guid.Equals (nsIDirectoryServiceProvider.NS_IDIRECTORYSERVICEPROVIDER_IID)) {

982

- XPCOM.memmove (ppvObject, new int /*long*/[] {directoryServiceProvider.getAddress ()}, C.PTR_SIZEOF);

983

+ XPCOM.memmove (ppvObject, new long /*int*/[] {directoryServiceProvider.getAddress ()}, C.PTR_SIZEOF);

984

AddRef ();

985

return XPCOM.NS_OK;

986

}

987

if (guid.Equals (nsIDirectoryServiceProvider2.NS_IDIRECTORYSERVICEPROVIDER2_IID)) {

988

- XPCOM.memmove (ppvObject, new int /*long*/[] {directoryServiceProvider2.getAddress ()}, C.PTR_SIZEOF);

989

+ XPCOM.memmove (ppvObject, new long /*int*/[] {directoryServiceProvider2.getAddress ()}, C.PTR_SIZEOF);

990

AddRef ();

991

return XPCOM.NS_OK;

992

}

993

994

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

995

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

996

return XPCOM.NS_ERROR_NO_INTERFACE;

997

}

998

999

@@ -132,7 +132,7 @@

1000

void setProfilePath (String path) {

1001

profilePath = path;

1002

if (!Compatibility.fileExists (path, "")) { //$NON-NLS-1$

1003

- int /*long*/[] result = new int /*long*/[1];

1004

+ long /*int*/[] result = new long /*int*/[1];

1005

nsEmbedString pathString = new nsEmbedString (path);

1006

int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);

1007

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

1008

@@ -148,7 +148,7 @@

1009

1010

/* nsIDirectoryServiceProvider2 */

1011

1012

-int getFiles (int /*long*/ prop, int /*long*/ _retval) {

1013

+int getFiles (long /*int*/ prop, long /*int*/ _retval) {

1014

int size = XPCOM.strlen (prop);

1015

byte[] bytes = new byte[size];

1016

XPCOM.memmove (bytes, prop, size);

1017

@@ -159,7 +159,7 @@

1018

if (pluginDirs == null) {

1019

int index = 0;

1020

/* set the first value(s) to the MOZ_PLUGIN_PATH environment variable value if it's defined */

1021

- int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_PLUGIN_PATH, true));

1022

+ long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_PLUGIN_PATH, true));

1023

if (ptr != 0) {

1024

int length = C.strlen (ptr);

1025

byte[] buffer = new byte[length];

1026

@@ -210,9 +210,9 @@

1027

propertyValues = pluginDirs;

1028

}

1029

1030

- XPCOM.memmove(_retval, new int /*long*/[] {0}, C.PTR_SIZEOF);

1031

+ XPCOM.memmove(_retval, new long /*int*/[] {0}, C.PTR_SIZEOF);

1032

if (propertyValues != null) {

1033

- int /*long*/[] result = new int /*long*/[1];

1034

+ long /*int*/[] result = new long /*int*/[1];

1035

nsISupports[] files = new nsISupports [propertyValues.length];

1036

int index = 0;

1037

for (int i = 0; i < propertyValues.length; i++) {

1038

@@ -246,7 +246,7 @@

1039

1040

SimpleEnumerator enumerator = new SimpleEnumerator (files);

1041

enumerator.AddRef ();

1042

- XPCOM.memmove (_retval, new int /*long*/[] {enumerator.getAddress ()}, C.PTR_SIZEOF);

1043

+ XPCOM.memmove (_retval, new long /*int*/[] {enumerator.getAddress ()}, C.PTR_SIZEOF);

1044

return XPCOM.NS_OK;

1045

}

1046

1047

@@ -255,7 +255,7 @@

1048

1049

/* nsIDirectoryServiceProvider implementation */

1050

1051

-int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {

1052

+int getFile(long /*int*/ prop, long /*int*/ persistent, long /*int*/ _retval) {

1053

int size = XPCOM.strlen (prop);

1054

byte[] bytes = new byte[size];

1055

XPCOM.memmove (bytes, prop, size);

1056

@@ -309,9 +309,9 @@

1057

}

1058

1059

XPCOM.memmove (persistent, new int[] {1}, 4); /* PRBool */

1060

- XPCOM.memmove (_retval, new int /*long*/[] {0}, C.PTR_SIZEOF);

1061

+ XPCOM.memmove (_retval, new long /*int*/[] {0}, C.PTR_SIZEOF);

1062

if (propertyValue != null && propertyValue.length () > 0) {

1063

- int /*long*/[] result = new int /*long*/[1];

1064

+ long /*int*/[] result = new long /*int*/[1];

1065

nsEmbedString pathString = new nsEmbedString (propertyValue);

1066

int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);

1067

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

1068

@@ -324,7 +324,7 @@

1069

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

1070

if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);

1071

1072

- XPCOM.memmove (_retval, new int /*long*/[] {result[0]}, C.PTR_SIZEOF);

1073

+ XPCOM.memmove (_retval, new long /*int*/[] {result[0]}, C.PTR_SIZEOF);

1074

localFile.Release ();

1075

return XPCOM.NS_OK;

1076

}

1077

diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/browser/Download_1_8.java

1078

--- x86/org/eclipse/swt/browser/Download_1_8.java 2008-08-21 15:41:30.000000000 -0400

1079

+++ x86_64/org/eclipse/swt/browser/Download_1_8.java 2009-09-17 08:48:20.000000000 -0400

1080

@@ -48,97 +48,97 @@

1081

void createCOMInterfaces () {

1082

/* Create each of the interfaces that this object implements */

1083

supports = new XPCOMObject (new int[] {2, 0, 0}) {

1084

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

1085

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

1086

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

1087

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

1088

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

1089

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

1090

};

1091

1092

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}) {

1093

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

1094

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

1095

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

1096

- public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}

1097

- 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]);}

1098

- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}

1099

- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}

1100

- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}

1101

- public int /*long*/ method8 (int /*long*/[] args) {

1102

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

1103

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

1104

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

1105

+ public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}

1106

+ 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]);}

1107

+ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}

1108

+ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}

1109

+ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}

1110

+ public long /*int*/ method8 (long /*int*/[] args) {

1111

if (args.length == 10) {

1112

return OnProgressChange64_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]);

1113

} else {

1114

return OnProgressChange64 (args[0], args[1], args[2], args[3], args[4], args[5]);

1115

}

1116

}

1117

- public int /*long*/ method9 (int /*long*/[] args) {

1118

+ public long /*int*/ method9 (long /*int*/[] args) {

1119

if (args.length == 8) {

1120

return Init_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);

1121

} else {

1122

return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);

1123

}

1124

}

1125

- public int /*long*/ method10 (int /*long*/[] args) {return GetTargetFile (args[0]);}

1126

- public int /*long*/ method11 (int /*long*/[] args) {return GetPercentComplete (args[0]);}

1127

- public int /*long*/ method12 (int /*long*/[] args) {return GetAmountTransferred (args[0]);}

1128

- public int /*long*/ method13 (int /*long*/[] args) {return GetSize (args[0]);}

1129

- public int /*long*/ method14 (int /*long*/[] args) {return GetSource (args[0]);}

1130

- public int /*long*/ method15 (int /*long*/[] args) {return GetTarget (args[0]);}

1131

- public int /*long*/ method16 (int /*long*/[] args) {return GetCancelable (args[0]);}

1132

- public int /*long*/ method17 (int /*long*/[] args) {return GetDisplayName (args[0]);}

1133

- public int /*long*/ method18 (int /*long*/[] args) {return GetStartTime (args[0]);}

1134

- public int /*long*/ method19 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}

1135

+ public long /*int*/ method10 (long /*int*/[] args) {return GetTargetFile (args[0]);}

1136

+ public long /*int*/ method11 (long /*int*/[] args) {return GetPercentComplete (args[0]);}

1137

+ public long /*int*/ method12 (long /*int*/[] args) {return GetAmountTransferred (args[0]);}

1138

+ public long /*int*/ method13 (long /*int*/[] args) {return GetSize (args[0]);}

1139

+ public long /*int*/ method14 (long /*int*/[] args) {return GetSource (args[0]);}

1140

+ public long /*int*/ method15 (long /*int*/[] args) {return GetTarget (args[0]);}

1141

+ public long /*int*/ method16 (long /*int*/[] args) {return GetCancelable (args[0]);}

1142

+ public long /*int*/ method17 (long /*int*/[] args) {return GetDisplayName (args[0]);}

1143

+ public long /*int*/ method18 (long /*int*/[] args) {return GetStartTime (args[0]);}

1144

+ public long /*int*/ method19 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}

1145

};

1146

1147

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}) {

1148

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

1149

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

1150

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

1151

- public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}

1152

- 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]);}

1153

- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}

1154

- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}

1155

- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}

1156

- public int /*long*/ method8 (int /*long*/[] args) {

1157

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

1158

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

1159

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

1160

+ public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}

1161

+ 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]);}

1162

+ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}

1163

+ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}

1164

+ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}

1165

+ public long /*int*/ method8 (long /*int*/[] args) {

1166

if (args.length == 10) {

1167

return OnProgressChange64_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]);

1168

} else {

1169

return OnProgressChange64 (args[0], args[1], args[2], args[3], args[4], args[5]);

1170

}

1171

}

1172

- public int /*long*/ method9 (int /*long*/[] args) {

1173

+ public long /*int*/ method9 (long /*int*/[] args) {

1174

if (args.length == 8) {

1175

return Init_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);

1176

} else {

1177

return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);

1178

}

1179

}

1180

- public int /*long*/ method10 (int /*long*/[] args) {return GetTargetFile (args[0]);}

1181

- public int /*long*/ method11 (int /*long*/[] args) {return GetPercentComplete (args[0]);}

1182

- public int /*long*/ method12 (int /*long*/[] args) {return GetAmountTransferred (args[0]);}

1183

- public int /*long*/ method13 (int /*long*/[] args) {return GetSize (args[0]);}

1184

- public int /*long*/ method14 (int /*long*/[] args) {return GetSource (args[0]);}

1185

- public int /*long*/ method15 (int /*long*/[] args) {return GetTarget (args[0]);}

1186

- public int /*long*/ method16 (int /*long*/[] args) {return GetCancelable (args[0]);}

1187

- public int /*long*/ method17 (int /*long*/[] args) {return GetDisplayName (args[0]);}

1188

- public int /*long*/ method18 (int /*long*/[] args) {return GetStartTime (args[0]);}

1189

- public int /*long*/ method19 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}

1190

- public int /*long*/ method20 (int /*long*/[] args) {return Open (args[0]);}

1191

- public int /*long*/ method21 (int /*long*/[] args) {return GetCancelDownloadOnClose (args[0]);}

1192

- public int /*long*/ method22 (int /*long*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}

1193

- public int /*long*/ method23 (int /*long*/[] args) {return GetObserver (args[0]);}

1194

- public int /*long*/ method24 (int /*long*/[] args) {return SetObserver (args[0]);}

1195

- public int /*long*/ method25 (int /*long*/[] args) {return GetDialog (args[0]);}

1196

- public int /*long*/ method26 (int /*long*/[] args) {return SetDialog (args[0]);}

1197

+ public long /*int*/ method10 (long /*int*/[] args) {return GetTargetFile (args[0]);}

1198

+ public long /*int*/ method11 (long /*int*/[] args) {return GetPercentComplete (args[0]);}

1199

+ public long /*int*/ method12 (long /*int*/[] args) {return GetAmountTransferred (args[0]);}

1200

+ public long /*int*/ method13 (long /*int*/[] args) {return GetSize (args[0]);}

1201

+ public long /*int*/ method14 (long /*int*/[] args) {return GetSource (args[0]);}

1202

+ public long /*int*/ method15 (long /*int*/[] args) {return GetTarget (args[0]);}

1203

+ public long /*int*/ method16 (long /*int*/[] args) {return GetCancelable (args[0]);}

1204

+ public long /*int*/ method17 (long /*int*/[] args) {return GetDisplayName (args[0]);}

1205

+ public long /*int*/ method18 (long /*int*/[] args) {return GetStartTime (args[0]);}

1206

+ public long /*int*/ method19 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}

1207

+ public long /*int*/ method20 (long /*int*/[] args) {return Open (args[0]);}

1208

+ public long /*int*/ method21 (long /*int*/[] args) {return GetCancelDownloadOnClose (args[0]);}

1209

+ public long /*int*/ method22 (long /*int*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}

1210

+ public long /*int*/ method23 (long /*int*/[] args) {return GetObserver (args[0]);}

1211

+ public long /*int*/ method24 (long /*int*/[] args) {return SetObserver (args[0]);}

1212

+ public long /*int*/ method25 (long /*int*/[] args) {return GetDialog (args[0]);}

1213

+ public long /*int*/ method26 (long /*int*/[] args) {return SetDialog (args[0]);}

1214

};

1215

1216

webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3}) {

1217

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

1218

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

1219

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

1220

- public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}

1221

- 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]);}

1222

- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}

1223

- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}

1224

- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}

1225

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

1226

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

1227

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

1228

+ public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}

1229

+ 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]);}

1230

+ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}

1231

+ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}

1232

+ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}

1233

};

1234

}

1235

1236

@@ -161,36 +161,36 @@

1237

}

1238

}

1239

1240

-int /*long*/ getAddress () {

1241

+long /*int*/ getAddress () {

1242

return progressDialog.getAddress ();

1243

}

1244

1245

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

1246

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

1247

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

1248

nsID guid = new nsID ();

1249

XPCOM.memmove (guid, riid, nsID.sizeof);

1250

1251

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

1252

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

1253

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

1254

AddRef();

1255

return XPCOM.NS_OK;

1256

}

1257

if (guid.Equals (nsIDownload_1_8.NS_IDOWNLOAD_IID)) {

1258

- XPCOM.memmove (ppvObject, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);

1259

+ XPCOM.memmove (ppvObject, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);

1260

AddRef();

1261

return XPCOM.NS_OK;

1262

}

1263

if (guid.Equals (nsIProgressDialog_1_8.NS_IPROGRESSDIALOG_IID)) {

1264

- XPCOM.memmove (ppvObject, new int /*long*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);

1265

+ XPCOM.memmove (ppvObject, new long /*int*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);

1266

AddRef();

1267

return XPCOM.NS_OK;

1268

}

1269

if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) {

1270

- XPCOM.memmove (ppvObject, new int /*long*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);

1271

+ XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);

1272

AddRef();

1273

return XPCOM.NS_OK;

1274

}

1275

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

1276

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

1277

return XPCOM.NS_ERROR_NO_INTERFACE;

1278

}

1279

1280

@@ -203,26 +203,26 @@

1281

/* nsIDownload */

1282

1283

/* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */

1284

-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) {

1285

+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) {

1286

long startTime = (startTime2 << 32) + startTime1;

1287

return Init (aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable);

1288

}

1289

1290

-int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aTempFile, int /*long*/ aCancelable) {

1291

+int Init (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aTempFile, long /*int*/ aCancelable) {

1292

cancelable = new nsICancelable (aCancelable);

1293

nsIURI source = new nsIURI (aSource);

1294

- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();

1295

+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();

1296

int rc = source.GetHost (aSpec);

1297

if (rc != XPCOM.NS_OK) Mozilla.error(rc);

1298

int length = XPCOM.nsEmbedCString_Length (aSpec);

1299

- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);

1300

+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);

1301

byte[] dest = new byte[length];

1302

XPCOM.memmove (dest, buffer, length);

1303

XPCOM.nsEmbedCString_delete (aSpec);

1304

String url = new String (dest);

1305

1306

nsIURI target = new nsIURI (aTarget);

1307

- int /*long*/ aPath = XPCOM.nsEmbedCString_new ();

1308

+ long /*int*/ aPath = XPCOM.nsEmbedCString_new ();

1309

rc = target.GetPath (aPath);

1310

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

1311

length = XPCOM.nsEmbedCString_Length (aPath);

1312

@@ -277,60 +277,60 @@

1313

return XPCOM.NS_OK;

1314

}

1315

1316

-int GetAmountTransferred (int /*long*/ arg0) {

1317

+int GetAmountTransferred (long /*int*/ arg0) {

1318

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1319

}

1320

1321

-int GetCancelable (int /*long*/ arg0) {

1322

+int GetCancelable (long /*int*/ arg0) {

1323

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1324

}

1325

1326

-int GetDisplayName (int /*long*/ aDisplayName) {

1327

+int GetDisplayName (long /*int*/ aDisplayName) {

1328

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1329

}

1330

1331

-int GetMIMEInfo (int /*long*/ aMIMEInfo) {

1332

+int GetMIMEInfo (long /*int*/ aMIMEInfo) {

1333

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1334

}

1335

1336

-int GetPercentComplete (int /*long*/ aPercentComplete) {

1337

+int GetPercentComplete (long /*int*/ aPercentComplete) {

1338

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1339

}

1340

1341

-int GetSize (int /*long*/ arg0) {

1342

+int GetSize (long /*int*/ arg0) {

1343

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1344

}

1345

1346

-int GetSource (int /*long*/ aSource) {

1347

+int GetSource (long /*int*/ aSource) {

1348

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1349

}

1350

1351

-int GetStartTime (int /*long*/ aStartTime) {

1352

+int GetStartTime (long /*int*/ aStartTime) {

1353

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1354

}

1355

1356

-int GetTarget (int /*long*/ aTarget) {

1357

+int GetTarget (long /*int*/ aTarget) {

1358

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1359

}

1360

1361

-int GetTargetFile (int /*long*/ arg0) {

1362

+int GetTargetFile (long /*int*/ arg0) {

1363

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1364

}

1365

1366

/* nsIProgressDialog */

1367

-int GetCancelDownloadOnClose (int /*long*/ aCancelDownloadOnClose) {

1368

+int GetCancelDownloadOnClose (long /*int*/ aCancelDownloadOnClose) {

1369

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1370

}

1371

1372

-int GetDialog (int /*long*/ aDialog) {

1373

+int GetDialog (long /*int*/ aDialog) {

1374

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1375

}

1376

1377

-int GetObserver (int /*long*/ aObserver) {

1378

+int GetObserver (long /*int*/ aObserver) {

1379

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1380

}

1381

1382

-int Open (int /*long*/ aParent) {

1383

+int Open (long /*int*/ aParent) {

1384

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1385

}

1386

1387

@@ -338,26 +338,26 @@

1388

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1389

}

1390

1391

-int SetDialog (int /*long*/ aDialog) {

1392

+int SetDialog (long /*int*/ aDialog) {

1393

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1394

}

1395

1396

-int SetObserver (int /*long*/ aObserver) {

1397

+int SetObserver (long /*int*/ aObserver) {

1398

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1399

}

1400

1401

/* nsIWebProgressListener */

1402

1403

-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {

1404

+int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {

1405

return XPCOM.NS_OK;

1406

}

1407

1408

-int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {

1409

+int OnProgressChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {

1410

return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);

1411

}

1412

1413

/* Note. The last 4 args in the original interface are defined as PRInt64. These each translate into two java ints. */

1414

-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) {

1415

+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) {

1416

long aCurSelfProgress = (aCurSelfProgress2 << 32) + aCurSelfProgress1;

1417

long aMaxSelfProgress = (aMaxSelfProgress2 << 32) + aMaxSelfProgress1;

1418

long aCurTotalProgress = (aCurTotalProgress2 << 32) + aCurTotalProgress1;

1419

@@ -365,7 +365,7 @@

1420

return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);

1421

}

1422

1423

-int OnProgressChange64 (int /*long*/ aWebProgress, int /*long*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {

1424

+int OnProgressChange64 (long /*int*/ aWebProgress, long /*int*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {

1425

long currentKBytes = aCurTotalProgress / 1024;

1426

long totalKBytes = aMaxTotalProgress / 1024;

1427

if (shell != null && !shell.isDisposed ()) {

1428

@@ -378,11 +378,11 @@

1429

return XPCOM.NS_OK;

1430

}

1431

1432

-int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {

1433

+int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {

1434

return XPCOM.NS_OK;

1435

}

1436

1437

-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {

1438

+int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {

1439

if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {

1440

cancelable = null;

1441

if (shell != null && !shell.isDisposed ()) shell.dispose ();

1442

@@ -391,7 +391,7 @@

1443

return XPCOM.NS_OK;

1444

}

1445

1446

-int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {

1447

+int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {

1448

return XPCOM.NS_OK;

1449

}

1450

}

1451

diff -urN x86/org/eclipse/swt/browser/DownloadFactory_1_8.java x86_64/org/eclipse/swt/browser/DownloadFactory_1_8.java

1452

--- x86/org/eclipse/swt/browser/DownloadFactory_1_8.java 2007-08-01 15:57:24.000000000 -0400

1453

+++ x86_64/org/eclipse/swt/browser/DownloadFactory_1_8.java 2009-09-17 08:48:20.000000000 -0400

1454

@@ -30,17 +30,17 @@

1455

void createCOMInterfaces () {

1456

/* Create each of the interfaces that this object implements */

1457

supports = new XPCOMObject (new int[] {2, 0, 0}) {

1458

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

1459

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

1460

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

1461

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

1462

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

1463

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

1464

};

1465

1466

factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {

1467

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

1468

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

1469

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

1470

- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}

1471

- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}

1472

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

1473

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

1474

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

1475

+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}

1476

+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}

1477

};

1478

}

1479

1480

@@ -55,27 +55,27 @@

1481

}

1482

}

1483

1484

-int /*long*/ getAddress () {

1485

+long /*int*/ getAddress () {

1486

return factory.getAddress ();

1487

}

1488

1489

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

1490

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

1491

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

1492

nsID guid = new nsID ();

1493

XPCOM.memmove (guid, riid, nsID.sizeof);

1494

1495

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

1496

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

1497

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

1498

AddRef ();

1499

return XPCOM.NS_OK;

1500

}

1501

if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {

1502

- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);

1503

+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);

1504

AddRef ();

1505

return XPCOM.NS_OK;

1506

}

1507

1508

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

1509

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

1510

return XPCOM.NS_ERROR_NO_INTERFACE;

1511

}

1512

1513

@@ -87,10 +87,10 @@

1514

1515

/* nsIFactory */

1516

1517

-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {

1518

+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {

1519

Download_1_8 download = new Download_1_8 ();

1520

download.AddRef ();

1521

- XPCOM.memmove (result, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);

1522

+ XPCOM.memmove (result, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);

1523

return XPCOM.NS_OK;

1524

}

1525

1526

diff -urN x86/org/eclipse/swt/browser/DownloadFactory.java x86_64/org/eclipse/swt/browser/DownloadFactory.java

1527

--- x86/org/eclipse/swt/browser/DownloadFactory.java 2007-08-01 15:57:24.000000000 -0400

1528

+++ x86_64/org/eclipse/swt/browser/DownloadFactory.java 2009-09-17 08:48:20.000000000 -0400

1529

@@ -30,17 +30,17 @@

1530

void createCOMInterfaces () {

1531

/* Create each of the interfaces that this object implements */

1532

supports = new XPCOMObject (new int[] {2, 0, 0}) {

1533

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

1534

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

1535

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

1536

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

1537

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

1538

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

1539

};

1540

1541

factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {

1542

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

1543

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

1544

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

1545

- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}

1546

- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}

1547

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

1548

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

1549

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

1550

+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}

1551

+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}

1552

};

1553

}

1554

1555

@@ -55,27 +55,27 @@

1556

}

1557

}

1558

1559

-int /*long*/ getAddress () {

1560

+long /*int*/ getAddress () {

1561

return factory.getAddress ();

1562

}

1563

1564

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

1565

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

1566

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

1567

nsID guid = new nsID ();

1568

XPCOM.memmove (guid, riid, nsID.sizeof);

1569

1570

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

1571

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

1572

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

1573

AddRef ();

1574

return XPCOM.NS_OK;

1575

}

1576

if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {

1577

- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);

1578

+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);

1579

AddRef ();

1580

return XPCOM.NS_OK;

1581

}

1582

1583

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

1584

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

1585

return XPCOM.NS_ERROR_NO_INTERFACE;

1586

}

1587

1588

@@ -87,10 +87,10 @@

1589

1590

/* nsIFactory */

1591

1592

-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {

1593

+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {

1594

Download download = new Download ();

1595

download.AddRef ();

1596

- XPCOM.memmove (result, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);

1597

+ XPCOM.memmove (result, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);

1598

return XPCOM.NS_OK;

1599

}

1600

1601

diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browser/Download.java

1602

--- x86/org/eclipse/swt/browser/Download.java 2008-08-21 15:41:30.000000000 -0400

1603

+++ x86_64/org/eclipse/swt/browser/Download.java 2009-09-17 08:48:20.000000000 -0400

1604

@@ -46,63 +46,63 @@

1605

void createCOMInterfaces () {

1606

/* Create each of the interfaces that this object implements */

1607

supports = new XPCOMObject (new int[] {2, 0, 0}) {

1608

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

1609

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

1610

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

1611

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

1612

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

1613

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

1614

};

1615

1616

download = new XPCOMObject (new int[] {2, 0, 0, 7, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1}) {

1617

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

1618

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

1619

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

1620

- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}

1621

- public int /*long*/ method4 (int /*long*/[] args) {return GetSource (args[0]);}

1622

- public int /*long*/ method5 (int /*long*/[] args) {return GetTarget (args[0]);}

1623

- public int /*long*/ method6 (int /*long*/[] args) {return GetPersist (args[0]);}

1624

- public int /*long*/ method7 (int /*long*/[] args) {return GetPercentComplete (args[0]);}

1625

- public int /*long*/ method8 (int /*long*/[] args) {return GetDisplayName (args[0]);}

1626

- public int /*long*/ method9 (int /*long*/[] args) {return SetDisplayName (args[0]);}

1627

- public int /*long*/ method10 (int /*long*/[] args) {return GetStartTime (args[0]);}

1628

- public int /*long*/ method11 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}

1629

- public int /*long*/ method12 (int /*long*/[] args) {return GetListener (args[0]);}

1630

- public int /*long*/ method13 (int /*long*/[] args) {return SetListener (args[0]);}

1631

- public int /*long*/ method14 (int /*long*/[] args) {return GetObserver (args[0]);}

1632

- public int /*long*/ method15 (int /*long*/[] args) {return SetObserver (args[0]);}

1633

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

1634

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

1635

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

1636

+ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}

1637

+ public long /*int*/ method4 (long /*int*/[] args) {return GetSource (args[0]);}

1638

+ public long /*int*/ method5 (long /*int*/[] args) {return GetTarget (args[0]);}

1639

+ public long /*int*/ method6 (long /*int*/[] args) {return GetPersist (args[0]);}

1640

+ public long /*int*/ method7 (long /*int*/[] args) {return GetPercentComplete (args[0]);}

1641

+ public long /*int*/ method8 (long /*int*/[] args) {return GetDisplayName (args[0]);}

1642

+ public long /*int*/ method9 (long /*int*/[] args) {return SetDisplayName (args[0]);}

1643

+ public long /*int*/ method10 (long /*int*/[] args) {return GetStartTime (args[0]);}

1644

+ public long /*int*/ method11 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}

1645

+ public long /*int*/ method12 (long /*int*/[] args) {return GetListener (args[0]);}

1646

+ public long /*int*/ method13 (long /*int*/[] args) {return SetListener (args[0]);}

1647

+ public long /*int*/ method14 (long /*int*/[] args) {return GetObserver (args[0]);}

1648

+ public long /*int*/ method15 (long /*int*/[] args) {return SetObserver (args[0]);}

1649

};

1650

1651

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}) {

1652

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

1653

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

1654

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

1655

- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}

1656

- public int /*long*/ method4 (int /*long*/[] args) {return GetSource (args[0]);}

1657

- public int /*long*/ method5 (int /*long*/[] args) {return GetTarget (args[0]);}

1658

- public int /*long*/ method6 (int /*long*/[] args) {return GetPersist (args[0]);}

1659

- public int /*long*/ method7 (int /*long*/[] args) {return GetPercentComplete (args[0]);}

1660

- public int /*long*/ method8 (int /*long*/[] args) {return GetDisplayName (args[0]);}

1661

- public int /*long*/ method9 (int /*long*/[] args) {return SetDisplayName (args[0]);}

1662

- public int /*long*/ method10 (int /*long*/[] args) {return GetStartTime (args[0]);}

1663

- public int /*long*/ method11 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}

1664

- public int /*long*/ method12 (int /*long*/[] args) {return GetListener (args[0]);}

1665

- public int /*long*/ method13 (int /*long*/[] args) {return SetListener (args[0]);}

1666

- public int /*long*/ method14 (int /*long*/[] args) {return GetObserver (args[0]);}

1667

- public int /*long*/ method15 (int /*long*/[] args) {return SetObserver (args[0]);}

1668

- public int /*long*/ method16 (int /*long*/[] args) {return Open (args[0]);}

1669

- public int /*long*/ method17 (int /*long*/[] args) {return GetCancelDownloadOnClose (args[0]);}

1670

- public int /*long*/ method18 (int /*long*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}

1671

- public int /*long*/ method19 (int /*long*/[] args) {return GetDialog (args[0]);}

1672

- public int /*long*/ method20 (int /*long*/[] args) {return SetDialog (args[0]);}

1673

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

1674

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

1675

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

1676

+ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}

1677

+ public long /*int*/ method4 (long /*int*/[] args) {return GetSource (args[0]);}

1678

+ public long /*int*/ method5 (long /*int*/[] args) {return GetTarget (args[0]);}

1679

+ public long /*int*/ method6 (long /*int*/[] args) {return GetPersist (args[0]);}

1680

+ public long /*int*/ method7 (long /*int*/[] args) {return GetPercentComplete (args[0]);}

1681

+ public long /*int*/ method8 (long /*int*/[] args) {return GetDisplayName (args[0]);}

1682

+ public long /*int*/ method9 (long /*int*/[] args) {return SetDisplayName (args[0]);}

1683

+ public long /*int*/ method10 (long /*int*/[] args) {return GetStartTime (args[0]);}

1684

+ public long /*int*/ method11 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}

1685

+ public long /*int*/ method12 (long /*int*/[] args) {return GetListener (args[0]);}

1686

+ public long /*int*/ method13 (long /*int*/[] args) {return SetListener (args[0]);}

1687

+ public long /*int*/ method14 (long /*int*/[] args) {return GetObserver (args[0]);}

1688

+ public long /*int*/ method15 (long /*int*/[] args) {return SetObserver (args[0]);}

1689

+ public long /*int*/ method16 (long /*int*/[] args) {return Open (args[0]);}

1690

+ public long /*int*/ method17 (long /*int*/[] args) {return GetCancelDownloadOnClose (args[0]);}

1691

+ public long /*int*/ method18 (long /*int*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}

1692

+ public long /*int*/ method19 (long /*int*/[] args) {return GetDialog (args[0]);}

1693

+ public long /*int*/ method20 (long /*int*/[] args) {return SetDialog (args[0]);}

1694

};

1695

1696

webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3}) {

1697

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

1698

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

1699

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

1700

- public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}

1701

- 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]);}

1702

- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}

1703

- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}

1704

- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}

1705

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

1706

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

1707

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

1708

+ public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}

1709

+ 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]);}

1710

+ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}

1711

+ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}

1712

+ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}

1713

};

1714

}

1715

1716

@@ -125,36 +125,36 @@

1717

}

1718

}

1719

1720

-int /*long*/ getAddress () {

1721

+long /*int*/ getAddress () {

1722

return progressDialog.getAddress ();

1723

}

1724

1725

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

1726

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

1727

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

1728

nsID guid = new nsID ();

1729

XPCOM.memmove (guid, riid, nsID.sizeof);

1730

1731

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

1732

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

1733

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

1734

AddRef();

1735

return XPCOM.NS_OK;

1736

}

1737

if (guid.Equals (nsIDownload.NS_IDOWNLOAD_IID)) {

1738

- XPCOM.memmove (ppvObject, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);

1739

+ XPCOM.memmove (ppvObject, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);

1740

AddRef();

1741

return XPCOM.NS_OK;

1742

}

1743

if (guid.Equals (nsIProgressDialog.NS_IPROGRESSDIALOG_IID)) {

1744

- XPCOM.memmove (ppvObject, new int /*long*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);

1745

+ XPCOM.memmove (ppvObject, new long /*int*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);

1746

AddRef();

1747

return XPCOM.NS_OK;

1748

}

1749

if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) {

1750

- XPCOM.memmove (ppvObject, new int /*long*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);

1751

+ XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);

1752

AddRef();

1753

return XPCOM.NS_OK;

1754

}

1755

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

1756

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

1757

return XPCOM.NS_ERROR_NO_INTERFACE;

1758

}

1759

1760

@@ -167,13 +167,13 @@

1761

/* nsIDownload */

1762

1763

/* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */

1764

-int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, int /*long*/ startTime1, int /*long*/ startTime2, int /*long*/ aPersist) {

1765

+int Init (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long /*int*/ startTime1, long /*int*/ startTime2, long /*int*/ aPersist) {

1766

nsIURI source = new nsIURI (aSource);

1767

- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();

1768

+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();

1769

int rc = source.GetHost (aSpec);

1770

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

1771

int length = XPCOM.nsEmbedCString_Length (aSpec);

1772

- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);

1773

+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);

1774

byte[] dest = new byte[length];

1775

XPCOM.memmove (dest, buffer, length);

1776

XPCOM.nsEmbedCString_delete (aSpec);

1777

@@ -186,12 +186,12 @@

1778

*/

1779

String filename = null;

1780

nsISupports supports = new nsISupports (aTarget);

1781

- int /*long*/[] result = new int /*long*/[1];

1782

+ long /*int*/[] result = new long /*int*/[1];

1783

rc = supports.QueryInterface (nsIURI.NS_IURI_IID, result);

1784

if (rc == XPCOM.NS_OK) { /* >= 1.7 */

1785

nsIURI target = new nsIURI (result[0]);

1786

result[0] = 0;

1787

- int /*long*/ aPath = XPCOM.nsEmbedCString_new ();

1788

+ long /*int*/ aPath = XPCOM.nsEmbedCString_new ();

1789

rc = target.GetPath (aPath);

1790

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

1791

length = XPCOM.nsEmbedCString_Length (aPath);

1792

@@ -205,7 +205,7 @@

1793

target.Release ();

1794

} else { /* < 1.7 */

1795

nsILocalFile target = new nsILocalFile (aTarget);

1796

- int /*long*/ aNativeTarget = XPCOM.nsEmbedCString_new ();

1797

+ long /*int*/ aNativeTarget = XPCOM.nsEmbedCString_new ();

1798

rc = target.GetNativeLeafName (aNativeTarget);

1799

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

1800

length = XPCOM.nsEmbedCString_Length (aNativeTarget);

1801

@@ -259,54 +259,54 @@

1802

return XPCOM.NS_OK;

1803

}

1804

1805

-int GetSource (int /*long*/ aSource) {

1806

+int GetSource (long /*int*/ aSource) {

1807

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1808

}

1809

1810

-int GetTarget (int /*long*/ aTarget) {

1811

+int GetTarget (long /*int*/ aTarget) {

1812

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1813

}

1814

1815

-int GetPersist (int /*long*/ aPersist) {

1816

+int GetPersist (long /*int*/ aPersist) {

1817

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1818

}

1819

1820

-int GetPercentComplete (int /*long*/ aPercentComplete) {

1821

+int GetPercentComplete (long /*int*/ aPercentComplete) {

1822

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1823

}

1824

1825

-int GetDisplayName (int /*long*/ aDisplayName) {

1826

+int GetDisplayName (long /*int*/ aDisplayName) {

1827

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1828

}

1829

1830

-int SetDisplayName (int /*long*/ aDisplayName) {

1831

+int SetDisplayName (long /*int*/ aDisplayName) {

1832

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1833

}

1834

1835

-int GetStartTime (int /*long*/ aStartTime) {

1836

+int GetStartTime (long /*int*/ aStartTime) {

1837

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1838

}

1839

1840

-int GetMIMEInfo (int /*long*/ aMIMEInfo) {

1841

+int GetMIMEInfo (long /*int*/ aMIMEInfo) {

1842

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1843

}

1844

1845

-int GetListener (int /*long*/ aListener) {

1846

+int GetListener (long /*int*/ aListener) {

1847

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1848

}

1849

1850

-int SetListener (int /*long*/ aListener) {

1851

+int SetListener (long /*int*/ aListener) {

1852

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1853

}

1854

1855

-int GetObserver (int /*long*/ aObserver) {

1856

+int GetObserver (long /*int*/ aObserver) {

1857

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1858

}

1859

1860

-int SetObserver (int /*long*/ aObserver) {

1861

+int SetObserver (long /*int*/ aObserver) {

1862

if (aObserver != 0) {

1863

nsISupports supports = new nsISupports (aObserver);

1864

- int /*long*/[] result = new int /*long*/[1];

1865

+ long /*int*/[] result = new long /*int*/[1];

1866

int rc = supports.QueryInterface (nsIHelperAppLauncher.NS_IHELPERAPPLAUNCHER_IID, result);

1867

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

1868

if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);

1869

@@ -316,11 +316,11 @@

1870

}

1871

1872

/* nsIProgressDialog */

1873

-int Open (int /*long*/ aParent) {

1874

+int Open (long /*int*/ aParent) {

1875

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1876

}

1877

1878

-int GetCancelDownloadOnClose (int /*long*/ aCancelDownloadOnClose) {

1879

+int GetCancelDownloadOnClose (long /*int*/ aCancelDownloadOnClose) {

1880

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1881

}

1882

1883

@@ -328,17 +328,17 @@

1884

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1885

}

1886

1887

-int GetDialog (int /*long*/ aDialog) {

1888

+int GetDialog (long /*int*/ aDialog) {

1889

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1890

}

1891

1892

-int SetDialog (int /*long*/ aDialog) {

1893

+int SetDialog (long /*int*/ aDialog) {

1894

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

1895

}

1896

1897

/* nsIWebProgressListener */

1898

1899

-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {

1900

+int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {

1901

if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {

1902

if (helperAppLauncher != null) helperAppLauncher.Release ();

1903

helperAppLauncher = null;

1904

@@ -348,7 +348,7 @@

1905

return XPCOM.NS_OK;

1906

}

1907

1908

-int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {

1909

+int OnProgressChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {

1910

int currentKBytes = aCurTotalProgress / 1024;

1911

int totalKBytes = aMaxTotalProgress / 1024;

1912

if (shell != null && !shell.isDisposed ()) {

1913

@@ -361,15 +361,15 @@

1914

return XPCOM.NS_OK;

1915

}

1916

1917

-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {

1918

+int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {

1919

return XPCOM.NS_OK;

1920

}

1921

1922

-int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {

1923

+int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {

1924

return XPCOM.NS_OK;

1925

}

1926

1927

-int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {

1928

+int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {

1929

return XPCOM.NS_OK;

1930

}

1931

}

1932

diff -urN x86/org/eclipse/swt/browser/ExternalFactory.java x86_64/org/eclipse/swt/browser/ExternalFactory.java

1933

--- x86/org/eclipse/swt/browser/ExternalFactory.java 2008-12-02 11:18:46.000000000 -0500

1934

+++ x86_64/org/eclipse/swt/browser/ExternalFactory.java 2009-09-17 08:48:20.000000000 -0400

1935

@@ -30,17 +30,17 @@

1936

void createCOMInterfaces () {

1937

/* Create each of the interfaces that this object implements */

1938

supports = new XPCOMObject (new int[] {2, 0, 0}) {

1939

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

1940

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

1941

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

1942

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

1943

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

1944

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

1945

};

1946

1947

factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {

1948

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

1949

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

1950

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

1951

- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}

1952

- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}

1953

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

1954

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

1955

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

1956

+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}

1957

+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}

1958

};

1959

}

1960

1961

@@ -55,27 +55,27 @@

1962

}

1963

}

1964

1965

-int /*long*/ getAddress () {

1966

+long /*int*/ getAddress () {

1967

return factory.getAddress ();

1968

}

1969

1970

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

1971

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

1972

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

1973

nsID guid = new nsID ();

1974

XPCOM.memmove (guid, riid, nsID.sizeof);

1975

1976

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

1977

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

1978

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

1979

AddRef ();

1980

return XPCOM.NS_OK;

1981

}

1982

if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {

1983

- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);

1984

+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);

1985

AddRef ();

1986

return XPCOM.NS_OK;

1987

}

1988

1989

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

1990

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

1991

return XPCOM.NS_ERROR_NO_INTERFACE;

1992

}

1993

1994

@@ -87,10 +87,10 @@

1995

1996

/* nsIFactory */

1997

1998

-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {

1999

+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {

2000

External external = new External ();

2001

external.AddRef ();

2002

- XPCOM.memmove (result, new int /*long*/[] {external.getAddress ()}, C.PTR_SIZEOF);

2003

+ XPCOM.memmove (result, new long /*int*/[] {external.getAddress ()}, C.PTR_SIZEOF);

2004

return XPCOM.NS_OK;

2005

}

2006

2007

diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/browser/External.java

2008

--- x86/org/eclipse/swt/browser/External.java 2009-05-29 17:30:22.000000000 -0400

2009

+++ x86_64/org/eclipse/swt/browser/External.java 2009-09-17 08:48:20.000000000 -0400

2010

@@ -39,40 +39,40 @@

2011

void createCOMInterfaces () {

2012

/* Create each of the interfaces that this object implements */

2013

supports = new XPCOMObject (new int[] {2, 0, 0}) {

2014

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2015

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2016

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2017

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2018

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2019

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2020

};

2021

2022

classInfo = new XPCOMObject (new int[] {2, 0, 0, 2, 2, 1, 1, 1, 1, 1, 1}) {

2023

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2024

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2025

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2026

- public int /*long*/ method3 (int /*long*/[] args) {return getInterfaces (args[0], args[1]);}

2027

- public int /*long*/ method4 (int /*long*/[] args) {return getHelperForLanguage ((int)/*64*/args[0], args[1]);}

2028

- public int /*long*/ method5 (int /*long*/[] args) {return getContractID (args[0]);}

2029

- public int /*long*/ method6 (int /*long*/[] args) {return getClassDescription (args[0]);}

2030

- public int /*long*/ method7 (int /*long*/[] args) {return getClassID (args[0]);}

2031

- public int /*long*/ method8 (int /*long*/[] args) {return getImplementationLanguage (args[0]);}

2032

- public int /*long*/ method9 (int /*long*/[] args) {return getFlags (args[0]);}

2033

- public int /*long*/ method10 (int /*long*/[] args) {return getClassIDNoAlloc (args[0]);}

2034

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2035

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2036

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2037

+ public long /*int*/ method3 (long /*int*/[] args) {return getInterfaces (args[0], args[1]);}

2038

+ public long /*int*/ method4 (long /*int*/[] args) {return getHelperForLanguage ((int)/*64*/args[0], args[1]);}

2039

+ public long /*int*/ method5 (long /*int*/[] args) {return getContractID (args[0]);}

2040

+ public long /*int*/ method6 (long /*int*/[] args) {return getClassDescription (args[0]);}

2041

+ public long /*int*/ method7 (long /*int*/[] args) {return getClassID (args[0]);}

2042

+ public long /*int*/ method8 (long /*int*/[] args) {return getImplementationLanguage (args[0]);}

2043

+ public long /*int*/ method9 (long /*int*/[] args) {return getFlags (args[0]);}

2044

+ public long /*int*/ method10 (long /*int*/[] args) {return getClassIDNoAlloc (args[0]);}

2045

};

2046

2047

securityCheckedComponent = new XPCOMObject (new int[] {2, 0, 0, 2, 3, 3, 3}) {

2048

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2049

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2050

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2051

- public int /*long*/ method3 (int /*long*/[] args) {return canCreateWrapper (args[0], args[1]);}

2052

- public int /*long*/ method4 (int /*long*/[] args) {return canCallMethod (args[0], args[1], args[2]);}

2053

- public int /*long*/ method5 (int /*long*/[] args) {return canGetProperty (args[0], args[1], args[2]);}

2054

- public int /*long*/ method6 (int /*long*/[] args) {return canSetProperty (args[0], args[1], args[2]);}

2055

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2056

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2057

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2058

+ public long /*int*/ method3 (long /*int*/[] args) {return canCreateWrapper (args[0], args[1]);}

2059

+ public long /*int*/ method4 (long /*int*/[] args) {return canCallMethod (args[0], args[1], args[2]);}

2060

+ public long /*int*/ method5 (long /*int*/[] args) {return canGetProperty (args[0], args[1], args[2]);}

2061

+ public long /*int*/ method6 (long /*int*/[] args) {return canSetProperty (args[0], args[1], args[2]);}

2062

};

2063

2064

external = new XPCOMObject (new int[] {2, 0, 0, 3}) {

2065

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2066

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2067

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2068

- public int /*long*/ method3 (int /*long*/[] args) {return callJava ((int)/*64*/args[0], args[1], args[2]);}

2069

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2070

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2071

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2072

+ public long /*int*/ method3 (long /*int*/[] args) {return callJava ((int)/*64*/args[0], args[1], args[2]);}

2073

};

2074

2075

}

2076

@@ -88,37 +88,37 @@

2077

}

2078

}

2079

2080

-int /*long*/ getAddress () {

2081

+long /*int*/ getAddress () {

2082

return external.getAddress ();

2083

}

2084

2085

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

2086

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

2087

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

2088

nsID guid = new nsID ();

2089

XPCOM.memmove (guid, riid, nsID.sizeof);

2090

2091

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

2092

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

2093

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

2094

AddRef();

2095

return XPCOM.NS_OK;

2096

}

2097

if (guid.Equals (nsIClassInfo.NS_ICLASSINFO_IID)) {

2098

- XPCOM.memmove (ppvObject, new int /*long*/[] {classInfo.getAddress ()}, C.PTR_SIZEOF);

2099

+ XPCOM.memmove (ppvObject, new long /*int*/[] {classInfo.getAddress ()}, C.PTR_SIZEOF);

2100

AddRef();

2101

return XPCOM.NS_OK;

2102

}

2103

if (guid.Equals (nsISecurityCheckedComponent.NS_ISECURITYCHECKEDCOMPONENT_IID)) {

2104

- XPCOM.memmove (ppvObject, new int /*long*/[] {securityCheckedComponent.getAddress ()}, C.PTR_SIZEOF);

2105

+ XPCOM.memmove (ppvObject, new long /*int*/[] {securityCheckedComponent.getAddress ()}, C.PTR_SIZEOF);

2106

AddRef();

2107

return XPCOM.NS_OK;

2108

}

2109

if (guid.Equals (EXTERNAL_IID)) {

2110

- XPCOM.memmove (ppvObject, new int /*long*/[] {external.getAddress ()}, C.PTR_SIZEOF);

2111

+ XPCOM.memmove (ppvObject, new long /*int*/[] {external.getAddress ()}, C.PTR_SIZEOF);

2112

AddRef();

2113

return XPCOM.NS_OK;

2114

}

2115

2116

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

2117

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

2118

return XPCOM.NS_ERROR_NO_INTERFACE;

2119

}

2120

2121

@@ -130,8 +130,8 @@

2122

2123

/* nsIClassInfo */

2124

2125

-int getClassDescription (int /*long*/ _retValue) {

2126

- int /*long*/[] result = new int /*long*/[1];

2127

+int getClassDescription (long /*int*/ _retValue) {

2128

+ long /*int*/[] result = new long /*int*/[1];

2129

int rc = XPCOM.NS_GetServiceManager (result);

2130

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2131

if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

2132

@@ -147,44 +147,44 @@

2133

nsIMemory memory = new nsIMemory (result[0]);

2134

result[0] = 0;

2135

byte[] bytes = MozillaDelegate.wcsToMbcs (null, "external", true); //$NON-NLS-1$

2136

- int /*long*/ ptr = memory.Alloc (bytes.length);

2137

+ long /*int*/ ptr = memory.Alloc (bytes.length);

2138

C.memmove (ptr, bytes, bytes.length);

2139

- C.memmove (_retValue, new int /*long*/[] {ptr}, C.PTR_SIZEOF);

2140

+ C.memmove (_retValue, new long /*int*/[] {ptr}, C.PTR_SIZEOF);

2141

memory.Release ();

2142

2143

return XPCOM.NS_OK;

2144

}

2145

2146

-int getClassID (int /*long*/ _retValue) {

2147

+int getClassID (long /*int*/ _retValue) {

2148

return XPCOM.NS_OK;

2149

}

2150

2151

-int getClassIDNoAlloc (int /*long*/ _retValue) {

2152

+int getClassIDNoAlloc (long /*int*/ _retValue) {

2153

return XPCOM.NS_OK;

2154

}

2155

2156

-int getContractID (int /*long*/ _retValue) {

2157

+int getContractID (long /*int*/ _retValue) {

2158

return XPCOM.NS_OK;

2159

}

2160

2161

-int getFlags (int /*long*/ flags) {

2162

+int getFlags (long /*int*/ flags) {

2163

C.memmove (flags, new int[] {nsIClassInfo.MAIN_THREAD_ONLY}, 4); /* PRUint32 */

2164

return XPCOM.NS_OK;

2165

}

2166

2167

-int getHelperForLanguage (int language, int /*long*/ _retValue) {

2168

- C.memmove (_retValue, new int /*long*/[] {0}, C.PTR_SIZEOF);

2169

+int getHelperForLanguage (int language, long /*int*/ _retValue) {

2170

+ C.memmove (_retValue, new long /*int*/[] {0}, C.PTR_SIZEOF);

2171

return XPCOM.NS_OK;

2172

}

2173

2174

-int getImplementationLanguage (int /*long*/ _retValue) {

2175

+int getImplementationLanguage (long /*int*/ _retValue) {

2176

C.memmove (_retValue, new int[] {5}, 4); /* nsIProgrammingLanguage.JAVA */ /* PRUint */

2177

return XPCOM.NS_OK;

2178

}

2179

2180

2181

-int getInterfaces (int /*long*/ count, int /*long*/ array) {

2182

- int /*long*/[] result = new int /*long*/[1];

2183

+int getInterfaces (long /*int*/ count, long /*int*/ array) {

2184

+ long /*int*/[] result = new long /*int*/[1];

2185

int rc = XPCOM.NS_GetServiceManager (result);

2186

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2187

if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

2188

@@ -199,14 +199,14 @@

2189

2190

nsIMemory memory = new nsIMemory (result[0]);

2191

result[0] = 0;

2192

- int /*long*/ securityCheckedComponentIID = memory.Alloc (nsID.sizeof);

2193

+ long /*int*/ securityCheckedComponentIID = memory.Alloc (nsID.sizeof);

2194

XPCOM.memmove (securityCheckedComponentIID, nsISecurityCheckedComponent.NS_ISECURITYCHECKEDCOMPONENT_IID, nsID.sizeof);

2195

- int /*long*/ externalIID = memory.Alloc (nsID.sizeof);

2196

+ long /*int*/ externalIID = memory.Alloc (nsID.sizeof);

2197

XPCOM.memmove (externalIID, EXTERNAL_IID, nsID.sizeof);

2198

- int /*long*/ ptrArray = memory.Alloc (2 * C.PTR_SIZEOF);

2199

- C.memmove (ptrArray, new int /*long*/[] {securityCheckedComponentIID}, C.PTR_SIZEOF);

2200

- C.memmove (ptrArray + C.PTR_SIZEOF, new int /*long*/[] {externalIID}, C.PTR_SIZEOF);

2201

- C.memmove (array, new int /*long*/[] {ptrArray}, C.PTR_SIZEOF);

2202

+ long /*int*/ ptrArray = memory.Alloc (2 * C.PTR_SIZEOF);

2203

+ C.memmove (ptrArray, new long /*int*/[] {securityCheckedComponentIID}, C.PTR_SIZEOF);

2204

+ C.memmove (ptrArray + C.PTR_SIZEOF, new long /*int*/[] {externalIID}, C.PTR_SIZEOF);

2205

+ C.memmove (array, new long /*int*/[] {ptrArray}, C.PTR_SIZEOF);

2206

memory.Release ();

2207

2208

C.memmove (count, new int[] {2}, 4); /* PRUint */

2209

@@ -215,8 +215,8 @@

2210

2211

/* nsISecurityCheckedComponent */

2212

2213

-int canCreateWrapper (int /*long*/ iid, int /*long*/ _retVal) {

2214

- int /*long*/[] result = new int /*long*/[1];

2215

+int canCreateWrapper (long /*int*/ iid, long /*int*/ _retVal) {

2216

+ long /*int*/[] result = new long /*int*/[1];

2217

int rc = XPCOM.NS_GetServiceManager (result);

2218

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2219

if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

2220

@@ -232,16 +232,16 @@

2221

nsIMemory memory = new nsIMemory (result[0]);

2222

result[0] = 0;

2223

byte[] bytes = MozillaDelegate.wcsToMbcs (null, "allAccess", true); //$NON-NLS-1$

2224

- int /*long*/ ptr = memory.Alloc (bytes.length);

2225

+ long /*int*/ ptr = memory.Alloc (bytes.length);

2226

C.memmove (ptr, bytes, bytes.length);

2227

- C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);

2228

+ C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);

2229

memory.Release ();

2230

2231

return XPCOM.NS_OK;

2232

}

2233

2234

-int canCallMethod (int /*long*/ iid, int /*long*/ methodName, int /*long*/ _retVal) {

2235

- int /*long*/[] result = new int /*long*/[1];

2236

+int canCallMethod (long /*int*/ iid, long /*int*/ methodName, long /*int*/ _retVal) {

2237

+ long /*int*/[] result = new long /*int*/[1];

2238

int rc = XPCOM.NS_GetServiceManager (result);

2239

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2240

if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

2241

@@ -266,16 +266,16 @@

2242

} else {

2243

bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$

2244

}

2245

- int /*long*/ ptr = memory.Alloc (bytes.length);

2246

+ long /*int*/ ptr = memory.Alloc (bytes.length);

2247

C.memmove (ptr, bytes, bytes.length);

2248

- C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);

2249

+ C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);

2250

memory.Release ();

2251

2252

return XPCOM.NS_OK;

2253

}

2254

2255

-int canGetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _retVal) {

2256

- int /*long*/[] result = new int /*long*/[1];

2257

+int canGetProperty (long /*int*/ iid, long /*int*/ propertyName, long /*int*/ _retVal) {

2258

+ long /*int*/[] result = new long /*int*/[1];

2259

int rc = XPCOM.NS_GetServiceManager (result);

2260

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2261

if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

2262

@@ -291,16 +291,16 @@

2263

nsIMemory memory = new nsIMemory (result[0]);

2264

result[0] = 0;

2265

byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$

2266

- int /*long*/ ptr = memory.Alloc (bytes.length);

2267

+ long /*int*/ ptr = memory.Alloc (bytes.length);

2268

C.memmove (ptr, bytes, bytes.length);

2269

- C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);

2270

+ C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);

2271

memory.Release ();

2272

2273

return XPCOM.NS_OK;

2274

}

2275

2276

-int canSetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _retVal) {

2277

- int /*long*/[] result = new int /*long*/[1];

2278

+int canSetProperty (long /*int*/ iid, long /*int*/ propertyName, long /*int*/ _retVal) {

2279

+ long /*int*/[] result = new long /*int*/[1];

2280

int rc = XPCOM.NS_GetServiceManager (result);

2281

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2282

if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

2283

@@ -316,9 +316,9 @@

2284

nsIMemory memory = new nsIMemory (result[0]);

2285

result[0] = 0;

2286

byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$

2287

- int /*long*/ ptr = memory.Alloc (bytes.length);

2288

+ long /*int*/ ptr = memory.Alloc (bytes.length);

2289

C.memmove (ptr, bytes, bytes.length);

2290

- C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);

2291

+ C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);

2292

memory.Release ();

2293

2294

return XPCOM.NS_OK;

2295

@@ -344,7 +344,7 @@

2296

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2297

return new Double (intResult[0]);

2298

case nsIDataType.VTYPE_DOUBLE:

2299

- int /*long*/ doubleReturn = C.malloc (8);

2300

+ long /*int*/ doubleReturn = C.malloc (8);

2301

rc = variant.GetAsDouble (doubleReturn);

2302

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2303

double[] doubleResult = new double[1];

2304

@@ -353,7 +353,7 @@

2305

return new Double (doubleResult[0]);

2306

case nsIDataType.VTYPE_WSTRING_SIZE_IS:

2307

int[] size = new int[1]; /* PRInt32 */

2308

- int /*long*/[] wString = new int /*long*/[1];

2309

+ long /*int*/[] wString = new long /*int*/[1];

2310

rc = variant.GetAsWStringWithSize (size, wString);

2311

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2312

char[] chars = new char[size[0]];

2313

@@ -361,11 +361,11 @@

2314

return new String (chars);

2315

case nsIDataType.VTYPE_ARRAY:

2316

Object[] arrayReturn = new Object[0];

2317

- int /*long*/ iid = C.malloc (nsID.sizeof);

2318

+ long /*int*/ iid = C.malloc (nsID.sizeof);

2319

C.memset (iid, 0, nsID.sizeof);

2320

int[] count = new int[1]; /* PRUint32 */

2321

short[] currentType = new short[1];

2322

- int /*long*/[] ptr = new int /*long*/[1];

2323

+ long /*int*/[] ptr = new long /*int*/[1];

2324

rc = variant.GetAsArray (currentType, iid, count, ptr);

2325

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2326

if (ptr[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);

2327

@@ -373,7 +373,7 @@

2328

XPCOM.memmove (id, iid, nsID.sizeof);

2329

C.free (iid);

2330

2331

- int /*long*/[] result = new int /*long*/[1];

2332

+ long /*int*/[] result = new long /*int*/[1];

2333

rc = XPCOM.NS_GetServiceManager (result);

2334

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2335

if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

2336

@@ -392,7 +392,7 @@

2337

if (id.Equals (nsIVariant.NS_IVARIANT_IID)) {

2338

arrayReturn = new Object[count[0]];

2339

for (int i = 0; i < count[0]; i++) {

2340

- int /*long*/[] arrayPtr = new int /*long*/[1];

2341

+ long /*int*/[] arrayPtr = new long /*int*/[1];

2342

C.memmove (arrayPtr, ptr[0] + i * C.PTR_SIZEOF, C.PTR_SIZEOF);

2343

nsISupports supports = new nsISupports (arrayPtr[0]);

2344

rc = supports.QueryInterface (nsIVariant.NS_IVARIANT_IID, result);

2345

@@ -444,8 +444,8 @@

2346

case nsIDataType.VTYPE_WCHAR_STR:

2347

arrayReturn = new Object[count[0]];

2348

for (int i = 0; i < count[0]; i++) {

2349

- int /*long*/ currentPtr = ptr[0] + i * C.PTR_SIZEOF;

2350

- int /*long*/[] stringPtr = new int /*long*/[1];

2351

+ long /*int*/ currentPtr = ptr[0] + i * C.PTR_SIZEOF;

2352

+ long /*int*/[] stringPtr = new long /*int*/[1];

2353

C.memmove (stringPtr, currentPtr, C.PTR_SIZEOF);

2354

int length = XPCOM.strlen_PRUnichar (stringPtr[0]);

2355

char[] dest = new char[length];

2356

@@ -468,7 +468,7 @@

2357

}

2358

2359

nsIVariant convertToJS (Object value, nsIComponentManager componentManager) {

2360

- int /*long*/[] result = new int /*long*/[1];

2361

+ long /*int*/[] result = new long /*int*/[1];

2362

byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_VARIANT_CONTRACTID, true);

2363

int rc = componentManager.CreateInstanceByContractID (aContractID, 0, nsIWritableVariant.NS_IWRITABLEVARIANT_IID, result);

2364

nsIWritableVariant variant = new nsIWritableVariant (result[0]);

2365

@@ -504,26 +504,26 @@

2366

Object[] arrayValue = (Object[])value;

2367

int length = arrayValue.length;

2368

if (length > 0) {

2369

- int /*long*/ arrayPtr = C.malloc (C.PTR_SIZEOF * length);

2370

+ long /*int*/ arrayPtr = C.malloc (C.PTR_SIZEOF * length);

2371

for (int i = 0; i < length; i++) {

2372

Object currentObject = arrayValue[i];

2373

try {

2374

nsIVariant currentVariant = convertToJS (currentObject, componentManager);

2375

- C.memmove (arrayPtr + C.PTR_SIZEOF * i, new int /*long*/[] {currentVariant.getAddress ()}, C.PTR_SIZEOF);

2376

+ C.memmove (arrayPtr + C.PTR_SIZEOF * i, new long /*int*/[] {currentVariant.getAddress ()}, C.PTR_SIZEOF);

2377

} catch (SWTException e) {

2378

/* invalid return value type */

2379

C.free (arrayPtr);

2380

variant.Release ();

2381

/* release the variants that had previously been added to the array */

2382

for (int j = 0; j < i; j++) {

2383

- int /*long*/[] ptr = new int /*long*/[1];

2384

+ long /*int*/[] ptr = new long /*int*/[1];

2385

C.memmove (ptr, arrayPtr + C.PTR_SIZEOF * j, C.PTR_SIZEOF);

2386

new nsISupports (ptr[0]).Release ();

2387

}

2388

throw e;

2389

}

2390

}

2391

- int /*long*/ idPtr = C.malloc (nsID.sizeof);

2392

+ long /*int*/ idPtr = C.malloc (nsID.sizeof);

2393

XPCOM.memmove (idPtr, nsIVariant.NS_IVARIANT_IID, nsID.sizeof);

2394

rc = variant.SetAsArray (nsIDataType.VTYPE_INTERFACE_IS, idPtr, length, arrayPtr);

2395

C.free (idPtr);

2396

@@ -538,7 +538,7 @@

2397

return null;

2398

}

2399

2400

-int callJava (int functionId, int /*long*/ args, int /*long*/ returnPtr) {

2401

+int callJava (int functionId, long /*int*/ args, long /*int*/ returnPtr) {

2402

Object key = new Integer (functionId);

2403

BrowserFunction function = (BrowserFunction)Mozilla.AllFunctions.get (key);

2404

Object returnValue = null;

2405

@@ -569,7 +569,7 @@

2406

}

2407

}

2408

2409

- int /*long*/[] result = new int /*long*/[1];

2410

+ long /*int*/[] result = new long /*int*/[1];

2411

int rc = XPCOM.NS_GetComponentManager (result);

2412

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2413

if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

2414

@@ -583,7 +583,7 @@

2415

variant = convertToJS (WebBrowser.CreateErrorString (e.getLocalizedMessage ()), componentManager);

2416

}

2417

componentManager.Release ();

2418

- C.memmove (returnPtr, new int /*long*/[] {variant.getAddress ()}, C.PTR_SIZEOF);

2419

+ C.memmove (returnPtr, new long /*int*/[] {variant.getAddress ()}, C.PTR_SIZEOF);

2420

2421

return XPCOM.NS_OK;

2422

}

2423

diff -urN x86/org/eclipse/swt/browser/FilePicker_1_8.java x86_64/org/eclipse/swt/browser/FilePicker_1_8.java

2424

--- x86/org/eclipse/swt/browser/FilePicker_1_8.java 2007-08-01 15:57:24.000000000 -0400

2425

+++ x86_64/org/eclipse/swt/browser/FilePicker_1_8.java 2009-09-17 08:48:20.000000000 -0400

2426

@@ -17,30 +17,30 @@

2427

void createCOMInterfaces () {

2428

/* Create each of the interfaces that this object implements */

2429

supports = new XPCOMObject (new int[] {2, 0, 0}) {

2430

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2431

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2432

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2433

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2434

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2435

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2436

};

2437

2438

filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {

2439

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2440

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2441

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2442

- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], (short)args[2]);}

2443

- public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);}

2444

- public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);}

2445

- public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);}

2446

- public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);}

2447

- public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);}

2448

- public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);}

2449

- public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);}

2450

- public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}

2451

- public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);}

2452

- public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);}

2453

- public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);}

2454

- public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);}

2455

- public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);}

2456

- public int /*long*/ method17 (int /*long*/[] args) {return Show (args[0]);}

2457

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2458

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2459

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2460

+ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], (short)args[2]);}

2461

+ public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);}

2462

+ public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);}

2463

+ public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);}

2464

+ public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);}

2465

+ public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);}

2466

+ public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);}

2467

+ public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);}

2468

+ public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}

2469

+ public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);}

2470

+ public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);}

2471

+ public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);}

2472

+ public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);}

2473

+ public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);}

2474

+ public long /*int*/ method17 (long /*int*/[] args) {return Show (args[0]);}

2475

};

2476

}

2477

2478

@@ -49,10 +49,10 @@

2479

* answers a java string based on the type of string that is appropriate for the Mozilla

2480

* version being used.

2481

*/

2482

-String parseAString (int /*long*/ string) {

2483

+String parseAString (long /*int*/ string) {

2484

if (string == 0) return null;

2485

int length = XPCOM.nsEmbedString_Length (string);

2486

- int /*long*/ buffer = XPCOM.nsEmbedString_get (string);

2487

+ long /*int*/ buffer = XPCOM.nsEmbedString_get (string);

2488

char[] chars = new char[length];

2489

XPCOM.memmove (chars, buffer, length * 2);

2490

return new String (chars);

2491

diff -urN x86/org/eclipse/swt/browser/FilePickerFactory_1_8.java x86_64/org/eclipse/swt/browser/FilePickerFactory_1_8.java

2492

--- x86/org/eclipse/swt/browser/FilePickerFactory_1_8.java 2007-08-01 15:57:26.000000000 -0400

2493

+++ x86_64/org/eclipse/swt/browser/FilePickerFactory_1_8.java 2009-09-17 08:48:20.000000000 -0400

2494

@@ -18,26 +18,26 @@

2495

void createCOMInterfaces () {

2496

/* Create each of the interfaces that this object implements */

2497

supports = new XPCOMObject (new int[] {2, 0, 0}) {

2498

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2499

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2500

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2501

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2502

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2503

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2504

};

2505

2506

factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {

2507

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2508

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2509

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2510

- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}

2511

- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}

2512

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2513

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2514

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2515

+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}

2516

+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}

2517

};

2518

}

2519

2520

/* nsIFactory */

2521

2522

-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {

2523

+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {

2524

FilePicker_1_8 picker = new FilePicker_1_8 ();

2525

picker.AddRef ();

2526

- XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);

2527

+ XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF);

2528

return XPCOM.NS_OK;

2529

}

2530

2531

diff -urN x86/org/eclipse/swt/browser/FilePickerFactory.java x86_64/org/eclipse/swt/browser/FilePickerFactory.java

2532

--- x86/org/eclipse/swt/browser/FilePickerFactory.java 2007-08-01 15:57:24.000000000 -0400

2533

+++ x86_64/org/eclipse/swt/browser/FilePickerFactory.java 2009-09-17 08:48:20.000000000 -0400

2534

@@ -30,17 +30,17 @@

2535

void createCOMInterfaces () {

2536

/* Create each of the interfaces that this object implements */

2537

supports = new XPCOMObject (new int[] {2, 0, 0}) {

2538

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2539

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2540

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2541

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2542

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2543

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2544

};

2545

2546

factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {

2547

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2548

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2549

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2550

- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}

2551

- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}

2552

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2553

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2554

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2555

+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}

2556

+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}

2557

};

2558

}

2559

2560

@@ -55,27 +55,27 @@

2561

}

2562

}

2563

2564

-int /*long*/ getAddress () {

2565

+long /*int*/ getAddress () {

2566

return factory.getAddress ();

2567

}

2568

2569

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

2570

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

2571

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

2572

nsID guid = new nsID ();

2573

XPCOM.memmove (guid, riid, nsID.sizeof);

2574

2575

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

2576

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

2577

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

2578

AddRef ();

2579

return XPCOM.NS_OK;

2580

}

2581

if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {

2582

- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);

2583

+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);

2584

AddRef ();

2585

return XPCOM.NS_OK;

2586

}

2587

2588

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

2589

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

2590

return XPCOM.NS_ERROR_NO_INTERFACE;

2591

}

2592

2593

@@ -87,10 +87,10 @@

2594

2595

/* nsIFactory */

2596

2597

-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {

2598

+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {

2599

FilePicker picker = new FilePicker ();

2600

picker.AddRef ();

2601

- XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);

2602

+ XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF);

2603

return XPCOM.NS_OK;

2604

}

2605

2606

diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/browser/FilePicker.java

2607

--- x86/org/eclipse/swt/browser/FilePicker.java 2008-09-05 12:40:14.000000000 -0400

2608

+++ x86_64/org/eclipse/swt/browser/FilePicker.java 2009-09-17 08:48:20.000000000 -0400

2609

@@ -21,7 +21,7 @@

2610

2611

int refCount = 0;

2612

short mode;

2613

- int /*long*/ parentHandle;

2614

+ long /*int*/ parentHandle;

2615

String[] files, masks;

2616

String defaultFilename, directory, title;

2617

2618

@@ -39,30 +39,30 @@

2619

void createCOMInterfaces () {

2620

/* Create each of the interfaces that this object implements */

2621

supports = new XPCOMObject (new int[] {2, 0, 0}) {

2622

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2623

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2624

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2625

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2626

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2627

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2628

};

2629

2630

filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {

2631

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2632

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2633

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2634

- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], (short)args[2]);}

2635

- public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);}

2636

- public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);}

2637

- public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);}

2638

- public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);}

2639

- public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);}

2640

- public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);}

2641

- public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);}

2642

- public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}

2643

- public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);}

2644

- public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);}

2645

- public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);}

2646

- public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);}

2647

- public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);}

2648

- public int /*long*/ method17 (int /*long*/[] args) {return Show (args[0]);}

2649

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2650

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2651

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2652

+ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], (short)args[2]);}

2653

+ public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);}

2654

+ public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);}

2655

+ public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);}

2656

+ public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);}

2657

+ public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);}

2658

+ public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);}

2659

+ public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);}

2660

+ public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}

2661

+ public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);}

2662

+ public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);}

2663

+ public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);}

2664

+ public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);}

2665

+ public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);}

2666

+ public long /*int*/ method17 (long /*int*/[] args) {return Show (args[0]);}

2667

};

2668

}

2669

2670

@@ -77,32 +77,32 @@

2671

}

2672

}

2673

2674

-int /*long*/ getAddress () {

2675

+long /*int*/ getAddress () {

2676

return filePicker.getAddress ();

2677

}

2678

2679

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

2680

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

2681

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

2682

nsID guid = new nsID ();

2683

XPCOM.memmove (guid, riid, nsID.sizeof);

2684

2685

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

2686

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

2687

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

2688

AddRef ();

2689

return XPCOM.NS_OK;

2690

}

2691

if (guid.Equals (nsIFilePicker.NS_IFILEPICKER_IID)) {

2692

- XPCOM.memmove(ppvObject, new int /*long*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);

2693

+ XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);

2694

AddRef ();

2695

return XPCOM.NS_OK;

2696

}

2697

if (guid.Equals (nsIFilePicker_1_8.NS_IFILEPICKER_IID)) {

2698

- XPCOM.memmove(ppvObject, new int /*long*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);

2699

+ XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);

2700

AddRef ();

2701

return XPCOM.NS_OK;

2702

}

2703

2704

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

2705

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

2706

return XPCOM.NS_ERROR_NO_INTERFACE;

2707

}

2708

2709

@@ -112,7 +112,7 @@

2710

return refCount;

2711

}

2712

2713

-Browser getBrowser (int /*long*/ aDOMWindow) {

2714

+Browser getBrowser (long /*int*/ aDOMWindow) {

2715

if (aDOMWindow == 0) return null;

2716

nsIDOMWindow window = new nsIDOMWindow (aDOMWindow);

2717

return Mozilla.findBrowser (window);

2718

@@ -123,20 +123,20 @@

2719

* answers a java string based on the type of string that is appropriate for the Mozilla

2720

* version being used.

2721

*/

2722

-String parseAString (int /*long*/ string) {

2723

+String parseAString (long /*int*/ string) {

2724

return null;

2725

}

2726

2727

/* nsIFilePicker */

2728

2729

-int Init (int /*long*/ parent, int /*long*/ title, short mode) {

2730

+int Init (long /*int*/ parent, long /*int*/ title, short mode) {

2731

parentHandle = parent;

2732

this.mode = mode;

2733

this.title = parseAString (title);

2734

return XPCOM.NS_OK;

2735

}

2736

2737

-int Show (int /*long*/ _retval) {

2738

+int Show (long /*int*/ _retval) {

2739

if (mode == nsIFilePicker.modeGetFolder) {

2740

/* picking a directory */

2741

int result = showDirectoryPicker ();

2742

@@ -186,20 +186,20 @@

2743

return directory == null ? nsIFilePicker.returnCancel : nsIFilePicker.returnOK;

2744

}

2745

2746

-int GetFiles (int /*long*/ aFiles) {

2747

+int GetFiles (long /*int*/ aFiles) {

2748

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

2749

}

2750

2751

-int GetFileURL (int /*long*/ aFileURL) {

2752

+int GetFileURL (long /*int*/ aFileURL) {

2753

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

2754

}

2755

2756

-int GetFile (int /*long*/ aFile) {

2757

+int GetFile (long /*int*/ aFile) {

2758

String filename = ""; //$NON-NLS-1$

2759

if (directory != null) filename += directory + SEPARATOR;

2760

if (files != null && files.length > 0) filename += files[0];

2761

nsEmbedString path = new nsEmbedString (filename);

2762

- int /*long*/[] file = new int /*long*/[1];

2763

+ long /*int*/[] file = new long /*int*/[1];

2764

int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, file);

2765

path.dispose ();

2766

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2767

@@ -208,13 +208,13 @@

2768

return XPCOM.NS_OK;

2769

}

2770

2771

-int SetDisplayDirectory (int /*long*/ aDisplayDirectory) {

2772

+int SetDisplayDirectory (long /*int*/ aDisplayDirectory) {

2773

if (aDisplayDirectory == 0) return XPCOM.NS_OK;

2774

nsILocalFile file = new nsILocalFile (aDisplayDirectory);

2775

- int /*long*/ pathname = XPCOM.nsEmbedCString_new ();

2776

+ long /*int*/ pathname = XPCOM.nsEmbedCString_new ();

2777

file.GetNativePath (pathname);

2778

int length = XPCOM.nsEmbedCString_Length (pathname);

2779

- int /*long*/ buffer = XPCOM.nsEmbedCString_get (pathname);

2780

+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (pathname);

2781

byte[] bytes = new byte[length];

2782

XPCOM.memmove (bytes, buffer, length);

2783

XPCOM.nsEmbedCString_delete (pathname);

2784

@@ -223,10 +223,10 @@

2785

return XPCOM.NS_OK;

2786

}

2787

2788

-int GetDisplayDirectory (int /*long*/ aDisplayDirectory) {

2789

+int GetDisplayDirectory (long /*int*/ aDisplayDirectory) {

2790

String directoryName = directory != null ? directory : ""; //$NON-NLS-1$

2791

nsEmbedString path = new nsEmbedString (directoryName);

2792

- int /*long*/[] file = new int /*long*/[1];

2793

+ long /*int*/[] file = new long /*int*/[1];

2794

int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, file);

2795

path.dispose ();

2796

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2797

@@ -239,31 +239,31 @@

2798

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

2799

}

2800

2801

-int GetFilterIndex (int /*long*/ aFilterIndex) {

2802

+int GetFilterIndex (long /*int*/ aFilterIndex) {

2803

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

2804

}

2805

2806

-int SetDefaultExtension (int /*long*/ aDefaultExtension) {

2807

+int SetDefaultExtension (long /*int*/ aDefaultExtension) {

2808

/* note that the type of argument 1 changed as of Mozilla 1.8 */

2809

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

2810

}

2811

2812

-int GetDefaultExtension (int /*long*/ aDefaultExtension) {

2813

+int GetDefaultExtension (long /*int*/ aDefaultExtension) {

2814

/* note that the type of argument 1 changed as of Mozilla 1.8 */

2815

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

2816

}

2817

2818

-int SetDefaultString (int /*long*/ aDefaultString) {

2819

+int SetDefaultString (long /*int*/ aDefaultString) {

2820

defaultFilename = parseAString (aDefaultString);

2821

return XPCOM.NS_OK;

2822

}

2823

2824

-int GetDefaultString (int /*long*/ aDefaultString) {

2825

+int GetDefaultString (long /*int*/ aDefaultString) {

2826

/* note that the type of argument 1 changed as of Mozilla 1.8 */

2827

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

2828

}

2829

2830

-int AppendFilter (int /*long*/ title, int /*long*/ filter) {

2831

+int AppendFilter (long /*int*/ title, long /*int*/ filter) {

2832

/* note that the type of arguments 1 and 2 changed as of Mozilla 1.8 */

2833

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

2834

}

2835

diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java

2836

--- x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java 2008-08-21 15:41:30.000000000 -0400

2837

+++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java 2009-09-17 08:48:20.000000000 -0400

2838

@@ -38,17 +38,17 @@

2839

void createCOMInterfaces () {

2840

/* Create each of the interfaces that this object implements */

2841

supports = new XPCOMObject (new int[] {2, 0, 0}) {

2842

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2843

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2844

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2845

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2846

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2847

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2848

};

2849

2850

helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 6}) {

2851

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2852

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2853

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2854

- public int /*long*/ method3 (int /*long*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}

2855

- public int /*long*/ method4 (int /*long*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5]);}

2856

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2857

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2858

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2859

+ public long /*int*/ method3 (long /*int*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}

2860

+ public long /*int*/ method4 (long /*int*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5]);}

2861

};

2862

}

2863

2864

@@ -63,27 +63,27 @@

2865

}

2866

}

2867

2868

-int /*long*/ getAddress () {

2869

+long /*int*/ getAddress () {

2870

return helperAppLauncherDialog.getAddress ();

2871

}

2872

2873

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

2874

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

2875

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

2876

nsID guid = new nsID ();

2877

XPCOM.memmove (guid, riid, nsID.sizeof);

2878

2879

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

2880

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

2881

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

2882

AddRef ();

2883

return XPCOM.NS_OK;

2884

}

2885

if (guid.Equals (nsIHelperAppLauncherDialog_1_9.NS_IHELPERAPPLAUNCHERDIALOG_IID)) {

2886

- XPCOM.memmove (ppvObject, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);

2887

+ XPCOM.memmove (ppvObject, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);

2888

AddRef ();

2889

return XPCOM.NS_OK;

2890

}

2891

2892

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

2893

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

2894

return XPCOM.NS_ERROR_NO_INTERFACE;

2895

}

2896

2897

@@ -102,12 +102,12 @@

2898

2899

/* nsIHelperAppLauncherDialog */

2900

2901

-int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {

2902

+int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) {

2903

nsIHelperAppLauncher_1_9 helperAppLauncher = new nsIHelperAppLauncher_1_9 (aLauncher);

2904

return helperAppLauncher.SaveToDisk (0, 0);

2905

}

2906

2907

-int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, int /*long*/ aDefaultFileName, int /*long*/ aSuggestedFileExtension, int aForcePrompt, int /*long*/ _retval) {

2908

+int PromptForSaveToFile (long /*int*/ aLauncher, long /*int*/ aWindowContext, long /*int*/ aDefaultFileName, long /*int*/ aSuggestedFileExtension, int aForcePrompt, long /*int*/ _retval) {

2909

int length = XPCOM.strlen_PRUnichar (aDefaultFileName);

2910

char[] dest = new char[length];

2911

XPCOM.memmove (dest, aDefaultFileName, length * 2);

2912

@@ -131,7 +131,7 @@

2913

return XPCOM.NS_ERROR_FAILURE;

2914

}

2915

nsEmbedString path = new nsEmbedString (name);

2916

- int /*long*/[] result = new int /*long*/[1];

2917

+ long /*int*/[] result = new long /*int*/[1];

2918

int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, result);

2919

path.dispose ();

2920

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

2921

diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java

2922

--- x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java 2009-05-29 17:30:24.000000000 -0400

2923

+++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java 2009-09-17 08:48:20.000000000 -0400

2924

@@ -30,17 +30,17 @@

2925

void createCOMInterfaces () {

2926

/* Create each of the interfaces that this object implements */

2927

supports = new XPCOMObject (new int[] {2, 0, 0}) {

2928

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2929

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2930

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2931

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2932

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2933

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2934

};

2935

2936

factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {

2937

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

2938

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

2939

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

2940

- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}

2941

- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}

2942

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

2943

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

2944

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

2945

+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}

2946

+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}

2947

};

2948

}

2949

2950

@@ -55,27 +55,27 @@

2951

}

2952

}

2953

2954

-int /*long*/ getAddress () {

2955

+long /*int*/ getAddress () {

2956

return factory.getAddress ();

2957

}

2958

2959

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

2960

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

2961

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

2962

nsID guid = new nsID ();

2963

XPCOM.memmove (guid, riid, nsID.sizeof);

2964

2965

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

2966

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

2967

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

2968

AddRef ();

2969

return XPCOM.NS_OK;

2970

}

2971

if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {

2972

- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);

2973

+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);

2974

AddRef ();

2975

return XPCOM.NS_OK;

2976

}

2977

2978

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

2979

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

2980

return XPCOM.NS_ERROR_NO_INTERFACE;

2981

}

2982

2983

@@ -87,15 +87,15 @@

2984

2985

/* nsIFactory */

2986

2987

-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {

2988

+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {

2989

if (Mozilla.IsPre_1_9) {

2990

HelperAppLauncherDialog helperAppLauncherDialog = new HelperAppLauncherDialog ();

2991

helperAppLauncherDialog.AddRef ();

2992

- XPCOM.memmove (result, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);

2993

+ XPCOM.memmove (result, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);

2994

} else {

2995

HelperAppLauncherDialog_1_9 helperAppLauncherDialog = new HelperAppLauncherDialog_1_9 ();

2996

helperAppLauncherDialog.AddRef ();

2997

- XPCOM.memmove (result, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);

2998

+ XPCOM.memmove (result, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);

2999

}

3000

return XPCOM.NS_OK;

3001

}

3002

diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog.java

3003

--- x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java 2008-08-21 15:41:30.000000000 -0400

3004

+++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog.java 2009-09-17 08:48:20.000000000 -0400

3005

@@ -38,17 +38,17 @@

3006

void createCOMInterfaces () {

3007

/* Create each of the interfaces that this object implements */

3008

supports = new XPCOMObject (new int[] {2, 0, 0}) {

3009

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3010

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3011

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3012

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3013

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3014

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3015

};

3016

3017

helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 5}) {

3018

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3019

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3020

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3021

- public int /*long*/ method3 (int /*long*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}

3022

- public int /*long*/ method4 (int /*long*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);}

3023

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3024

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3025

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3026

+ public long /*int*/ method3 (long /*int*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}

3027

+ public long /*int*/ method4 (long /*int*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);}

3028

};

3029

}

3030

3031

@@ -63,27 +63,27 @@

3032

}

3033

}

3034

3035

-int /*long*/ getAddress () {

3036

+long /*int*/ getAddress () {

3037

return helperAppLauncherDialog.getAddress ();

3038

}

3039

3040

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

3041

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

3042

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

3043

nsID guid = new nsID ();

3044

XPCOM.memmove (guid, riid, nsID.sizeof);

3045

3046

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

3047

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

3048

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

3049

AddRef ();

3050

return XPCOM.NS_OK;

3051

}

3052

if (guid.Equals (nsIHelperAppLauncherDialog.NS_IHELPERAPPLAUNCHERDIALOG_IID)) {

3053

- XPCOM.memmove (ppvObject, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);

3054

+ XPCOM.memmove (ppvObject, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);

3055

AddRef ();

3056

return XPCOM.NS_OK;

3057

}

3058

3059

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

3060

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

3061

return XPCOM.NS_ERROR_NO_INTERFACE;

3062

}

3063

3064

@@ -102,14 +102,14 @@

3065

3066

/* nsIHelperAppLauncherDialog */

3067

3068

-int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {

3069

+int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) {

3070

/*

3071

* The interface for nsIHelperAppLauncher changed as of mozilla 1.8. Query the received

3072

* nsIHelperAppLauncher for the new interface, and if it is not found then fall back to

3073

* the old interface.

3074

*/

3075

nsISupports supports = new nsISupports (aLauncher);

3076

- int /*long*/[] result = new int /*long*/[1];

3077

+ long /*int*/[] result = new long /*int*/[1];

3078

int rc = supports.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);

3079

if (rc == XPCOM.NS_OK) { /* >= 1.8 */

3080

nsIHelperAppLauncher_1_8 helperAppLauncher = new nsIHelperAppLauncher_1_8 (aLauncher);

3081

@@ -121,8 +121,8 @@

3082

return helperAppLauncher.SaveToDisk (0, 0);

3083

}

3084

3085

-int PromptForSaveToFile (int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4) {

3086

- int /*long*/ aDefaultFile, aSuggestedFileExtension, _retval;

3087

+int PromptForSaveToFile (long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4) {

3088

+ long /*int*/ aDefaultFile, aSuggestedFileExtension, _retval;

3089

boolean hasLauncher = false;

3090

3091

/*

3092

@@ -140,7 +140,7 @@

3093

*/

3094

boolean using_1_8 = false;

3095

nsISupports support = new nsISupports (arg0);

3096

- int /*long*/[] result = new int /*long*/[1];

3097

+ long /*int*/[] result = new long /*int*/[1];

3098

int rc = support.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);

3099

if (rc == XPCOM.NS_OK) {

3100

using_1_8 = true;

3101

diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/browser/InputStream.java

3102

--- x86/org/eclipse/swt/browser/InputStream.java 2007-08-01 15:57:24.000000000 -0400

3103

+++ x86_64/org/eclipse/swt/browser/InputStream.java 2009-09-17 08:48:20.000000000 -0400

3104

@@ -34,14 +34,14 @@

3105

void createCOMInterfaces () {

3106

/* Create each of the interfaces that this object implements */

3107

inputStream = new XPCOMObject (new int[] {2, 0, 0, 0, 1, 3, 4, 1}) {

3108

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3109

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3110

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3111

- public int /*long*/ method3 (int /*long*/[] args) {return Close ();}

3112

- public int /*long*/ method4 (int /*long*/[] args) {return Available (args[0]);}

3113

- public int /*long*/ method5 (int /*long*/[] args) {return Read (args[0], (int)/*64*/args[1], args[2]);}

3114

- public int /*long*/ method6 (int /*long*/[] args) {return ReadSegments (args[0], args[1], (int)/*64*/args[2], args[3]);}

3115

- public int /*long*/ method7 (int /*long*/[] args) {return IsNonBlocking (args[0]);}

3116

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3117

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3118

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3119

+ public long /*int*/ method3 (long /*int*/[] args) {return Close ();}

3120

+ public long /*int*/ method4 (long /*int*/[] args) {return Available (args[0]);}

3121

+ public long /*int*/ method5 (long /*int*/[] args) {return Read (args[0], (int)/*64*/args[1], args[2]);}

3122

+ public long /*int*/ method6 (long /*int*/[] args) {return ReadSegments (args[0], args[1], (int)/*64*/args[2], args[3]);}

3123

+ public long /*int*/ method7 (long /*int*/[] args) {return IsNonBlocking (args[0]);}

3124

};

3125

}

3126

3127

@@ -52,26 +52,26 @@

3128

}

3129

}

3130

3131

-int /*long*/ getAddress () {

3132

+long /*int*/ getAddress () {

3133

return inputStream.getAddress ();

3134

}

3135

3136

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

3137

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

3138

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

3139

nsID guid = new nsID ();

3140

XPCOM.memmove (guid, riid, nsID.sizeof);

3141

3142

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

3143

- XPCOM.memmove (ppvObject, new int /*long*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);

3144

+ XPCOM.memmove (ppvObject, new long /*int*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);

3145

AddRef ();

3146

return XPCOM.NS_OK;

3147

}

3148

if (guid.Equals (nsIInputStream.NS_IINPUTSTREAM_IID)) {

3149

- XPCOM.memmove (ppvObject, new int /*long*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);

3150

+ XPCOM.memmove (ppvObject, new long /*int*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);

3151

AddRef ();

3152

return XPCOM.NS_OK;

3153

}

3154

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

3155

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

3156

return XPCOM.NS_ERROR_NO_INTERFACE;

3157

}

3158

3159

@@ -89,13 +89,13 @@

3160

return XPCOM.NS_OK;

3161

}

3162

3163

-int Available (int /*long*/ _retval) {

3164

+int Available (long /*int*/ _retval) {

3165

int available = buffer == null ? 0 : buffer.length - index;

3166

XPCOM.memmove (_retval, new int[] {available}, 4);

3167

return XPCOM.NS_OK;

3168

}

3169

3170

-int Read(int /*long*/ aBuf, int aCount, int /*long*/ _retval) {

3171

+int Read(long /*int*/ aBuf, int aCount, long /*int*/ _retval) {

3172

int max = Math.min (aCount, buffer == null ? 0 : buffer.length - index);

3173

if (max > 0) {

3174

byte[] src = new byte[max];

3175

@@ -107,12 +107,12 @@

3176

return XPCOM.NS_OK;

3177

}

3178

3179

-int ReadSegments (int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int /*long*/ _retval) {

3180

+int ReadSegments (long /*int*/ aWriter, long /*int*/ aClosure, int aCount, long /*int*/ _retval) {

3181

int max = Math.min (aCount, buffer == null ? 0 : buffer.length - index);

3182

int cnt = max;

3183

while (cnt > 0) {

3184

int[] aWriteCount = new int[1];

3185

- int /*long*/ rc = XPCOM.Call (aWriter, getAddress (), aClosure, buffer, index, cnt, aWriteCount);

3186

+ long /*int*/ rc = XPCOM.Call (aWriter, getAddress (), aClosure, buffer, index, cnt, aWriteCount);

3187

if (rc != XPCOM.NS_OK) break;

3188

index += aWriteCount[0];

3189

cnt -= aWriteCount[0];

3190

@@ -121,7 +121,7 @@

3191

return XPCOM.NS_OK;

3192

}

3193

3194

-int IsNonBlocking (int /*long*/ _retval) {

3195

+int IsNonBlocking (long /*int*/ _retval) {

3196

/* blocking */

3197

XPCOM.memmove (_retval, new int[] {0}, 4);

3198

return XPCOM.NS_OK;

3199

diff -urN x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/swt/browser/MozillaDelegate.java

3200

--- x86/org/eclipse/swt/browser/MozillaDelegate.java 2009-08-20 15:16:38.000000000 -0400

3201

+++ x86_64/org/eclipse/swt/browser/MozillaDelegate.java 2009-09-17 08:48:22.000000000 -0400

3202

@@ -19,11 +19,11 @@

3203

3204

class MozillaDelegate {

3205

Browser browser;

3206

- int /*long*/ mozillaHandle, embedHandle;

3207

+ long /*int*/ mozillaHandle, embedHandle;

3208

boolean hasFocus;

3209

Listener listener;

3210

static Callback eventCallback;

3211

- static int /*long*/ eventProc;

3212

+ static long /*int*/ eventProc;

3213

static final int STOP_PROPOGATE = 1;

3214

3215

static boolean IsSparc;

3216

@@ -47,8 +47,8 @@

3217

this.browser = browser;

3218

}

3219

3220

-static int /*long*/ eventProc (int /*long*/ handle, int /*long*/ gdkEvent, int /*long*/ pointer) {

3221

- int /*long*/ parent = OS.gtk_widget_get_parent (handle);

3222

+static long /*int*/ eventProc (long /*int*/ handle, long /*int*/ gdkEvent, long /*int*/ pointer) {

3223

+ long /*int*/ parent = OS.gtk_widget_get_parent (handle);

3224

parent = OS.gtk_widget_get_parent (parent);

3225

if (parent == 0) return 0;

3226

Widget widget = Display.getCurrent ().findWidget (parent);

3227

@@ -58,12 +58,12 @@

3228

return 0;

3229

}

3230

3231

-static Browser findBrowser (int /*long*/ handle) {

3232

+static Browser findBrowser (long /*int*/ handle) {

3233

/*

3234

* Note. On GTK, Mozilla is embedded into a GtkHBox handle

3235

* and not directly into the parent Composite handle.

3236

*/

3237

- int /*long*/ parent = OS.gtk_widget_get_parent (handle);

3238

+ long /*int*/ parent = OS.gtk_widget_get_parent (handle);

3239

Display display = Display.getCurrent ();

3240

return (Browser)display.findWidget (parent);

3241

}

3242

@@ -83,7 +83,7 @@

3243

return baseWindow.Create ();

3244

}

3245

3246

-int /*long*/ getHandle () {

3247

+long /*int*/ getHandle () {

3248

/*

3249

* Bug in Mozilla Linux GTK. Embedding Mozilla into a GtkFixed

3250

* handle causes problems with some Mozilla plug-ins. For some

3251

@@ -112,7 +112,7 @@

3252

return "swt-xpcominit"; //$NON-NLS-1$

3253

}

3254

3255

-int /*long*/ gtk_event (int /*long*/ handle, int /*long*/ gdkEvent, int /*long*/ pointer) {

3256

+long /*int*/ gtk_event (long /*int*/ handle, long /*int*/ gdkEvent, long /*int*/ pointer) {

3257

GdkEvent event = new GdkEvent ();

3258

OS.memmove (event, gdkEvent, GdkEvent.sizeof);

3259

if (event.type == OS.GDK_BUTTON_PRESS) {

3260

@@ -178,7 +178,7 @@

3261

* forward the event to the parent embedder before Mozilla received and consumed

3262

* them.

3263

*/

3264

- int /*long*/ list = OS.gtk_container_get_children (embedHandle);

3265

+ long /*int*/ list = OS.gtk_container_get_children (embedHandle);

3266

if (list != 0) {

3267

mozillaHandle = OS.g_list_data (list);

3268

OS.g_list_free (list);

3269

@@ -204,7 +204,7 @@

3270

return true;

3271

}

3272

3273

-void onDispose (int /*long*/ embedHandle) {

3274

+void onDispose (long /*int*/ embedHandle) {

3275

if (listener != null) {

3276

browser.getDisplay ().removeFilter (SWT.FocusIn, listener);

3277

browser.getShell ().removeListener (SWT.Deactivate, listener);

3278

@@ -216,7 +216,7 @@

3279

void removeWindowSubclass () {

3280

}

3281

3282

-void setSize (int /*long*/ embedHandle, int width, int height) {

3283

+void setSize (long /*int*/ embedHandle, int width, int height) {

3284

OS.gtk_widget_set_size_request (embedHandle, width, height);

3285

}

3286

3287

diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser/Mozilla.java

3288

--- x86/org/eclipse/swt/browser/Mozilla.java 2009-08-19 16:24:46.000000000 -0400

3289

+++ x86_64/org/eclipse/swt/browser/Mozilla.java 2009-09-17 08:48:20.000000000 -0400

3290

@@ -23,7 +23,7 @@

3291

import org.eclipse.swt.layout.*;

3292

3293

class Mozilla extends WebBrowser {

3294

- int /*long*/ embedHandle;

3295

+ long /*int*/ embedHandle;

3296

nsIWebBrowser webBrowser;

3297

Object webBrowserObject;

3298

MozillaDelegate delegate;

3299

@@ -44,7 +44,7 @@

3300

XPCOMObject badCertListener;

3301

int chromeFlags = nsIWebBrowserChrome.CHROME_DEFAULT;

3302

int refCount, lastKeyCode, lastCharCode, authCount;

3303

- int /*long*/ request;

3304

+ long /*int*/ request;

3305

Point location, size;

3306

boolean visible, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage;

3307

Shell tip = null;

3308

@@ -103,7 +103,7 @@

3309

MozillaClearSessions = new Runnable () {

3310

public void run () {

3311

if (!Initialized) return;

3312

- int /*long*/[] result = new int /*long*/[1];

3313

+ long /*int*/[] result = new long /*int*/[1];

3314

int rc = XPCOM.NS_GetServiceManager (result);

3315

if (rc != XPCOM.NS_OK) error (rc);

3316

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

3317

@@ -133,9 +133,9 @@

3318

rc = cookie.GetExpires (expires);

3319

if (expires[0] == 0) {

3320

/* indicates a session cookie */

3321

- int /*long*/ domain = XPCOM.nsEmbedCString_new ();

3322

- int /*long*/ name = XPCOM.nsEmbedCString_new ();

3323

- int /*long*/ path = XPCOM.nsEmbedCString_new ();

3324

+ long /*int*/ domain = XPCOM.nsEmbedCString_new ();

3325

+ long /*int*/ name = XPCOM.nsEmbedCString_new ();

3326

+ long /*int*/ path = XPCOM.nsEmbedCString_new ();

3327

cookie.GetHost (domain);

3328

cookie.GetName (name);

3329

cookie.GetPath (path);

3330

@@ -158,7 +158,7 @@

3331

public void run() {

3332

if (!Initialized) return;

3333

3334

- int /*long*/[] result = new int /*long*/[1];

3335

+ long /*int*/[] result = new long /*int*/[1];

3336

int rc = XPCOM.NS_GetServiceManager (result);

3337

if (rc != XPCOM.NS_OK) error (rc);

3338

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

3339

@@ -172,7 +172,7 @@

3340

nsIIOService ioService = new nsIIOService (result[0]);

3341

result[0] = 0;

3342

byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);

3343

- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);

3344

+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);

3345

rc = ioService.NewURI (aSpec, null, 0, result);

3346

XPCOM.nsEmbedCString_delete (aSpec);

3347

ioService.Release ();

3348

@@ -186,7 +186,7 @@

3349

result[0] = 0;

3350

byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_COOKIESERVICE_CONTRACTID, true);

3351

rc = serviceManager.GetServiceByContractID (aContractID, nsICookieService.NS_ICOOKIESERVICE_IID, result);

3352

- int /*long*/ cookieString;

3353

+ long /*int*/ cookieString;

3354

if (rc == XPCOM.NS_OK && result[0] != 0) {

3355

nsICookieService cookieService = new nsICookieService (result[0]);

3356

result[0] = 0;

3357

@@ -244,7 +244,7 @@

3358

public void run() {

3359

if (!Initialized) return;

3360

3361

- int /*long*/[] result = new int /*long*/[1];

3362

+ long /*int*/[] result = new long /*int*/[1];

3363

int rc = XPCOM.NS_GetServiceManager (result);

3364

if (rc != XPCOM.NS_OK) error (rc);

3365

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

3366

@@ -258,7 +258,7 @@

3367

nsIIOService ioService = new nsIIOService (result[0]);

3368

result[0] = 0;

3369

byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);

3370

- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);

3371

+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);

3372

rc = ioService.NewURI (aSpec, null, 0, result);

3373

XPCOM.nsEmbedCString_delete (aSpec);

3374

ioService.Release ();

3375

@@ -298,7 +298,7 @@

3376

delegate = new MozillaDelegate (browser);

3377

final Display display = parent.getDisplay ();

3378

3379

- int /*long*/[] result = new int /*long*/[1];

3380

+ long /*int*/[] result = new long /*int*/[1];

3381

if (!Initialized) {

3382

boolean initLoaded = false;

3383

boolean IsXULRunner = false;

3384

@@ -353,20 +353,20 @@

3385

/* attempt to discover a XULRunner to use as the GRE */

3386

GREVersionRange range = new GREVersionRange ();

3387

byte[] bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER, true);

3388

- int /*long*/ lower = C.malloc (bytes.length);

3389

+ long /*int*/ lower = C.malloc (bytes.length);

3390

C.memmove (lower, bytes, bytes.length);

3391

range.lower = lower;

3392

range.lowerInclusive = LowerRangeInclusive;

3393

3394

bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_UPPER, true);

3395

- int /*long*/ upper = C.malloc (bytes.length);

3396

+ long /*int*/ upper = C.malloc (bytes.length);

3397

C.memmove (upper, bytes, bytes.length);

3398

range.upper = upper;

3399

range.upperInclusive = UpperRangeInclusive;

3400

3401

int length = XPCOMInit.PATH_MAX;

3402

- int /*long*/ greBuffer = C.malloc (length);

3403

- int /*long*/ propertiesPtr = C.malloc (2 * C.PTR_SIZEOF);

3404

+ long /*int*/ greBuffer = C.malloc (length);

3405

+ long /*int*/ propertiesPtr = C.malloc (2 * C.PTR_SIZEOF);

3406

int rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, propertiesPtr, 0, greBuffer, length);

3407

3408

/*

3409

@@ -409,7 +409,7 @@

3410

if (Device.DEBUG) System.out.println ("cannot use detected XULRunner: " + mozillaPath); //$NON-NLS-1$

3411

3412

/* attempt to XPCOMGlueStartup the GRE pointed at by MOZILLA_FIVE_HOME */

3413

- int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));

3414

+ long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));

3415

if (ptr == 0) {

3416

IsXULRunner = false;

3417

} else {

3418

@@ -473,7 +473,7 @@

3419

}

3420

3421

/* attempt to use the GRE pointed at by MOZILLA_FIVE_HOME */

3422

- int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));

3423

+ long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));

3424

if (ptr != 0) {

3425

int length = C.strlen (ptr);

3426

byte[] buffer = new byte[length];

3427

@@ -547,7 +547,7 @@

3428

LocationProvider.setComponentsPath (componentsDir.getAbsolutePath ());

3429

}

3430

3431

- int /*long*/[] retVal = new int /*long*/[1];

3432

+ long /*int*/[] retVal = new long /*int*/[1];

3433

nsEmbedString pathString = new nsEmbedString (mozillaPath);

3434

int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, retVal);

3435

pathString.dispose ();

3436

@@ -564,18 +564,18 @@

3437

if (IsXULRunner) {

3438

int size = XPCOM.nsDynamicFunctionLoad_sizeof ();

3439

/* alloc memory for two structs, the second is empty to signify the end of the list */

3440

- int /*long*/ ptr = C.malloc (size * 2);

3441

+ long /*int*/ ptr = C.malloc (size * 2);

3442

C.memset (ptr, 0, size * 2);

3443

nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();

3444

byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_InitEmbedding", true); //$NON-NLS-1$

3445

functionLoad.functionName = C.malloc (bytes.length);

3446

C.memmove (functionLoad.functionName, bytes, bytes.length);

3447

functionLoad.function = C.malloc (C.PTR_SIZEOF);

3448

- C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);

3449

+ C.memmove (functionLoad.function, new long /*int*/[] {0} , C.PTR_SIZEOF);

3450

XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());

3451

XPCOM.XPCOMGlueLoadXULFunctions (ptr);

3452

C.memmove (result, functionLoad.function, C.PTR_SIZEOF);

3453

- int /*long*/ functionPtr = result[0];

3454

+ long /*int*/ functionPtr = result[0];

3455

result[0] = 0;

3456

C.free (functionLoad.function);

3457

C.free (functionLoad.functionName);

3458

@@ -744,14 +744,14 @@

3459

3460

nsIFile profileDir = new nsIFile (result[0]);

3461

result[0] = 0;

3462

- int /*long*/ path = XPCOM.nsEmbedCString_new ();

3463

+ long /*int*/ path = XPCOM.nsEmbedCString_new ();

3464

rc = profileDir.GetNativePath (path);

3465

if (rc != XPCOM.NS_OK) {

3466

browser.dispose ();

3467

error (rc);

3468

}

3469

int length = XPCOM.nsEmbedCString_Length (path);

3470

- int /*long*/ ptr = XPCOM.nsEmbedCString_get (path);

3471

+ long /*int*/ ptr = XPCOM.nsEmbedCString_get (path);

3472

buffer = new byte [length];

3473

XPCOM.memmove (buffer, ptr, length);

3474

String profilePath = new String (MozillaDelegate.mbcsToWcs (null, buffer)) + PROFILE_DIR;

3475

@@ -801,11 +801,11 @@

3476

functionLoad.functionName = C.malloc (bytes.length);

3477

C.memmove (functionLoad.functionName, bytes, bytes.length);

3478

functionLoad.function = C.malloc (C.PTR_SIZEOF);

3479

- C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);

3480

+ C.memmove (functionLoad.function, new long /*int*/[] {0} , C.PTR_SIZEOF);

3481

XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());

3482

XPCOM.XPCOMGlueLoadXULFunctions (ptr);

3483

C.memmove (result, functionLoad.function, C.PTR_SIZEOF);

3484

- int /*long*/ functionPtr = result[0];

3485

+ long /*int*/ functionPtr = result[0];

3486

result[0] = 0;

3487

C.free (functionLoad.function);

3488

C.free (functionLoad.functionName);

3489

@@ -1187,7 +1187,7 @@

3490

public void handleEvent (Event event) {

3491

if (BrowserCount > 0) return; /* another display is still active */

3492

3493

- int /*long*/[] result = new int /*long*/[1];

3494

+ long /*int*/[] result = new long /*int*/[1];

3495

int rc = XPCOM.NS_GetServiceManager (result);

3496

if (rc != XPCOM.NS_OK) error (rc);

3497

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

3498

@@ -1258,18 +1258,18 @@

3499

3500

// int size = XPCOM.nsDynamicFunctionLoad_sizeof ();

3501

// /* alloc memory for two structs, the second is empty to signify the end of the list */

3502

-// int /*long*/ ptr = C.malloc (size * 2);

3503

+// long /*int*/ ptr = C.malloc (size * 2);

3504

// C.memset (ptr, 0, size * 2);

3505

// nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();

3506

// byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_TermEmbedding", true); //$NON-NLS-1$

3507

// functionLoad.functionName = C.malloc (bytes.length);

3508

// C.memmove (functionLoad.functionName, bytes, bytes.length);

3509

// functionLoad.function = C.malloc (C.PTR_SIZEOF);

3510

-// C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);

3511

+// C.memmove (functionLoad.function, new long /*int*/[] {0} , C.PTR_SIZEOF);

3512

// XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());

3513

// XPCOM.XPCOMGlueLoadXULFunctions (ptr);

3514

// C.memmove (result, functionLoad.function, C.PTR_SIZEOF);

3515

-// int /*long*/ functionPtr = result[0];

3516

+// long /*int*/ functionPtr = result[0];

3517

// result[0] = 0;

3518

// C.free (functionLoad.function);

3519

// C.free (functionLoad.functionName);

3520

@@ -1530,7 +1530,7 @@

3521

public boolean back () {

3522

htmlBytes = null;

3523

3524

- int /*long*/[] result = new int /*long*/[1];

3525

+ long /*int*/[] result = new long /*int*/[1];

3526

int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);

3527

if (rc != XPCOM.NS_OK) error (rc);

3528

if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

3529

@@ -1544,122 +1544,122 @@

3530

void createCOMInterfaces () {

3531

// Create each of the interfaces that this object implements

3532

supports = new XPCOMObject (new int[] {2, 0, 0}) {

3533

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3534

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3535

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3536

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3537

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3538

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3539

};

3540

3541

weakReference = new XPCOMObject (new int[] {2, 0, 0, 2}) {

3542

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3543

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3544

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3545

- public int /*long*/ method3 (int /*long*/[] args) {return QueryReferent (args[0], args[1]);}

3546

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3547

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3548

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3549

+ public long /*int*/ method3 (long /*int*/[] args) {return QueryReferent (args[0], args[1]);}

3550

};

3551

3552

webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3}) {

3553

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3554

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3555

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3556

- public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}

3557

- 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]);}

3558

- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}

3559

- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}

3560

- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}

3561

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3562

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3563

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3564

+ public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}

3565

+ 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]);}

3566

+ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}

3567

+ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}

3568

+ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}

3569

};

3570

3571

webBrowserChrome = new XPCOMObject (new int[] {2, 0, 0, 2, 1, 1, 1, 1, 0, 2, 0, 1, 1}) {

3572

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3573

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3574

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3575

- public int /*long*/ method3 (int /*long*/[] args) {return SetStatus ((int)/*64*/args[0], args[1]);}

3576

- public int /*long*/ method4 (int /*long*/[] args) {return GetWebBrowser (args[0]);}

3577

- public int /*long*/ method5 (int /*long*/[] args) {return SetWebBrowser (args[0]);}

3578

- public int /*long*/ method6 (int /*long*/[] args) {return GetChromeFlags (args[0]);}

3579

- public int /*long*/ method7 (int /*long*/[] args) {return SetChromeFlags ((int)/*64*/args[0]);}

3580

- public int /*long*/ method8 (int /*long*/[] args) {return DestroyBrowserWindow ();}

3581

- public int /*long*/ method9 (int /*long*/[] args) {return SizeBrowserTo ((int)/*64*/args[0], (int)/*64*/args[1]);}

3582

- public int /*long*/ method10 (int /*long*/[] args) {return ShowAsModal ();}

3583

- public int /*long*/ method11 (int /*long*/[] args) {return IsWindowModal (args[0]);}

3584

- public int /*long*/ method12 (int /*long*/[] args) {return ExitModalEventLoop ((int)/*64*/args[0]);}

3585

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3586

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3587

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3588

+ public long /*int*/ method3 (long /*int*/[] args) {return SetStatus ((int)/*64*/args[0], args[1]);}

3589

+ public long /*int*/ method4 (long /*int*/[] args) {return GetWebBrowser (args[0]);}

3590

+ public long /*int*/ method5 (long /*int*/[] args) {return SetWebBrowser (args[0]);}

3591

+ public long /*int*/ method6 (long /*int*/[] args) {return GetChromeFlags (args[0]);}

3592

+ public long /*int*/ method7 (long /*int*/[] args) {return SetChromeFlags ((int)/*64*/args[0]);}

3593

+ public long /*int*/ method8 (long /*int*/[] args) {return DestroyBrowserWindow ();}

3594

+ public long /*int*/ method9 (long /*int*/[] args) {return SizeBrowserTo ((int)/*64*/args[0], (int)/*64*/args[1]);}

3595

+ public long /*int*/ method10 (long /*int*/[] args) {return ShowAsModal ();}

3596

+ public long /*int*/ method11 (long /*int*/[] args) {return IsWindowModal (args[0]);}

3597

+ public long /*int*/ method12 (long /*int*/[] args) {return ExitModalEventLoop ((int)/*64*/args[0]);}

3598

};

3599

3600

webBrowserChromeFocus = new XPCOMObject (new int[] {2, 0, 0, 0, 0}) {

3601

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3602

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3603

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3604

- public int /*long*/ method3 (int /*long*/[] args) {return FocusNextElement ();}

3605

- public int /*long*/ method4 (int /*long*/[] args) {return FocusPrevElement ();}

3606

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3607

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3608

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3609

+ public long /*int*/ method3 (long /*int*/[] args) {return FocusNextElement ();}

3610

+ public long /*int*/ method4 (long /*int*/[] args) {return FocusPrevElement ();}

3611

};

3612

3613

embeddingSiteWindow = new XPCOMObject (new int[] {2, 0, 0, 5, 5, 0, 1, 1, 1, 1, 1}) {

3614

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3615

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3616

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3617

- 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]);}

3618

- public int /*long*/ method4 (int /*long*/[] args) {return GetDimensions ((int)/*64*/args[0], args[1], args[2], args[3], args[4]);}

3619

- public int /*long*/ method5 (int /*long*/[] args) {return SetFocus ();}

3620

- public int /*long*/ method6 (int /*long*/[] args) {return GetVisibility (args[0]);}

3621

- public int /*long*/ method7 (int /*long*/[] args) {return SetVisibility ((int)/*64*/args[0]);}

3622

- public int /*long*/ method8 (int /*long*/[] args) {return GetTitle (args[0]);}

3623

- public int /*long*/ method9 (int /*long*/[] args) {return SetTitle (args[0]);}

3624

- public int /*long*/ method10 (int /*long*/[] args) {return GetSiteWindow (args[0]);}

3625

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3626

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3627

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3628

+ 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]);}

3629

+ public long /*int*/ method4 (long /*int*/[] args) {return GetDimensions ((int)/*64*/args[0], args[1], args[2], args[3], args[4]);}

3630

+ public long /*int*/ method5 (long /*int*/[] args) {return SetFocus ();}

3631

+ public long /*int*/ method6 (long /*int*/[] args) {return GetVisibility (args[0]);}

3632

+ public long /*int*/ method7 (long /*int*/[] args) {return SetVisibility ((int)/*64*/args[0]);}

3633

+ public long /*int*/ method8 (long /*int*/[] args) {return GetTitle (args[0]);}

3634

+ public long /*int*/ method9 (long /*int*/[] args) {return SetTitle (args[0]);}

3635

+ public long /*int*/ method10 (long /*int*/[] args) {return GetSiteWindow (args[0]);}

3636

};

3637

3638

interfaceRequestor = new XPCOMObject (new int[] {2, 0, 0, 2} ){

3639

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3640

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3641

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3642

- public int /*long*/ method3 (int /*long*/[] args) {return GetInterface (args[0], args[1]);}

3643

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3644

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3645

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3646

+ public long /*int*/ method3 (long /*int*/[] args) {return GetInterface (args[0], args[1]);}

3647

};

3648

3649

supportsWeakReference = new XPCOMObject (new int[] {2, 0, 0, 1}) {

3650

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3651

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3652

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3653

- public int /*long*/ method3 (int /*long*/[] args) {return GetWeakReference (args[0]);}

3654

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3655

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3656

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3657

+ public long /*int*/ method3 (long /*int*/[] args) {return GetWeakReference (args[0]);}

3658

};

3659

3660

contextMenuListener = new XPCOMObject (new int[] {2, 0, 0, 3}) {

3661

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3662

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3663

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3664

- public int /*long*/ method3 (int /*long*/[] args) {return OnShowContextMenu ((int)/*64*/args[0], args[1], args[2]);}

3665

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3666

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3667

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3668

+ public long /*int*/ method3 (long /*int*/[] args) {return OnShowContextMenu ((int)/*64*/args[0], args[1], args[2]);}

3669

};

3670

3671

uriContentListener = new XPCOMObject (new int[] {2, 0, 0, 2, 5, 3, 4, 1, 1, 1, 1}) {

3672

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3673

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3674

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3675

- public int /*long*/ method3 (int /*long*/[] args) {return OnStartURIOpen (args[0], args[1]);}

3676

- public int /*long*/ method4 (int /*long*/[] args) {return DoContent (args[0], (int)/*64*/args[1], args[2], args[3], args[4]);}

3677

- public int /*long*/ method5 (int /*long*/[] args) {return IsPreferred (args[0], args[1], args[2]);}

3678

- public int /*long*/ method6 (int /*long*/[] args) {return CanHandleContent (args[0], (int)/*64*/args[1], args[2], args[3]);}

3679

- public int /*long*/ method7 (int /*long*/[] args) {return GetLoadCookie (args[0]);}

3680

- public int /*long*/ method8 (int /*long*/[] args) {return SetLoadCookie (args[0]);}

3681

- public int /*long*/ method9 (int /*long*/[] args) {return GetParentContentListener (args[0]);}

3682

- public int /*long*/ method10 (int /*long*/[] args) {return SetParentContentListener (args[0]);}

3683

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3684

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3685

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3686

+ public long /*int*/ method3 (long /*int*/[] args) {return OnStartURIOpen (args[0], args[1]);}

3687

+ public long /*int*/ method4 (long /*int*/[] args) {return DoContent (args[0], (int)/*64*/args[1], args[2], args[3], args[4]);}

3688

+ public long /*int*/ method5 (long /*int*/[] args) {return IsPreferred (args[0], args[1], args[2]);}

3689

+ public long /*int*/ method6 (long /*int*/[] args) {return CanHandleContent (args[0], (int)/*64*/args[1], args[2], args[3]);}

3690

+ public long /*int*/ method7 (long /*int*/[] args) {return GetLoadCookie (args[0]);}

3691

+ public long /*int*/ method8 (long /*int*/[] args) {return SetLoadCookie (args[0]);}

3692

+ public long /*int*/ method9 (long /*int*/[] args) {return GetParentContentListener (args[0]);}

3693

+ public long /*int*/ method10 (long /*int*/[] args) {return SetParentContentListener (args[0]);}

3694

};

3695

3696

tooltipListener = new XPCOMObject (new int[] {2, 0, 0, 3, 0}) {

3697

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3698

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3699

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3700

- public int /*long*/ method3 (int /*long*/[] args) {return OnShowTooltip ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}

3701

- public int /*long*/ method4 (int /*long*/[] args) {return OnHideTooltip ();}

3702

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3703

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3704

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3705

+ public long /*int*/ method3 (long /*int*/[] args) {return OnShowTooltip ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}

3706

+ public long /*int*/ method4 (long /*int*/[] args) {return OnHideTooltip ();}

3707

};

3708

3709

domEventListener = new XPCOMObject (new int[] {2, 0, 0, 1}) {

3710

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3711

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3712

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3713

- public int /*long*/ method3 (int /*long*/[] args) {return HandleEvent (args[0]);}

3714

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3715

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3716

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3717

+ public long /*int*/ method3 (long /*int*/[] args) {return HandleEvent (args[0]);}

3718

};

3719

3720

badCertListener = new XPCOMObject (new int[] {2, 0, 0, 4}) {

3721

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

3722

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

3723

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

3724

- public int /*long*/ method3 (int /*long*/[] args) {return NotifyCertProblem (args[0], args[1], args[2], args[3]);}

3725

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

3726

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

3727

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

3728

+ public long /*int*/ method3 (long /*int*/[] args) {return NotifyCertProblem (args[0], args[1], args[2], args[3]);}

3729

};

3730

}

3731

3732

@@ -1738,7 +1738,7 @@

3733

* workaround is to invoke the javascript handler directly via C++, which is

3734

* exposed as of mozilla 1.9.

3735

*/

3736

- int /*long*/[] result = new int /*long*/[1];

3737

+ long /*int*/[] result = new long /*int*/[1];

3738

if (!IsPre_1_9) {

3739

int rc = XPCOM.NS_GetServiceManager (result);

3740

if (rc != XPCOM.NS_OK) error (rc);

3741

@@ -1785,12 +1785,12 @@

3742

interfaceRequestor.Release ();

3743

3744

if (rc == XPCOM.NS_OK && result[0] != 0) {

3745

- int /*long*/ scriptGlobalObject = result[0];

3746

+ long /*int*/ scriptGlobalObject = result[0];

3747

result[0] = 0;

3748

rc = (int/*64*/)XPCOM.nsIScriptGlobalObject_EnsureScriptEnvironment (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */

3749

if (rc != XPCOM.NS_OK) error (rc);

3750

- int /*long*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */

3751

- int /*long*/ globalJSObject = XPCOM.nsIScriptGlobalObject_GetScriptGlobal (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */

3752

+ long /*int*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */

3753

+ long /*int*/ globalJSObject = XPCOM.nsIScriptGlobalObject_GetScriptGlobal (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */

3754

new nsISupports (scriptGlobalObject).Release ();

3755

3756

if (scriptContext != 0 && globalJSObject != 0) {

3757

@@ -1801,7 +1801,7 @@

3758

new nsISupports (result[0]).Release ();

3759

result[0] = 0;

3760

3761

- int /*long*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);

3762

+ long /*int*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);

3763

if (nativeContext != 0) {

3764

int length = script.length ();

3765

char[] scriptChars = new char[length];

3766

@@ -1809,7 +1809,7 @@

3767

byte[] urlbytes = MozillaDelegate.wcsToMbcs (null, getUrl (), true);

3768

rc = principal.GetJSPrincipals (nativeContext, result);

3769

if (rc == XPCOM.NS_OK && result[0] != 0) {

3770

- int /*long*/ principals = result[0];

3771

+ long /*int*/ principals = result[0];

3772

result[0] = 0;

3773

principal.Release ();

3774

String mozillaPath = LocationProvider.mozillaPath + delegate.getJSLibraryName () + '\0';

3775

@@ -1846,12 +1846,12 @@

3776

return rc == XPCOM.NS_OK;

3777

}

3778

3779

-static Browser findBrowser (int /*long*/ handle) {

3780

+static Browser findBrowser (long /*int*/ handle) {

3781

return MozillaDelegate.findBrowser (handle);

3782

}

3783

3784

static Browser findBrowser (nsIDOMWindow aDOMWindow) {

3785

- int /*long*/[] result = new int /*long*/[1];

3786

+ long /*int*/[] result = new long /*int*/[1];

3787

int rc = XPCOM.NS_GetServiceManager (result);

3788

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

3789

if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

3790

@@ -1870,7 +1870,7 @@

3791

rc = aDOMWindow.GetTop (result);

3792

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

3793

if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

3794

- int /*long*/ topDOMWindow = result[0];

3795

+ long /*int*/ topDOMWindow = result[0];

3796

result[0] = 0;

3797

rc = windowWatcher.GetChromeForWindow (topDOMWindow, result);

3798

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

3799

@@ -1898,7 +1898,7 @@

3800

public boolean forward () {

3801

htmlBytes = null;

3802

3803

- int /*long*/[] result = new int /*long*/[1];

3804

+ long /*int*/[] result = new long /*int*/[1];

3805

int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);

3806

if (rc != XPCOM.NS_OK) error (rc);

3807

if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

3808

@@ -1919,7 +1919,7 @@

3809

}

3810

3811

public String getText () {

3812

- int /*long*/[] result = new int /*long*/[1];

3813

+ long /*int*/[] result = new long /*int*/[1];

3814

int rc = webBrowser.GetContentDOMWindow (result);

3815

if (rc != XPCOM.NS_OK) error (rc);

3816

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

3817

@@ -1931,7 +1931,7 @@

3818

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

3819

window.Release ();

3820

3821

- int /*long*/ document = result[0];

3822

+ long /*int*/ document = result[0];

3823

result[0] = 0;

3824

rc = XPCOM.NS_GetComponentManager (result);

3825

if (rc != XPCOM.NS_OK) error (rc);

3826

@@ -1948,12 +1948,12 @@

3827

3828

nsIDOMSerializer_1_7 serializer = new nsIDOMSerializer_1_7 (result[0]);

3829

result[0] = 0;

3830

- int /*long*/ string = XPCOM.nsEmbedString_new ();

3831

+ long /*int*/ string = XPCOM.nsEmbedString_new ();

3832

rc = serializer.SerializeToString (document, string);

3833

serializer.Release ();

3834

3835

int length = XPCOM.nsEmbedString_Length (string);

3836

- int /*long*/ buffer = XPCOM.nsEmbedString_get (string);

3837

+ long /*int*/ buffer = XPCOM.nsEmbedString_get (string);

3838

chars = new char[length];

3839

XPCOM.memmove (chars, buffer, length * 2);

3840

XPCOM.nsEmbedString_delete (string);

3841

@@ -1978,13 +1978,13 @@

3842

}

3843

3844

public String getUrl () {

3845

- int /*long*/[] result = new int /*long*/[1];

3846

+ long /*int*/[] result = new long /*int*/[1];

3847

int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);

3848

if (rc != XPCOM.NS_OK) error (rc);

3849

if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

3850

3851

nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);

3852

- int /*long*/[] aCurrentURI = new int /*long*/[1];

3853

+ long /*int*/[] aCurrentURI = new long /*int*/[1];

3854

rc = webNavigation.GetCurrentURI (aCurrentURI);

3855

if (rc != XPCOM.NS_OK) error (rc);

3856

webNavigation.Release ();

3857

@@ -1992,11 +1992,11 @@

3858

byte[] dest = null;

3859

if (aCurrentURI[0] != 0) {

3860

nsIURI uri = new nsIURI (aCurrentURI[0]);

3861

- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();

3862

+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();

3863

rc = uri.GetSpec (aSpec);

3864

if (rc != XPCOM.NS_OK) error (rc);

3865

int length = XPCOM.nsEmbedCString_Length (aSpec);

3866

- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);

3867

+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);

3868

dest = new byte[length];

3869

XPCOM.memmove (dest, buffer, length);

3870

XPCOM.nsEmbedCString_delete (aSpec);

3871

@@ -2039,7 +2039,7 @@

3872

}

3873

3874

public boolean isBackEnabled () {

3875

- int /*long*/[] result = new int /*long*/[1];

3876

+ long /*int*/[] result = new long /*int*/[1];

3877

int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);

3878

if (rc != XPCOM.NS_OK) error (rc);

3879

if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

3880

@@ -2052,7 +2052,7 @@

3881

}

3882

3883

public boolean isForwardEnabled () {

3884

- int /*long*/[] result = new int /*long*/[1];

3885

+ long /*int*/[] result = new long /*int*/[1];

3886

int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);

3887

if (rc != XPCOM.NS_OK) error (rc);

3888

if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

3889

@@ -2095,7 +2095,7 @@

3890

listener = null;

3891

}

3892

3893

- int /*long*/[] result = new int /*long*/[1];

3894

+ long /*int*/[] result = new long /*int*/[1];

3895

rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);

3896

if (rc != XPCOM.NS_OK) error (rc);

3897

if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

3898

@@ -2139,7 +2139,7 @@

3899

}

3900

3901

void Activate () {

3902

- int /*long*/[] result = new int /*long*/[1];

3903

+ long /*int*/[] result = new long /*int*/[1];

3904

int rc = webBrowser.QueryInterface (nsIWebBrowserFocus.NS_IWEBBROWSERFOCUS_IID, result);

3905

if (rc != XPCOM.NS_OK) error (rc);

3906

if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

3907

@@ -2151,7 +2151,7 @@

3908

}

3909

3910

void Deactivate () {

3911

- int /*long*/[] result = new int /*long*/[1];

3912

+ long /*int*/[] result = new long /*int*/[1];

3913

int rc = webBrowser.QueryInterface (nsIWebBrowserFocus.NS_IWEBBROWSERFOCUS_IID, result);

3914

if (rc != XPCOM.NS_OK) error (rc);

3915

if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

3916

@@ -2167,7 +2167,7 @@

3917

int width = Math.max (1, rect.width);

3918

int height = Math.max (1, rect.height);

3919

3920

- int /*long*/[] result = new int /*long*/[1];

3921

+ long /*int*/[] result = new long /*int*/[1];

3922

int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);

3923

if (rc != XPCOM.NS_OK) error (rc);

3924

if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

3925

@@ -2182,7 +2182,7 @@

3926

public void refresh () {

3927

htmlBytes = null;

3928

3929

- int /*long*/[] result = new int /*long*/[1];

3930

+ long /*int*/[] result = new long /*int*/[1];

3931

int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);

3932

if (rc != XPCOM.NS_OK) error(rc);

3933

if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

3934

@@ -2244,7 +2244,7 @@

3935

*/

3936

delegate.removeWindowSubclass ();

3937

3938

- int /*long*/[] result = new int /*long*/[1];

3939

+ long /*int*/[] result = new long /*int*/[1];

3940

int rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);

3941

if (rc == XPCOM.NS_OK && result[0] != 0) {

3942

/*

3943

@@ -2277,9 +2277,9 @@

3944

webNavigation.Release ();

3945

} else {

3946

byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", true); //$NON-NLS-1$

3947

- int /*long*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);

3948

+ long /*int*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);

3949

byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$

3950

- int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);

3951

+ long /*int*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);

3952

3953

rc = XPCOM.NS_GetServiceManager (result);

3954

if (rc != XPCOM.NS_OK) error (rc);

3955

@@ -2300,7 +2300,7 @@

3956

* is about:blank. The fix is to specify the file protocol.

3957

*/

3958

byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);

3959

- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);

3960

+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);

3961

rc = ioService.NewURI (aSpec, null, 0, result);

3962

if (rc != XPCOM.NS_OK) error (rc);

3963

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

3964

@@ -2345,7 +2345,7 @@

3965

public boolean setUrl (String url) {

3966

htmlBytes = null;

3967

3968

- int /*long*/[] result = new int /*long*/[1];

3969

+ long /*int*/[] result = new long /*int*/[1];

3970

int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);

3971

if (rc != XPCOM.NS_OK) error (rc);

3972

if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

3973

@@ -2368,7 +2368,7 @@

3974

public void stop () {

3975

htmlBytes = null;

3976

3977

- int /*long*/[] result = new int /*long*/[1];

3978

+ long /*int*/[] result = new long /*int*/[1];

3979

int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);

3980

if (rc != XPCOM.NS_OK) error (rc);

3981

if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

3982

@@ -2427,7 +2427,7 @@

3983

}

3984

3985

void unhookDOMListeners () {

3986

- int /*long*/[] result = new int /*long*/[1];

3987

+ long /*int*/[] result = new long /*int*/[1];

3988

int rc = webBrowser.GetContentDOMWindow (result);

3989

if (rc != XPCOM.NS_OK) error (rc);

3990

if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

3991

@@ -2518,73 +2518,73 @@

3992

3993

/* nsISupports */

3994

3995

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

3996

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

3997

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

3998

3999

nsID guid = new nsID ();

4000

XPCOM.memmove (guid, riid, nsID.sizeof);

4001

4002

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

4003

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

4004

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

4005

AddRef ();

4006

return XPCOM.NS_OK;

4007

}

4008

if (guid.Equals (nsIWeakReference.NS_IWEAKREFERENCE_IID)) {

4009

- XPCOM.memmove (ppvObject, new int /*long*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);

4010

+ XPCOM.memmove (ppvObject, new long /*int*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);

4011

AddRef ();

4012

return XPCOM.NS_OK;

4013

}

4014

if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) {

4015

- XPCOM.memmove (ppvObject, new int /*long*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);

4016

+ XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);

4017

AddRef ();

4018

return XPCOM.NS_OK;

4019

}

4020

if (guid.Equals (nsIWebBrowserChrome.NS_IWEBBROWSERCHROME_IID)) {

4021

- XPCOM.memmove (ppvObject, new int /*long*/[] {webBrowserChrome.getAddress ()}, C.PTR_SIZEOF);

4022

+ XPCOM.memmove (ppvObject, new long /*int*/[] {webBrowserChrome.getAddress ()}, C.PTR_SIZEOF);

4023

AddRef ();

4024

return XPCOM.NS_OK;

4025

}

4026

if (guid.Equals (nsIWebBrowserChromeFocus.NS_IWEBBROWSERCHROMEFOCUS_IID)) {

4027

- XPCOM.memmove (ppvObject, new int /*long*/[] {webBrowserChromeFocus.getAddress ()}, C.PTR_SIZEOF);

4028

+ XPCOM.memmove (ppvObject, new long /*int*/[] {webBrowserChromeFocus.getAddress ()}, C.PTR_SIZEOF);

4029

AddRef ();

4030

return XPCOM.NS_OK;

4031

}

4032

if (guid.Equals (nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID)) {

4033

- XPCOM.memmove (ppvObject, new int /*long*/[] {embeddingSiteWindow.getAddress ()}, C.PTR_SIZEOF);

4034

+ XPCOM.memmove (ppvObject, new long /*int*/[] {embeddingSiteWindow.getAddress ()}, C.PTR_SIZEOF);

4035

AddRef ();

4036

return XPCOM.NS_OK;

4037

}

4038

if (guid.Equals (nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID)) {

4039

- XPCOM.memmove (ppvObject, new int /*long*/[] {interfaceRequestor.getAddress ()}, C.PTR_SIZEOF);

4040

+ XPCOM.memmove (ppvObject, new long /*int*/[] {interfaceRequestor.getAddress ()}, C.PTR_SIZEOF);

4041

AddRef ();

4042

return XPCOM.NS_OK;

4043

}

4044

if (guid.Equals (nsISupportsWeakReference.NS_ISUPPORTSWEAKREFERENCE_IID)) {

4045

- XPCOM.memmove (ppvObject, new int /*long*/[] {supportsWeakReference.getAddress ()}, C.PTR_SIZEOF);

4046

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supportsWeakReference.getAddress ()}, C.PTR_SIZEOF);

4047

AddRef ();

4048

return XPCOM.NS_OK;

4049

}

4050

if (guid.Equals (nsIContextMenuListener.NS_ICONTEXTMENULISTENER_IID)) {

4051

- XPCOM.memmove (ppvObject, new int /*long*/[] {contextMenuListener.getAddress ()}, C.PTR_SIZEOF);

4052

+ XPCOM.memmove (ppvObject, new long /*int*/[] {contextMenuListener.getAddress ()}, C.PTR_SIZEOF);

4053

AddRef ();

4054

return XPCOM.NS_OK;

4055

}

4056

if (guid.Equals (nsIURIContentListener.NS_IURICONTENTLISTENER_IID)) {

4057

- XPCOM.memmove (ppvObject, new int /*long*/[] {uriContentListener.getAddress ()}, C.PTR_SIZEOF);

4058

+ XPCOM.memmove (ppvObject, new long /*int*/[] {uriContentListener.getAddress ()}, C.PTR_SIZEOF);

4059

AddRef ();

4060

return XPCOM.NS_OK;

4061

}

4062

if (guid.Equals (nsITooltipListener.NS_ITOOLTIPLISTENER_IID)) {

4063

- XPCOM.memmove (ppvObject, new int /*long*/[] {tooltipListener.getAddress ()}, C.PTR_SIZEOF);

4064

+ XPCOM.memmove (ppvObject, new long /*int*/[] {tooltipListener.getAddress ()}, C.PTR_SIZEOF);

4065

AddRef ();

4066

return XPCOM.NS_OK;

4067

}

4068

if (guid.Equals (nsIBadCertListener2.NS_IBADCERTLISTENER2_IID)) {

4069

- XPCOM.memmove (ppvObject, new int /*long*/[] {badCertListener.getAddress ()}, C.PTR_SIZEOF);

4070

+ XPCOM.memmove (ppvObject, new long /*int*/[] {badCertListener.getAddress ()}, C.PTR_SIZEOF);

4071

AddRef ();

4072

return XPCOM.NS_OK;

4073

}

4074

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

4075

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

4076

return XPCOM.NS_ERROR_NO_INTERFACE;

4077

}

4078

4079

@@ -2601,18 +2601,18 @@

4080

4081

/* nsIWeakReference */

4082

4083

-int QueryReferent (int /*long*/ riid, int /*long*/ ppvObject) {

4084

+int QueryReferent (long /*int*/ riid, long /*int*/ ppvObject) {

4085

return QueryInterface (riid, ppvObject);

4086

}

4087

4088

/* nsIInterfaceRequestor */

4089

4090

-int GetInterface (int /*long*/ riid, int /*long*/ ppvObject) {

4091

+int GetInterface (long /*int*/ riid, long /*int*/ ppvObject) {

4092

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

4093

nsID guid = new nsID ();

4094

XPCOM.memmove (guid, riid, nsID.sizeof);

4095

if (guid.Equals (nsIDOMWindow.NS_IDOMWINDOW_IID)) {

4096

- int /*long*/[] aContentDOMWindow = new int /*long*/[1];

4097

+ long /*int*/[] aContentDOMWindow = new long /*int*/[1];

4098

int rc = webBrowser.GetContentDOMWindow (aContentDOMWindow);

4099

if (rc != XPCOM.NS_OK) error (rc);

4100

if (aContentDOMWindow[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

4101

@@ -2622,18 +2622,18 @@

4102

return QueryInterface (riid, ppvObject);

4103

}

4104

4105

-int GetWeakReference (int /*long*/ ppvObject) {

4106

- XPCOM.memmove (ppvObject, new int /*long*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);

4107

+int GetWeakReference (long /*int*/ ppvObject) {

4108

+ XPCOM.memmove (ppvObject, new long /*int*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);

4109

AddRef ();

4110

return XPCOM.NS_OK;

4111

}

4112

4113

/* nsIWebProgressListener */

4114

4115

-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {

4116

+int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {

4117

if ((aStateFlags & nsIWebProgressListener.STATE_IS_DOCUMENT) == 0) return XPCOM.NS_OK;

4118

if ((aStateFlags & nsIWebProgressListener.STATE_START) != 0) {

4119

- int /*long*/[] result = new int /*long*/[1];

4120

+ long /*int*/[] result = new long /*int*/[1];

4121

4122

/*

4123

* When navigating to a site that is known to have a bad certificate, request notification

4124

@@ -2676,7 +2676,7 @@

4125

* received for every window in a page, which is when these listeners

4126

* are typically added.

4127

*/

4128

- int /*long*/[] result = new int /*long*/[1];

4129

+ long /*int*/[] result = new long /*int*/[1];

4130

nsIWebProgress progress = new nsIWebProgress (aWebProgress);

4131

int rc = progress.GetDOMWindow (result);

4132

if (rc != XPCOM.NS_OK) error (rc);

4133

@@ -2718,11 +2718,11 @@

4134

*/

4135

if (htmlBytes != null) {

4136

nsIRequest req = new nsIRequest (aRequest);

4137

- int /*long*/ name = XPCOM.nsEmbedCString_new ();

4138

+ long /*int*/ name = XPCOM.nsEmbedCString_new ();

4139

rc = req.GetName (name);

4140

if (rc != XPCOM.NS_OK) error (rc);

4141

int length = XPCOM.nsEmbedCString_Length (name);

4142

- int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);

4143

+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (name);

4144

byte[] dest = new byte[length];

4145

XPCOM.memmove (dest, buffer, length);

4146

String url = new String (dest);

4147

@@ -2755,7 +2755,7 @@

4148

* is about:blank. The fix is to specify the file protocol.

4149

*/

4150

byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);

4151

- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);

4152

+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);

4153

rc = ioService.NewURI (aSpec, null, 0, result);

4154

if (rc != XPCOM.NS_OK) error (rc);

4155

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

4156

@@ -2773,15 +2773,15 @@

4157

result[0] = 0;

4158

4159

byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$

4160

- int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);

4161

+ long /*int*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);

4162

4163

rc = stream.OpenStream (uri.getAddress (), aContentType);

4164

if (rc != XPCOM.NS_OK) error (rc);

4165

- int /*long*/ ptr = C.malloc (htmlBytes.length);

4166

+ long /*int*/ ptr = C.malloc (htmlBytes.length);

4167

XPCOM.memmove (ptr, htmlBytes, htmlBytes.length);

4168

int pageSize = 8192;

4169

int pageCount = htmlBytes.length / pageSize + 1;

4170

- int /*long*/ current = ptr;

4171

+ long /*int*/ current = ptr;

4172

for (int i = 0; i < pageCount; i++) {

4173

length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;

4174

if (length > 0) {

4175

@@ -2872,7 +2872,7 @@

4176

* Hook DOM listeners to the page's nsIDOMWindow here because this is

4177

* the earliest opportunity to do so.

4178

*/

4179

- int /*long*/[] result = new int /*long*/[1];

4180

+ long /*int*/[] result = new long /*int*/[1];

4181

nsIWebProgress progress = new nsIWebProgress (aWebProgress);

4182

int rc = progress.GetDOMWindow (result);

4183

if (rc != XPCOM.NS_OK) error (rc);

4184

@@ -2911,7 +2911,7 @@

4185

return XPCOM.NS_OK;

4186

}

4187

4188

-int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {

4189

+int OnProgressChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {

4190

if (progressListeners.length == 0) return XPCOM.NS_OK;

4191

ProgressEvent event = new ProgressEvent (browser);

4192

event.display = browser.getDisplay ();

4193

@@ -2924,7 +2924,7 @@

4194

return XPCOM.NS_OK;

4195

}

4196

4197

-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {

4198

+int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {

4199

/*

4200

* Feature in Mozilla. When a page is loaded via setText before a previous

4201

* setText page load has completed, the expected OnStateChange STATE_STOP for the

4202

@@ -2939,13 +2939,13 @@

4203

if (locationListeners.length == 0) return XPCOM.NS_OK;

4204

4205

nsIWebProgress webProgress = new nsIWebProgress (aWebProgress);

4206

- int /*long*/[] aDOMWindow = new int /*long*/[1];

4207

+ long /*int*/[] aDOMWindow = new long /*int*/[1];

4208

int rc = webProgress.GetDOMWindow (aDOMWindow);

4209

if (rc != XPCOM.NS_OK) error (rc);

4210

if (aDOMWindow[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

4211

4212

nsIDOMWindow domWindow = new nsIDOMWindow (aDOMWindow[0]);

4213

- int /*long*/[] aTop = new int /*long*/[1];

4214

+ long /*int*/[] aTop = new long /*int*/[1];

4215

rc = domWindow.GetTop (aTop);

4216

if (rc != XPCOM.NS_OK) error (rc);

4217

if (aTop[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

4218

@@ -2955,10 +2955,10 @@

4219

topWindow.Release ();

4220

4221

nsIURI location = new nsIURI (aLocation);

4222

- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();

4223

+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();

4224

location.GetSpec (aSpec);

4225

int length = XPCOM.nsEmbedCString_Length (aSpec);

4226

- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);

4227

+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);

4228

byte[] dest = new byte[length];

4229

XPCOM.memmove (dest, buffer, length);

4230

XPCOM.nsEmbedCString_delete (aSpec);

4231

@@ -2988,7 +2988,7 @@

4232

return XPCOM.NS_OK;

4233

}

4234

4235

-int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {

4236

+int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {

4237

if (statusTextListeners.length == 0) return XPCOM.NS_OK;

4238

StatusTextEvent event = new StatusTextEvent (browser);

4239

event.display = browser.getDisplay ();

4240

@@ -3003,13 +3003,13 @@

4241

return XPCOM.NS_OK;

4242

}

4243

4244

-int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {

4245

+int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {

4246

return XPCOM.NS_OK;

4247

}

4248

4249

/* nsIWebBrowserChrome */

4250

4251

-int SetStatus (int statusType, int /*long*/ status) {

4252

+int SetStatus (int statusType, long /*int*/ status) {

4253

if (statusTextListeners.length == 0) return XPCOM.NS_OK;

4254

StatusTextEvent event = new StatusTextEvent (browser);

4255

event.display = browser.getDisplay ();

4256

@@ -3025,8 +3025,8 @@

4257

return XPCOM.NS_OK;

4258

}

4259

4260

-int GetWebBrowser (int /*long*/ aWebBrowser) {

4261

- int /*long*/[] ret = new int /*long*/[1];

4262

+int GetWebBrowser (long /*int*/ aWebBrowser) {

4263

+ long /*int*/[] ret = new long /*int*/[1];

4264

if (webBrowser != null) {

4265

webBrowser.AddRef ();

4266

ret[0] = webBrowser.getAddress ();

4267

@@ -3035,13 +3035,13 @@

4268

return XPCOM.NS_OK;

4269

}

4270

4271

-int SetWebBrowser (int /*long*/ aWebBrowser) {

4272

+int SetWebBrowser (long /*int*/ aWebBrowser) {

4273

if (webBrowser != null) webBrowser.Release ();

4274

webBrowser = aWebBrowser != 0 ? new nsIWebBrowser (aWebBrowser) : null;

4275

return XPCOM.NS_OK;

4276

}

4277

4278

-int GetChromeFlags (int /*long*/ aChromeFlags) {

4279

+int GetChromeFlags (long /*int*/ aChromeFlags) {

4280

int[] ret = new int[1];

4281

ret[0] = chromeFlags;

4282

XPCOM.memmove (aChromeFlags, ret, 4); /* PRUint32 */

4283

@@ -3081,7 +3081,7 @@

4284

}

4285

4286

int ShowAsModal () {

4287

- int /*long*/[] result = new int /*long*/[1];

4288

+ long /*int*/[] result = new long /*int*/[1];

4289

int rc = XPCOM.NS_GetServiceManager (result);

4290

if (rc != XPCOM.NS_OK) error (rc);

4291

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

4292

@@ -3111,7 +3111,7 @@

4293

return XPCOM.NS_OK;

4294

}

4295

4296

-int IsWindowModal (int /*long*/ retval) {

4297

+int IsWindowModal (long /*int*/ retval) {

4298

int result = (chromeFlags & nsIWebBrowserChrome.CHROME_MODAL) != 0 ? 1 : 0;

4299

XPCOM.memmove (retval, new int[] {result}, 4); /* PRBool */

4300

return XPCOM.NS_OK;

4301

@@ -3137,7 +3137,7 @@

4302

return XPCOM.NS_OK;

4303

}

4304

4305

-int GetDimensions (int flags, int /*long*/ x, int /*long*/ y, int /*long*/ cx, int /*long*/ cy) {

4306

+int GetDimensions (int flags, long /*int*/ x, long /*int*/ y, long /*int*/ cx, long /*int*/ cy) {

4307

if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_POSITION) != 0) {

4308

Point location = browser.getShell ().getLocation ();

4309

if (x != 0) C.memmove (x, new int[] {location.x}, 4); /* PRInt32 */

4310

@@ -3157,7 +3157,7 @@

4311

}

4312

4313

int SetFocus () {

4314

- int /*long*/[] result = new int /*long*/[1];

4315

+ long /*int*/[] result = new long /*int*/[1];

4316

int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);

4317

if (rc != XPCOM.NS_OK) error (rc);

4318

if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);

4319

@@ -3175,7 +3175,7 @@

4320

return XPCOM.NS_OK;

4321

}

4322

4323

-int GetVisibility (int /*long*/ aVisibility) {

4324

+int GetVisibility (long /*int*/ aVisibility) {

4325

boolean visible = browser.isVisible () && !browser.getShell ().getMinimized ();

4326

XPCOM.memmove (aVisibility, new int[] {visible ? 1 : 0}, 4); /* PRBool */

4327

return XPCOM.NS_OK;

4328

@@ -3218,11 +3218,11 @@

4329

return XPCOM.NS_OK;

4330

}

4331

4332

-int GetTitle (int /*long*/ aTitle) {

4333

+int GetTitle (long /*int*/ aTitle) {

4334

return XPCOM.NS_OK;

4335

}

4336

4337

-int SetTitle (int /*long*/ aTitle) {

4338

+int SetTitle (long /*int*/ aTitle) {

4339

if (titleListeners.length == 0) return XPCOM.NS_OK;

4340

TitleEvent event = new TitleEvent (browser);

4341

event.display = browser.getDisplay ();

4342

@@ -3246,7 +3246,7 @@

4343

return XPCOM.NS_OK;

4344

}

4345

4346

-int GetSiteWindow (int /*long*/ aSiteWindow) {

4347

+int GetSiteWindow (long /*int*/ aSiteWindow) {

4348

/*

4349

* Note. The handle is expected to be an HWND on Windows and

4350

* a GtkWidget* on GTK. This callback is invoked on Windows

4351

@@ -3254,7 +3254,7 @@

4352

* dialog comes up. If no handle is returned, the print dialog

4353

* does not come up on this platform.

4354

*/

4355

- XPCOM.memmove (aSiteWindow, new int /*long*/[] {embedHandle}, C.PTR_SIZEOF);

4356

+ XPCOM.memmove (aSiteWindow, new long /*int*/[] {embedHandle}, C.PTR_SIZEOF);

4357

return XPCOM.NS_OK;

4358

}

4359

4360

@@ -3294,9 +3294,9 @@

4361

4362

/* nsIContextMenuListener */

4363

4364

-int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNode) {

4365

+int OnShowContextMenu (int aContextFlags, long /*int*/ aEvent, long /*int*/ aNode) {

4366

nsIDOMEvent domEvent = new nsIDOMEvent (aEvent);

4367

- int /*long*/[] result = new int /*long*/[1];

4368

+ long /*int*/[] result = new long /*int*/[1];

4369

int rc = domEvent.QueryInterface (nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);

4370

if (rc != XPCOM.NS_OK) error (rc);

4371

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

4372

@@ -3326,15 +3326,15 @@

4373

4374

/* nsIURIContentListener */

4375

4376

-int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {

4377

+int OnStartURIOpen (long /*int*/ aURI, long /*int*/ retval) {

4378

if (isRetrievingBadCert) return XPCOM.NS_OK;

4379

authCount = 0;

4380

4381

nsIURI location = new nsIURI (aURI);

4382

- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();

4383

+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();

4384

location.GetSpec (aSpec);

4385

int length = XPCOM.nsEmbedCString_Length (aSpec);

4386

- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);

4387

+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);

4388

buffer = XPCOM.nsEmbedCString_get (aSpec);

4389

byte[] dest = new byte[length];

4390

XPCOM.memmove (dest, buffer, length);

4391

@@ -3383,7 +3383,7 @@

4392

if (jsEnabledChanged) {

4393

jsEnabledChanged = false;

4394

4395

- int /*long*/[] result = new int /*long*/[1];

4396

+ long /*int*/[] result = new long /*int*/[1];

4397

int rc = webBrowser.QueryInterface (nsIWebBrowserSetup.NS_IWEBBROWSERSETUP_IID, result);

4398

if (rc != XPCOM.NS_OK) error (rc);

4399

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

4400

@@ -3402,11 +3402,11 @@

4401

return XPCOM.NS_OK;

4402

}

4403

4404

-int DoContent (int /*long*/ aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/ aContentHandler, int /*long*/ retval) {

4405

+int DoContent (long /*int*/ aContentType, int aIsContentPreferred, long /*int*/ aRequest, long /*int*/ aContentHandler, long /*int*/ retval) {

4406

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

4407

}

4408

4409

-int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, int /*long*/ retval) {

4410

+int IsPreferred (long /*int*/ aContentType, long /*int*/ aDesiredContentType, long /*int*/ retval) {

4411

boolean preferred = false;

4412

int size = XPCOM.strlen (aContentType);

4413

if (size > 0) {

4414

@@ -3417,7 +3417,7 @@

4415

/* do not attempt to handle known problematic content types */

4416

if (!contentType.equals (XPCOM.CONTENT_MAYBETEXT) && !contentType.equals (XPCOM.CONTENT_MULTIPART)) {

4417

/* determine whether browser can handle the content type */

4418

- int /*long*/[] result = new int /*long*/[1];

4419

+ long /*int*/[] result = new long /*int*/[1];

4420

int rc = XPCOM.NS_GetServiceManager (result);

4421

if (rc != XPCOM.NS_OK) error (rc);

4422

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

4423

@@ -3429,7 +3429,7 @@

4424

rc = serviceManager.GetServiceByContractID (aContractID, nsIWebNavigationInfo.NS_IWEBNAVIGATIONINFO_IID, result);

4425

if (rc == XPCOM.NS_OK) {

4426

byte[] bytes = MozillaDelegate.wcsToMbcs (null, contentType, true);

4427

- int /*long*/ typePtr = XPCOM.nsEmbedCString_new (bytes, bytes.length);

4428

+ long /*int*/ typePtr = XPCOM.nsEmbedCString_new (bytes, bytes.length);

4429

nsIWebNavigationInfo info = new nsIWebNavigationInfo (result[0]);

4430

result[0] = 0;

4431

int[] isSupportedResult = new int[1]; /* PRUint32 */

4432

@@ -3459,34 +3459,34 @@

4433

4434

XPCOM.memmove(retval, new int[] {preferred ? 1 : 0}, 4); /* PRBool */

4435

if (preferred) {

4436

- XPCOM.memmove (aDesiredContentType, new int /*long*/[] {0}, C.PTR_SIZEOF);

4437

+ XPCOM.memmove (aDesiredContentType, new long /*int*/[] {0}, C.PTR_SIZEOF);

4438

}

4439

return XPCOM.NS_OK;

4440

}

4441

4442

-int CanHandleContent (int /*long*/ aContentType, int aIsContentPreferred, int /*long*/ aDesiredContentType, int /*long*/ retval) {

4443

+int CanHandleContent (long /*int*/ aContentType, int aIsContentPreferred, long /*int*/ aDesiredContentType, long /*int*/ retval) {

4444

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

4445

}

4446

4447

-int GetLoadCookie (int /*long*/ aLoadCookie) {

4448

+int GetLoadCookie (long /*int*/ aLoadCookie) {

4449

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

4450

}

4451

4452

-int SetLoadCookie (int /*long*/ aLoadCookie) {

4453

+int SetLoadCookie (long /*int*/ aLoadCookie) {

4454

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

4455

}

4456

4457

-int GetParentContentListener (int /*long*/ aParentContentListener) {

4458

+int GetParentContentListener (long /*int*/ aParentContentListener) {

4459

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

4460

}

4461

4462

-int SetParentContentListener (int /*long*/ aParentContentListener) {

4463

+int SetParentContentListener (long /*int*/ aParentContentListener) {

4464

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

4465

}

4466

4467

/* nsITooltipListener */

4468

4469

-int OnShowTooltip (int aXCoords, int aYCoords, int /*long*/ aTipText) {

4470

+int OnShowTooltip (int aXCoords, int aYCoords, long /*int*/ aTipText) {

4471

int length = XPCOM.strlen_PRUnichar (aTipText);

4472

char[] dest = new char[length];

4473

XPCOM.memmove (dest, aTipText, length * 2);

4474

@@ -3524,21 +3524,21 @@

4475

4476

/* nsIDOMEventListener */

4477

4478

-int HandleEvent (int /*long*/ event) {

4479

+int HandleEvent (long /*int*/ event) {

4480

nsIDOMEvent domEvent = new nsIDOMEvent (event);

4481

4482

- int /*long*/ type = XPCOM.nsEmbedString_new ();

4483

+ long /*int*/ type = XPCOM.nsEmbedString_new ();

4484

int rc = domEvent.GetType (type);

4485

if (rc != XPCOM.NS_OK) error (rc);

4486

int length = XPCOM.nsEmbedString_Length (type);

4487

- int /*long*/ buffer = XPCOM.nsEmbedString_get (type);

4488

+ long /*int*/ buffer = XPCOM.nsEmbedString_get (type);

4489

char[] chars = new char[length];

4490

XPCOM.memmove (chars, buffer, length * 2);

4491

String typeString = new String (chars);

4492

XPCOM.nsEmbedString_delete (type);

4493

4494

if (XPCOM.DOMEVENT_UNLOAD.equals (typeString)) {

4495

- int /*long*/[] result = new int /*long*/[1];

4496

+ long /*int*/[] result = new long /*int*/[1];

4497

rc = domEvent.GetCurrentTarget (result);

4498

if (rc != XPCOM.NS_OK) error (rc);

4499

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

4500

@@ -3555,7 +3555,7 @@

4501

}

4502

4503

if (XPCOM.DOMEVENT_KEYDOWN.equals (typeString)) {

4504

- int /*long*/[] result = new int /*long*/[1];

4505

+ long /*int*/[] result = new long /*int*/[1];

4506

rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);

4507

if (rc != XPCOM.NS_OK) error (rc);

4508

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

4509

@@ -3663,7 +3663,7 @@

4510

case SWT.SCROLL_LOCK: return XPCOM.NS_OK;

4511

}

4512

4513

- int /*long*/[] result = new int /*long*/[1];

4514

+ long /*int*/[] result = new long /*int*/[1];

4515

rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);

4516

if (rc != XPCOM.NS_OK) error (rc);

4517

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

4518

@@ -3713,7 +3713,7 @@

4519

}

4520

4521

if (XPCOM.DOMEVENT_KEYUP.equals (typeString)) {

4522

- int /*long*/[] result = new int /*long*/[1];

4523

+ long /*int*/[] result = new long /*int*/[1];

4524

rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);

4525

if (rc != XPCOM.NS_OK) error (rc);

4526

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

4527

@@ -3770,7 +3770,7 @@

4528

4529

/* mouse event */

4530

4531

- int /*long*/[] result = new int /*long*/[1];

4532

+ long /*int*/[] result = new long /*int*/[1];

4533

rc = domEvent.QueryInterface (nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);

4534

if (rc != XPCOM.NS_OK) error (rc);

4535

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

4536

@@ -3876,10 +3876,10 @@

4537

4538

/* nsIBadCertListener2 */

4539

4540

-int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int /*long*/ _suppressError) {

4541

+int NotifyCertProblem (long /*int*/ socketInfo, long /*int*/ status, long /*int*/ targetSite, long /*int*/ _suppressError) {

4542

/* determine the host name and port */

4543

int length = XPCOM.nsEmbedCString_Length (targetSite);

4544

- int /*long*/ buffer = XPCOM.nsEmbedCString_get (targetSite);

4545

+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (targetSite);

4546

byte[] dest = new byte[length];

4547

XPCOM.memmove (dest, buffer, length);

4548

final String urlPort = new String (dest);

4549

@@ -3889,7 +3889,7 @@

4550

4551

/* create text descriptions of the certificate problem(s) */

4552

4553

- int /*long*/[] result = new int /*long*/[1];

4554

+ long /*int*/[] result = new long /*int*/[1];

4555

nsISupports supports = new nsISupports (status);

4556

int rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_IID, result);

4557

if (rc != XPCOM.NS_OK) error (rc);

4558

@@ -3909,7 +3909,7 @@

4559

4560

rc = sslStatus.GetIsDomainMismatch (intResult);

4561

if (intResult[0] != 0) {

4562

- int /*long*/ ptr = XPCOM.nsEmbedString_new ();

4563

+ long /*int*/ ptr = XPCOM.nsEmbedString_new ();

4564

rc = cert.GetCommonName (ptr);

4565

if (rc != XPCOM.NS_OK) SWT.error (rc);

4566

length = XPCOM.nsEmbedString_Length (ptr);

4567

@@ -3932,7 +3932,7 @@

4568

nsIX509CertValidity validity = new nsIX509CertValidity(result[0]);

4569

result[0] = 0;

4570

4571

- int /*long*/ ptr = XPCOM.nsEmbedString_new ();

4572

+ long /*int*/ ptr = XPCOM.nsEmbedString_new ();

4573

rc = validity.GetNotBeforeGMT (ptr);

4574

if (rc != XPCOM.NS_OK) SWT.error (rc);

4575

length = XPCOM.nsEmbedString_Length (ptr);

4576

@@ -3961,7 +3961,7 @@

4577

4578

rc = sslStatus.GetIsUntrusted (intResult);

4579

if (intResult[0] != 0) {

4580

- int /*long*/ ptr = XPCOM.nsEmbedString_new ();

4581

+ long /*int*/ ptr = XPCOM.nsEmbedString_new ();

4582

rc = cert.GetIssuerCommonName (ptr);

4583

if (rc != XPCOM.NS_OK) SWT.error (rc);

4584

length = XPCOM.nsEmbedString_Length (ptr);

4585

@@ -3991,7 +3991,7 @@

4586

4587

String message = Compatibility.getMessage ("SWT_InvalidCert_Message", new String[] {urlPort}); //$NON-NLS-1$

4588

if (new PromptDialog (browser.getShell ()).invalidCert (browser, message, finalProblems, cert)) {

4589

- int /*long*/[] result = new int /*long*/[1];

4590

+ long /*int*/[] result = new long /*int*/[1];

4591

int rc = XPCOM.NS_GetServiceManager (result);

4592

if (rc != XPCOM.NS_OK) error (rc);

4593

if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);

4594

@@ -4007,7 +4007,7 @@

4595

nsICertOverrideService overrideService = new nsICertOverrideService (result[0]);

4596

result[0] = 0;

4597

byte[] hostBytes = MozillaDelegate.wcsToMbcs (null, host, false);

4598

- int /*long*/ hostString = XPCOM.nsEmbedCString_new (hostBytes, hostBytes.length);

4599

+ long /*int*/ hostString = XPCOM.nsEmbedCString_new (hostBytes, hostBytes.length);

4600

rc = overrideService.RememberValidityOverride (hostString, port, cert.getAddress (), finalFlags, 1);

4601

browser.setUrl (url);

4602

XPCOM.nsEmbedCString_delete (hostString);

4603

diff -urN x86/org/eclipse/swt/browser/PromptDialog.java x86_64/org/eclipse/swt/browser/PromptDialog.java

4604

--- x86/org/eclipse/swt/browser/PromptDialog.java 2009-08-19 16:24:46.000000000 -0400

4605

+++ x86_64/org/eclipse/swt/browser/PromptDialog.java 2009-09-17 08:48:20.000000000 -0400

4606

@@ -141,7 +141,7 @@

4607

viewCertButton.setText(Compatibility.getMessage("View Certificate")); //$NON-NLS-1$

4608

viewCertButton.addListener(SWT.Selection, new Listener() {

4609

public void handleEvent(Event event) {

4610

- int /*long*/[] result = new int /*long*/[1];

4611

+ long /*int*/[] result = new long /*int*/[1];

4612

int rc = XPCOM.NS_GetServiceManager (result);

4613

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

4614

if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

4615

diff -urN x86/org/eclipse/swt/browser/PromptService2Factory.java x86_64/org/eclipse/swt/browser/PromptService2Factory.java

4616

--- x86/org/eclipse/swt/browser/PromptService2Factory.java 2008-01-29 15:18:56.000000000 -0500

4617

+++ x86_64/org/eclipse/swt/browser/PromptService2Factory.java 2009-09-17 08:48:20.000000000 -0400

4618

@@ -30,17 +30,17 @@

4619

void createCOMInterfaces () {

4620

/* Create each of the interfaces that this object implements */

4621

supports = new XPCOMObject (new int[] {2, 0, 0}) {

4622

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

4623

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

4624

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

4625

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

4626

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

4627

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

4628

};

4629

4630

factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {

4631

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

4632

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

4633

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

4634

- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}

4635

- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}

4636

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

4637

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

4638

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

4639

+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}

4640

+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}

4641

};

4642

}

4643

4644

@@ -55,27 +55,27 @@

4645

}

4646

}

4647

4648

-int /*long*/ getAddress () {

4649

+long /*int*/ getAddress () {

4650

return factory.getAddress ();

4651

}

4652

4653

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

4654

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

4655

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

4656

nsID guid = new nsID ();

4657

XPCOM.memmove (guid, riid, nsID.sizeof);

4658

4659

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

4660

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

4661

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

4662

AddRef ();

4663

return XPCOM.NS_OK;

4664

}

4665

if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {

4666

- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);

4667

+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);

4668

AddRef ();

4669

return XPCOM.NS_OK;

4670

}

4671

4672

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

4673

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

4674

return XPCOM.NS_ERROR_NO_INTERFACE;

4675

}

4676

4677

@@ -87,10 +87,10 @@

4678

4679

/* nsIFactory */

4680

4681

-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {

4682

+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {

4683

PromptService2 promptService = new PromptService2 ();

4684

promptService.AddRef ();

4685

- XPCOM.memmove (result, new int /*long*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);

4686

+ XPCOM.memmove (result, new long /*int*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);

4687

return XPCOM.NS_OK;

4688

}

4689

4690

diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/browser/PromptService2.java

4691

--- x86/org/eclipse/swt/browser/PromptService2.java 2009-08-19 16:24:46.000000000 -0400

4692

+++ x86_64/org/eclipse/swt/browser/PromptService2.java 2009-09-17 08:48:20.000000000 -0400

4693

@@ -33,41 +33,41 @@

4694

void createCOMInterfaces () {

4695

/* Create each of the interfaces that this object implements */

4696

supports = new XPCOMObject (new int[] {2, 0, 0}) {

4697

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

4698

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

4699

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

4700

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

4701

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

4702

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

4703

};

4704

4705

promptService = new XPCOMObject (new int[] {2, 0, 0, 3, 5, 4, 6, 10, 7, 8, 7, 7}) {

4706

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

4707

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

4708

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

4709

- public int /*long*/ method3 (int /*long*/[] args) {return Alert (args[0], args[1], args[2]);}

4710

- public int /*long*/ method4 (int /*long*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);}

4711

- public int /*long*/ method5 (int /*long*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);}

4712

- public int /*long*/ method6 (int /*long*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);}

4713

- 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]);}

4714

- public int /*long*/ method8 (int /*long*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}

4715

- 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]);}

4716

- public int /*long*/ method10 (int /*long*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}

4717

- 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]);}

4718

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

4719

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

4720

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

4721

+ public long /*int*/ method3 (long /*int*/[] args) {return Alert (args[0], args[1], args[2]);}

4722

+ public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);}

4723

+ public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);}

4724

+ public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);}

4725

+ 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]);}

4726

+ public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}

4727

+ 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]);}

4728

+ public long /*int*/ method10 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}

4729

+ 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]);}

4730

};

4731

4732

promptService2 = new XPCOMObject (new int[] {2, 0, 0, 3, 5, 4, 6, 10, 7, 8, 7, 7, 7, 9}) {

4733

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

4734

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

4735

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

4736

- public int /*long*/ method3 (int /*long*/[] args) {return Alert (args[0], args[1], args[2]);}

4737

- public int /*long*/ method4 (int /*long*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);}

4738

- public int /*long*/ method5 (int /*long*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);}

4739

- public int /*long*/ method6 (int /*long*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);}

4740

- 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]);}

4741

- public int /*long*/ method8 (int /*long*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}

4742

- 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]);}

4743

- public int /*long*/ method10 (int /*long*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}

4744

- 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]);}

4745

- 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]);}

4746

- 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]);}

4747

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

4748

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

4749

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

4750

+ public long /*int*/ method3 (long /*int*/[] args) {return Alert (args[0], args[1], args[2]);}

4751

+ public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);}

4752

+ public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);}

4753

+ public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);}

4754

+ 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]);}

4755

+ public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}

4756

+ 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]);}

4757

+ public long /*int*/ method10 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}

4758

+ 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]);}

4759

+ 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]);}

4760

+ 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]);}

4761

};

4762

}

4763

4764

@@ -86,32 +86,32 @@

4765

}

4766

}

4767

4768

-int /*long*/ getAddress () {

4769

+long /*int*/ getAddress () {

4770

return promptService2.getAddress ();

4771

}

4772

4773

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

4774

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

4775

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

4776

nsID guid = new nsID ();

4777

XPCOM.memmove (guid, riid, nsID.sizeof);

4778

4779

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

4780

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

4781

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

4782

AddRef ();

4783

return XPCOM.NS_OK;

4784

}

4785

if (guid.Equals (nsIPromptService.NS_IPROMPTSERVICE_IID)) {

4786

- XPCOM.memmove (ppvObject, new int /*long*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);

4787

+ XPCOM.memmove (ppvObject, new long /*int*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);

4788

AddRef ();

4789

return XPCOM.NS_OK;

4790

}

4791

if (guid.Equals (nsIPromptService2.NS_IPROMPTSERVICE2_IID)) {

4792

- XPCOM.memmove (ppvObject, new int /*long*/[] {promptService2.getAddress ()}, C.PTR_SIZEOF);

4793

+ XPCOM.memmove (ppvObject, new long /*int*/[] {promptService2.getAddress ()}, C.PTR_SIZEOF);

4794

AddRef ();

4795

return XPCOM.NS_OK;

4796

}

4797

4798

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

4799

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

4800

return XPCOM.NS_ERROR_NO_INTERFACE;

4801

}

4802

4803

@@ -121,13 +121,13 @@

4804

return refCount;

4805

}

4806

4807

-Browser getBrowser (int /*long*/ aDOMWindow) {

4808

+Browser getBrowser (long /*int*/ aDOMWindow) {

4809

if (aDOMWindow == 0) return null;

4810

nsIDOMWindow window = new nsIDOMWindow (aDOMWindow);

4811

return Mozilla.findBrowser (window);

4812

}

4813

4814

-String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) {

4815

+String getLabel (int buttonFlag, int index, long /*int*/ buttonTitle) {

4816

String label = null;

4817

int flag = (buttonFlag & (0xff * index)) / index;

4818

switch (flag) {

4819

@@ -148,7 +148,7 @@

4820

4821

/* nsIPromptService */

4822

4823

-int Alert (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText) {

4824

+int Alert (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText) {

4825

final Browser browser = getBrowser (aParent);

4826

4827

int length = XPCOM.strlen_PRUnichar (aDialogTitle);

4828

@@ -188,7 +188,7 @@

4829

return XPCOM.NS_OK;

4830

}

4831

4832

-int AlertCheck (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aCheckMsg, int /*long*/ aCheckState) {

4833

+int AlertCheck (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aCheckMsg, long /*int*/ aCheckState) {

4834

Browser browser = getBrowser (aParent);

4835

4836

int length = XPCOM.strlen_PRUnichar (aDialogTitle);

4837

@@ -215,11 +215,11 @@

4838

return XPCOM.NS_OK;

4839

}

4840

4841

-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) {

4842

+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) {

4843

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

4844

}

4845

4846

-int Confirm (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ _retval) {

4847

+int Confirm (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ _retval) {

4848

Browser browser = getBrowser (aParent);

4849

4850

int length = XPCOM.strlen_PRUnichar (aDialogTitle);

4851

@@ -242,11 +242,11 @@

4852

return XPCOM.NS_OK;

4853

}

4854

4855

-int ConfirmCheck (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {

4856

+int ConfirmCheck (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {

4857

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

4858

}

4859

4860

-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) {

4861

+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) {

4862

Browser browser = getBrowser (aParent);

4863

4864

int length = XPCOM.strlen_PRUnichar (aDialogTitle);

4865

@@ -288,7 +288,7 @@

4866

return XPCOM.NS_OK;

4867

}

4868

4869

-int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {

4870

+int Prompt (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aValue, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {

4871

Browser browser = getBrowser (aParent);

4872

String titleLabel = null, textLabel, checkLabel = null;

4873

String[] valueLabel = new String[1];

4874

@@ -306,7 +306,7 @@

4875

XPCOM.memmove (dest, aText, length * 2);

4876

textLabel = new String (dest);

4877

4878

- int /*long*/[] valueAddr = new int /*long*/[1];

4879

+ long /*int*/[] valueAddr = new long /*int*/[1];

4880

XPCOM.memmove (valueAddr, aValue, C.PTR_SIZEOF);

4881

if (valueAddr[0] != 0) {

4882

length = XPCOM.strlen_PRUnichar (valueAddr[0]);

4883

@@ -337,7 +337,7 @@

4884

* value that we override must be freed using the nsIMemory service.

4885

*/

4886

if (valueLabel[0] != null) {

4887

- int /*long*/[] result2 = new int /*long*/[1];

4888

+ long /*int*/[] result2 = new long /*int*/[1];

4889

int rc = XPCOM.NS_GetServiceManager (result2);

4890

if (rc != XPCOM.NS_OK) SWT.error (rc);

4891

if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);

4892

@@ -357,9 +357,9 @@

4893

char[] buffer = new char[cnt + 1];

4894

valueLabel[0].getChars (0, cnt, buffer, 0);

4895

int size = buffer.length * 2;

4896

- int /*long*/ ptr = memory.Alloc (size);

4897

+ long /*int*/ ptr = memory.Alloc (size);

4898

XPCOM.memmove (ptr, buffer, size);

4899

- XPCOM.memmove (aValue, new int /*long*/[] {ptr}, C.PTR_SIZEOF);

4900

+ XPCOM.memmove (aValue, new long /*int*/[] {ptr}, C.PTR_SIZEOF);

4901

4902

if (valueAddr[0] != 0) {

4903

memory.Free (valueAddr[0]);

4904

@@ -371,7 +371,7 @@

4905

return XPCOM.NS_OK;

4906

}

4907

4908

-int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*long*/ checkboxLabel, int /*long*/ checkboxValue, int /*long*/ _retval) {

4909

+int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, long /*int*/ checkboxLabel, long /*int*/ checkboxValue, long /*int*/ _retval) {

4910

nsIAuthInformation auth = new nsIAuthInformation (authInfo);

4911

4912

Browser browser = getBrowser (aParent);

4913

@@ -425,11 +425,11 @@

4914

4915

/* get initial username and password values */

4916

4917

- int /*long*/ ptr = XPCOM.nsEmbedString_new ();

4918

+ long /*int*/ ptr = XPCOM.nsEmbedString_new ();

4919

int rc = auth.GetUsername (ptr);

4920

if (rc != XPCOM.NS_OK) SWT.error (rc);

4921

int length = XPCOM.nsEmbedString_Length (ptr);

4922

- int /*long*/ buffer = XPCOM.nsEmbedString_get (ptr);

4923

+ long /*int*/ buffer = XPCOM.nsEmbedString_get (ptr);

4924

char[] chars = new char[length];

4925

XPCOM.memmove (chars, buffer, length * 2);

4926

userLabel[0] = new String (chars);

4927

@@ -458,13 +458,13 @@

4928

XPCOM.nsEmbedString_delete (ptr);

4929

4930

nsIChannel channel = new nsIChannel (aChannel);

4931

- int /*long*/[] uri = new int /*long*/[1];

4932

+ long /*int*/[] uri = new long /*int*/[1];

4933

rc = channel.GetURI (uri);

4934

if (rc != XPCOM.NS_OK) SWT.error (rc);

4935

if (uri[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);

4936

4937

nsIURI nsURI = new nsIURI (uri[0]);

4938

- int /*long*/ host = XPCOM.nsEmbedCString_new ();

4939

+ long /*int*/ host = XPCOM.nsEmbedCString_new ();

4940

rc = nsURI.GetHost (host);

4941

if (rc != XPCOM.NS_OK) SWT.error (rc);

4942

length = XPCOM.nsEmbedCString_Length (host);

4943

@@ -505,7 +505,7 @@

4944

return XPCOM.NS_OK;

4945

}

4946

4947

-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) {

4948

+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) {

4949

Browser browser = getBrowser (aParent);

4950

String user = null, password = null;

4951

4952

@@ -556,7 +556,7 @@

4953

XPCOM.memmove (dest, aText, length * 2);

4954

textLabel = new String (dest);

4955

4956

- int /*long*/[] userAddr = new int /*long*/[1];

4957

+ long /*int*/[] userAddr = new long /*int*/[1];

4958

XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);

4959

if (userAddr[0] != 0) {

4960

length = XPCOM.strlen_PRUnichar (userAddr[0]);

4961

@@ -565,7 +565,7 @@

4962

userLabel[0] = new String (dest);

4963

}

4964

4965

- int /*long*/[] passAddr = new int /*long*/[1];

4966

+ long /*int*/[] passAddr = new long /*int*/[1];

4967

XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);

4968

if (passAddr[0] != 0) {

4969

length = XPCOM.strlen_PRUnichar (passAddr[0]);

4970

@@ -603,12 +603,12 @@

4971

* User name and password are returned as PRUnichar values. Any default

4972

* value that we override must be freed using the nsIMemory service.

4973

*/

4974

- int /*long*/[] userAddr = new int /*long*/[1];

4975

+ long /*int*/[] userAddr = new long /*int*/[1];

4976

XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);

4977

- int /*long*/[] passAddr = new int /*long*/[1];

4978

+ long /*int*/[] passAddr = new long /*int*/[1];

4979

XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);

4980

4981

- int /*long*/[] result = new int /*long*/[1];

4982

+ long /*int*/[] result = new long /*int*/[1];

4983

int rc = XPCOM.NS_GetServiceManager (result);

4984

if (rc != XPCOM.NS_OK) SWT.error (rc);

4985

if (result[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);

4986

@@ -633,9 +633,9 @@

4987

char[] buffer = new char[cnt + 1];

4988

user.getChars (0, cnt, buffer, 0);

4989

int size = buffer.length * 2;

4990

- int /*long*/ ptr = C.malloc (size);

4991

+ long /*int*/ ptr = C.malloc (size);

4992

XPCOM.memmove (ptr, buffer, size);

4993

- XPCOM.memmove (aUsername, new int /*long*/[] {ptr}, C.PTR_SIZEOF);

4994

+ XPCOM.memmove (aUsername, new long /*int*/[] {ptr}, C.PTR_SIZEOF);

4995

4996

cnt = password.length ();

4997

buffer = new char[cnt + 1];

4998

@@ -643,17 +643,17 @@

4999

size = buffer.length * 2;

5000

ptr = C.malloc (size);

5001

XPCOM.memmove (ptr, buffer, size);

5002

- XPCOM.memmove (aPassword, new int /*long*/[] {ptr}, C.PTR_SIZEOF);

5003

+ XPCOM.memmove (aPassword, new long /*int*/[] {ptr}, C.PTR_SIZEOF);

5004

}

5005

5006

return XPCOM.NS_OK;

5007

}

5008

5009

-int PromptPassword (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aPassword, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {

5010

+int PromptPassword (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aPassword, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {

5011

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

5012

}

5013

5014

-int Select (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int aCount, int /*long*/ aSelectList, int /*long*/ aOutSelection, int /*long*/ _retval) {

5015

+int Select (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, int aCount, long /*int*/ aSelectList, long /*int*/ aOutSelection, long /*int*/ _retval) {

5016

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

5017

}

5018

5019

diff -urN x86/org/eclipse/swt/browser/SimpleEnumerator.java x86_64/org/eclipse/swt/browser/SimpleEnumerator.java

5020

--- x86/org/eclipse/swt/browser/SimpleEnumerator.java 2007-08-01 15:57:24.000000000 -0400

5021

+++ x86_64/org/eclipse/swt/browser/SimpleEnumerator.java 2009-09-17 08:48:20.000000000 -0400

5022

@@ -36,17 +36,17 @@

5023

void createCOMInterfaces () {

5024

/* Create each of the interfaces that this object implements */

5025

supports = new XPCOMObject (new int[] {2, 0, 0}) {

5026

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

5027

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

5028

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

5029

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

5030

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

5031

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

5032

};

5033

5034

simpleEnumerator = new XPCOMObject (new int[] {2, 0, 0, 1, 1}) {

5035

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

5036

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

5037

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

5038

- public int /*long*/ method3 (int /*long*/[] args) {return HasMoreElements (args[0]);}

5039

- public int /*long*/ method4 (int /*long*/[] args) {return GetNext (args[0]);}

5040

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

5041

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

5042

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

5043

+ public long /*int*/ method3 (long /*int*/[] args) {return HasMoreElements (args[0]);}

5044

+ public long /*int*/ method4 (long /*int*/[] args) {return GetNext (args[0]);}

5045

};

5046

}

5047

5048

@@ -67,27 +67,27 @@

5049

}

5050

}

5051

5052

-int /*long*/ getAddress () {

5053

+long /*int*/ getAddress () {

5054

return simpleEnumerator.getAddress ();

5055

}

5056

5057

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

5058

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

5059

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

5060

nsID guid = new nsID ();

5061

XPCOM.memmove (guid, riid, nsID.sizeof);

5062

5063

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

5064

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

5065

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

5066

AddRef ();

5067

return XPCOM.NS_OK;

5068

}

5069

if (guid.Equals (nsISimpleEnumerator.NS_ISIMPLEENUMERATOR_IID)) {

5070

- XPCOM.memmove (ppvObject, new int /*long*/[] {simpleEnumerator.getAddress ()}, C.PTR_SIZEOF);

5071

+ XPCOM.memmove (ppvObject, new long /*int*/[] {simpleEnumerator.getAddress ()}, C.PTR_SIZEOF);

5072

AddRef ();

5073

return XPCOM.NS_OK;

5074

}

5075

5076

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

5077

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

5078

return XPCOM.NS_ERROR_NO_INTERFACE;

5079

}

5080

5081

@@ -97,17 +97,17 @@

5082

return refCount;

5083

}

5084

5085

-int HasMoreElements (int /*long*/ _retval) {

5086

+int HasMoreElements (long /*int*/ _retval) {

5087

boolean more = values != null && index < values.length;

5088

XPCOM.memmove (_retval, new int[] {more ? 1 : 0}, 4); /*PRBool */

5089

return XPCOM.NS_OK;

5090

}

5091

5092

-int GetNext (int /*long*/ _retval) {

5093

+int GetNext (long /*int*/ _retval) {

5094

if (values == null || index == values.length) return XPCOM.NS_ERROR_UNEXPECTED;

5095

nsISupports value = values[index++];

5096

value.AddRef ();

5097

- XPCOM.memmove (_retval, new int /*long*/[] {value.getAddress ()}, C.PTR_SIZEOF);

5098

+ XPCOM.memmove (_retval, new long /*int*/[] {value.getAddress ()}, C.PTR_SIZEOF);

5099

return XPCOM.NS_OK;

5100

}

5101

}

5102

diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt/browser/WindowCreator2.java

5103

--- x86/org/eclipse/swt/browser/WindowCreator2.java 2007-08-01 15:57:24.000000000 -0400

5104

+++ x86_64/org/eclipse/swt/browser/WindowCreator2.java 2009-09-17 08:48:20.000000000 -0400

5105

@@ -35,24 +35,24 @@

5106

void createCOMInterfaces () {

5107

/* Create each of the interfaces that this object implements */

5108

supports = new XPCOMObject (new int[] {2, 0, 0}) {

5109

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

5110

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

5111

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

5112

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

5113

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

5114

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

5115

};

5116

5117

windowCreator = new XPCOMObject (new int[] {2, 0, 0, 3}) {

5118

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

5119

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

5120

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

5121

- public int /*long*/ method3 (int /*long*/[] args) {return CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);}

5122

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

5123

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

5124

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

5125

+ public long /*int*/ method3 (long /*int*/[] args) {return CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);}

5126

};

5127

5128

windowCreator2 = new XPCOMObject (new int[] {2, 0, 0, 3, 6}) {

5129

- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}

5130

- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}

5131

- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}

5132

- public int /*long*/ method3 (int /*long*/[] args) {return CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);}

5133

- 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]);}

5134

+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}

5135

+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}

5136

+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}

5137

+ public long /*int*/ method3 (long /*int*/[] args) {return CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);}

5138

+ 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]);}

5139

};

5140

}

5141

5142

@@ -72,32 +72,32 @@

5143

}

5144

}

5145

5146

-int /*long*/ getAddress () {

5147

+long /*int*/ getAddress () {

5148

return windowCreator.getAddress ();

5149

}

5150

5151

-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {

5152

+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {

5153

if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;

5154

nsID guid = new nsID ();

5155

XPCOM.memmove (guid, riid, nsID.sizeof);

5156

5157

if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {

5158

- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

5159

+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);

5160

AddRef ();

5161

return XPCOM.NS_OK;

5162

}

5163

if (guid.Equals (nsIWindowCreator.NS_IWINDOWCREATOR_IID)) {

5164

- XPCOM.memmove (ppvObject, new int /*long*/[] {windowCreator.getAddress ()}, C.PTR_SIZEOF);

5165

+ XPCOM.memmove (ppvObject, new long /*int*/[] {windowCreator.getAddress ()}, C.PTR_SIZEOF);

5166

AddRef ();

5167

return XPCOM.NS_OK;

5168

}

5169

if (guid.Equals (nsIWindowCreator2.NS_IWINDOWCREATOR2_IID)) {

5170

- XPCOM.memmove (ppvObject, new int /*long*/[] {windowCreator2.getAddress ()}, C.PTR_SIZEOF);

5171

+ XPCOM.memmove (ppvObject, new long /*int*/[] {windowCreator2.getAddress ()}, C.PTR_SIZEOF);

5172

AddRef ();

5173

return XPCOM.NS_OK;

5174

}

5175

5176

- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);

5177

+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);

5178

return XPCOM.NS_ERROR_NO_INTERFACE;

5179

}

5180

5181

@@ -109,26 +109,26 @@

5182

5183

/* nsIWindowCreator */

5184

5185

-int CreateChromeWindow (int /*long*/ parent, int chromeFlags, int /*long*/ _retval) {

5186

+int CreateChromeWindow (long /*int*/ parent, int chromeFlags, long /*int*/ _retval) {

5187

return CreateChromeWindow2 (parent, chromeFlags, 0, 0, 0, _retval);

5188

}

5189

5190

/* nsIWindowCreator2 */

5191

5192

-int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int /*long*/ cancel, int /*long*/ _retval) {

5193

+int CreateChromeWindow2 (long /*int*/ parent, int chromeFlags, int contextFlags, long /*int*/ uri, long /*int*/ cancel, long /*int*/ _retval) {

5194

if (parent == 0 && (chromeFlags & nsIWebBrowserChrome.CHROME_OPENAS_CHROME) == 0) {

5195

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

5196

}

5197

Browser src = null;

5198

if (parent != 0) {

5199

nsIWebBrowserChrome browserChromeParent = new nsIWebBrowserChrome (parent);

5200

- int /*long*/[] aWebBrowser = new int /*long*/[1];

5201

+ long /*int*/[] aWebBrowser = new long /*int*/[1];

5202

int rc = browserChromeParent.GetWebBrowser (aWebBrowser);

5203

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

5204

if (aWebBrowser[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);

5205

5206

nsIWebBrowser webBrowser = new nsIWebBrowser (aWebBrowser[0]);

5207

- int /*long*/[] result = new int /*long*/[1];

5208

+ long /*int*/[] result = new long /*int*/[1];

5209

rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);

5210

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

5211

if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);

5212

@@ -136,7 +136,7 @@

5213

5214

nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]);

5215

result[0] = 0;

5216

- int /*long*/[] aParentNativeWindow = new int /*long*/[1];

5217

+ long /*int*/[] aParentNativeWindow = new long /*int*/[1];

5218

rc = baseWindow.GetParentNativeWindow (aParentNativeWindow);

5219

if (rc != XPCOM.NS_OK) Mozilla.error (rc);

5220

if (aParentNativeWindow[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);

5221

@@ -178,11 +178,11 @@

5222

});

5223

if (uri != 0) {

5224

nsIURI location = new nsIURI (uri);

5225

- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();

5226

+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();

5227

if (location.GetSpec (aSpec) == XPCOM.NS_OK) {

5228

int length = XPCOM.nsEmbedCString_Length (aSpec);

5229

if (length > 0) {

5230

- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);

5231

+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);

5232

byte[] dest = new byte[length];

5233

XPCOM.memmove (dest, buffer, length);

5234

browser.setUrl (new String (dest));

5235

@@ -211,11 +211,11 @@

5236

if (doit) {

5237

Mozilla mozilla = (Mozilla)browser.webBrowser;

5238

mozilla.isChild = true;

5239

- int /*long*/ chromePtr = mozilla.webBrowserChrome.getAddress ();

5240

+ long /*int*/ chromePtr = mozilla.webBrowserChrome.getAddress ();

5241

nsIWebBrowserChrome webBrowserChrome = new nsIWebBrowserChrome (chromePtr);

5242

webBrowserChrome.SetChromeFlags (chromeFlags);

5243

webBrowserChrome.AddRef ();

5244

- XPCOM.memmove (_retval, new int /*long*/[] {chromePtr}, C.PTR_SIZEOF);

5245

+ XPCOM.memmove (_retval, new long /*int*/[] {chromePtr}, C.PTR_SIZEOF);

5246

} else {

5247

if (cancel != 0) {

5248

C.memmove (cancel, new int[] {1}, 4); /* PRBool */

5249

diff -urN x86/org/eclipse/swt/dnd/ByteArrayTransfer.java x86_64/org/eclipse/swt/dnd/ByteArrayTransfer.java

5250

--- x86/org/eclipse/swt/dnd/ByteArrayTransfer.java 2008-06-05 13:31:48.000000000 -0400

5251

+++ x86_64/org/eclipse/swt/dnd/ByteArrayTransfer.java 2009-09-17 08:48:20.000000000 -0400

5252

@@ -155,7 +155,7 @@

5253

}

5254

byte[] buffer = (byte[])object;

5255

if (buffer.length == 0) return;

5256

- int /*long*/ pValue = OS.g_malloc(buffer.length);

5257

+ long /*int*/ pValue = OS.g_malloc(buffer.length);

5258

if (pValue == 0) return;

5259

OS.memmove(pValue, buffer, buffer.length);

5260

transferData.length = buffer.length;

5261

diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clipboard.java

5262

--- x86/org/eclipse/swt/dnd/Clipboard.java 2009-05-29 17:30:20.000000000 -0400

5263

+++ x86_64/org/eclipse/swt/dnd/Clipboard.java 2009-09-17 08:48:20.000000000 -0400

5264

@@ -32,14 +32,14 @@

5265

5266

private Display display;

5267

5268

- static int /*long*/ GTKCLIPBOARD;

5269

- static int /*long*/ GTKPRIMARYCLIPBOARD;

5270

- private static int /*long*/ TARGET;

5271

+ static long /*int*/ GTKCLIPBOARD;

5272

+ static long /*int*/ GTKPRIMARYCLIPBOARD;

5273

+ private static long /*int*/ TARGET;

5274

5275

static {

5276

GTKCLIPBOARD = OS.gtk_clipboard_get(OS.GDK_NONE);

5277

byte[] buffer = Converter.wcsToMbcs(null, "PRIMARY", true);

5278

- int /*long*/ primary = OS.gdk_atom_intern(buffer, false);

5279

+ long /*int*/ primary = OS.gdk_atom_intern(buffer, false);

5280

GTKPRIMARYCLIPBOARD = OS.gtk_clipboard_get(primary);

5281

buffer = Converter.wcsToMbcs(null, "TARGETS", true);

5282

TARGET = OS.gdk_atom_intern(buffer, false);

5283

@@ -287,7 +287,7 @@

5284

public Object getContents(Transfer transfer, int clipboards) {

5285

checkWidget();

5286

if (transfer == null) DND.error(SWT.ERROR_NULL_ARGUMENT);

5287

- int /*long*/ selection_data = 0;

5288

+ long /*int*/ selection_data = 0;

5289

int[] typeIds = transfer.getTypeIds();

5290

for (int i = 0; i < typeIds.length; i++) {

5291

if ((clipboards & DND.CLIPBOARD) != 0) {

5292

@@ -549,7 +549,7 @@

5293

String[] result = new String[types1.length + types2.length];

5294

int count = 0;

5295

for (int i = 0; i < types1.length; i++) {

5296

- int /*long*/ pName = OS.gdk_atom_name(types1[i]);

5297

+ long /*int*/ pName = OS.gdk_atom_name(types1[i]);

5298

if (pName == 0) {

5299

continue;

5300

}

5301

@@ -559,7 +559,7 @@

5302

result[count++] = "GTKCLIPBOARD "+new String (Converter.mbcsToWcs (null, buffer));

5303

}

5304

for (int i = 0; i < types2.length; i++) {

5305

- int /*long*/ pName = OS.gdk_atom_name(types2[i]);

5306

+ long /*int*/ pName = OS.gdk_atom_name(types2[i]);

5307

if (pName == 0) {

5308

continue;

5309

}

5310

@@ -578,7 +578,7 @@

5311

5312

private int[] getAvailablePrimaryTypes() {

5313

int[] types = new int[0];

5314

- int /*long*/ selection_data = gtk_clipboard_wait_for_contents(GTKPRIMARYCLIPBOARD, TARGET);

5315

+ long /*int*/ selection_data = gtk_clipboard_wait_for_contents(GTKPRIMARYCLIPBOARD, TARGET);

5316

if (selection_data != 0) {

5317

try {

5318

GtkSelectionData gtkSelectionData = new GtkSelectionData();

5319

@@ -595,7 +595,7 @@

5320

}

5321

private int[] getAvailableClipboardTypes () {

5322

int[] types = new int[0];

5323

- int /*long*/ selection_data = gtk_clipboard_wait_for_contents(GTKCLIPBOARD, TARGET);

5324

+ long /*int*/ selection_data = gtk_clipboard_wait_for_contents(GTKCLIPBOARD, TARGET);

5325

if (selection_data != 0) {

5326

try {

5327

GtkSelectionData gtkSelectionData = new GtkSelectionData();

5328

@@ -611,11 +611,11 @@

5329

return types;

5330

}

5331

5332

-int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ clipboard, int /*long*/ target) {

5333

+long /*int*/ gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target) {

5334

String key = "org.eclipse.swt.internal.gtk.dispatchEvent";

5335

Display display = this.display;

5336

display.setData(key, new int[]{OS.GDK_PROPERTY_NOTIFY, OS.GDK_SELECTION_CLEAR, OS.GDK_SELECTION_REQUEST, OS.GDK_SELECTION_NOTIFY});

5337

- int /*long*/ selection_data = OS.gtk_clipboard_wait_for_contents(clipboard, target);

5338

+ long /*int*/ selection_data = OS.gtk_clipboard_wait_for_contents(clipboard, target);

5339

display.setData(key, null);

5340

return selection_data;

5341

}

5342

diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd/ClipboardProxy.java

5343

--- x86/org/eclipse/swt/dnd/ClipboardProxy.java 2005-09-27 12:51:54.000000000 -0400

5344

+++ x86_64/org/eclipse/swt/dnd/ClipboardProxy.java 2009-09-17 08:48:20.000000000 -0400

5345

@@ -71,7 +71,7 @@

5346

}

5347

}

5348

5349

-int /*long*/ clearFunc(int /*long*/ clipboard,int /*long*/ user_data_or_owner){

5350

+long /*int*/ clearFunc(long /*int*/ clipboard,long /*int*/ user_data_or_owner){

5351

if (clipboard == Clipboard.GTKCLIPBOARD) {

5352

activeClipboard = null;

5353

clipboardData = null;

5354

@@ -104,7 +104,7 @@

5355

* This function provides the data to the clipboard on request.

5356

* When this clipboard is disposed, the data will no longer be available.

5357

*/

5358

-int /*long*/ getFunc(int /*long*/ clipboard, int /*long*/ selection_data, int /*long*/ info, int /*long*/ user_data_or_owner){

5359

+long /*int*/ getFunc(long /*int*/ clipboard, long /*int*/ selection_data, long /*int*/ info, long /*int*/ user_data_or_owner){

5360

if (selection_data == 0) return 0;

5361

GtkSelectionData selectionData = new GtkSelectionData();

5362

OS.memmove(selectionData, selection_data, GtkSelectionData.sizeof);

5363

@@ -131,7 +131,7 @@

5364

5365

boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipboards) {

5366

GtkTargetEntry[] entries = new GtkTargetEntry [0];

5367

- int /*long*/ pTargetsList = 0;

5368

+ long /*int*/ pTargetsList = 0;

5369

try {

5370

for (int i = 0; i < dataTypes.length; i++) {

5371

Transfer transfer = dataTypes[i];

5372

@@ -141,7 +141,7 @@

5373

GtkTargetEntry entry = new GtkTargetEntry();

5374

entry.info = typeIds[j];

5375

byte[] buffer = Converter.wcsToMbcs(null, typeNames[j], true);

5376

- int /*long*/ pName = OS.g_malloc(buffer.length);

5377

+ long /*int*/ pName = OS.g_malloc(buffer.length);

5378

OS.memmove(pName, buffer, buffer.length);

5379

entry.target = pName;

5380

GtkTargetEntry[] tmp = new GtkTargetEntry [entries.length + 1];

5381

@@ -161,8 +161,8 @@

5382

if (activeClipboard != null) OS.gtk_clipboard_clear(Clipboard.GTKCLIPBOARD);

5383

clipboardData = data;

5384

clipboardDataTypes = dataTypes;

5385

- int /*long*/ getFuncProc = getFunc.getAddress();

5386

- int /*long*/ clearFuncProc = clearFunc.getAddress();

5387

+ long /*int*/ getFuncProc = getFunc.getAddress();

5388

+ long /*int*/ clearFuncProc = clearFunc.getAddress();

5389

if (!OS.gtk_clipboard_set_with_data(Clipboard.GTKCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, 0)) {

5390

return false;

5391

}

5392

@@ -172,8 +172,8 @@

5393

if (activePrimaryClipboard != null) OS.gtk_clipboard_clear(Clipboard.GTKPRIMARYCLIPBOARD);

5394

primaryClipboardData = data;

5395

primaryClipboardDataTypes = dataTypes;

5396

- int /*long*/ getFuncProc = getFunc.getAddress();

5397

- int /*long*/ clearFuncProc = clearFunc.getAddress();

5398

+ long /*int*/ getFuncProc = getFunc.getAddress();

5399

+ long /*int*/ clearFuncProc = clearFunc.getAddress();

5400

if (!OS.gtk_clipboard_set_with_data(Clipboard.GTKPRIMARYCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, 0)) {

5401

return false;

5402

}

5403

diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/DragSource.java

5404

--- x86/org/eclipse/swt/dnd/DragSource.java 2009-05-29 17:30:20.000000000 -0400

5405

+++ x86_64/org/eclipse/swt/dnd/DragSource.java 2009-09-17 08:48:20.000000000 -0400

5406

@@ -106,7 +106,7 @@

5407

Transfer[] transferAgents = new Transfer[0];

5408

DragSourceEffect dragEffect;

5409

5410

- int /*long*/ targetList;

5411

+ long /*int*/ targetList;

5412

5413

//workaround - remember action performed for DragEnd

5414

boolean moveData = false;

5415

@@ -207,28 +207,28 @@

5416

return style;

5417

}

5418

5419

-static int /*long*/ DragDataDelete(int /*long*/ widget, int /*long*/ context){

5420

+static long /*int*/ DragDataDelete(long /*int*/ widget, long /*int*/ context){

5421

DragSource source = FindDragSource(widget);

5422

if (source == null) return 0;

5423

source.dragDataDelete(widget, context);

5424

return 0;

5425

}

5426

5427

-static int /*long*/ DragEnd(int /*long*/ widget, int /*long*/ context){

5428

+static long /*int*/ DragEnd(long /*int*/ widget, long /*int*/ context){

5429

DragSource source = FindDragSource(widget);

5430

if (source == null) return 0;

5431

source.dragEnd(widget, context);

5432

return 0;

5433

}

5434

5435

-static int /*long*/ DragGetData(int /*long*/ widget, int /*long*/ context, int /*long*/ selection_data, int /*long*/ info, int /*long*/ time){

5436

+static long /*int*/ DragGetData(long /*int*/ widget, long /*int*/ context, long /*int*/ selection_data, long /*int*/ info, long /*int*/ time){

5437

DragSource source = FindDragSource(widget);

5438

if (source == null) return 0;

5439

source.dragGetData(widget, context, selection_data, (int)/*64*/info, (int)/*64*/time);

5440

return 0;

5441

}

5442

5443

-static DragSource FindDragSource(int /*long*/ handle) {

5444

+static DragSource FindDragSource(long /*int*/ handle) {

5445

Display display = Display.findDisplay(Thread.currentThread());

5446

if (display == null || display.isDisposed()) return null;

5447

Widget widget = display.findWidget(handle);

5448

@@ -297,15 +297,15 @@

5449

5450

int actions = opToOsOp(getStyle());

5451

Image image = event.image;

5452

- int /*long*/ context = OS.gtk_drag_begin(control.handle, targetList, actions, 1, 0);

5453

+ long /*int*/ context = OS.gtk_drag_begin(control.handle, targetList, actions, 1, 0);

5454

if (context != 0 && image != null) {

5455

- int /*long*/ pixbuf = createPixbuf(image);

5456

+ long /*int*/ pixbuf = createPixbuf(image);

5457

OS.gtk_drag_set_icon_pixbuf(context, pixbuf, 0, 0);

5458

OS.g_object_unref(pixbuf);

5459

}

5460

}

5461

5462

-void dragEnd(int /*long*/ widget, int /*long*/ context){

5463

+void dragEnd(long /*int*/ widget, long /*int*/ context){

5464

/*

5465

* Bug in GTK. If a drag is initiated using gtk_drag_begin and the

5466

* mouse is released immediately, the mouse and keyboard remain

5467

@@ -341,7 +341,7 @@

5468

moveData = false;

5469

}

5470

5471

-void dragGetData(int /*long*/ widget, int /*long*/ context, int /*long*/ selection_data, int info, int time){

5472

+void dragGetData(long /*int*/ widget, long /*int*/ context, long /*int*/ selection_data, int info, int time){

5473

if (selection_data == 0) return;

5474

GtkSelectionData gtkSelectionData = new GtkSelectionData();

5475

OS.memmove(gtkSelectionData, selection_data, GtkSelectionData.sizeof);

5476

@@ -376,7 +376,7 @@

5477

return;

5478

}

5479

5480

-void dragDataDelete(int /*long*/ widget, int /*long*/ context){

5481

+void dragDataDelete(long /*int*/ widget, long /*int*/ context){

5482

moveData = true;

5483

}

5484

5485

@@ -564,7 +564,7 @@

5486

}

5487

}

5488

5489

- int /*long*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof);

5490

+ long /*int*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof);

5491

for (int i = 0; i < targets.length; i++) {

5492

OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof);

5493

}

5494

@@ -575,29 +575,29 @@

5495

}

5496

}

5497

5498

-static int /*long*/ createPixbuf(Image image) {

5499

+static long /*int*/ createPixbuf(Image image) {

5500

int [] w = new int [1], h = new int [1];

5501

OS.gdk_drawable_get_size (image.pixmap, w, h);

5502

- int /*long*/ colormap = OS.gdk_colormap_get_system ();

5503

- int /*long*/ pixbuf;

5504

+ long /*int*/ colormap = OS.gdk_colormap_get_system ();

5505

+ long /*int*/ pixbuf;

5506

boolean hasMask = image.mask != 0 && OS.gdk_drawable_get_depth (image.mask) == 1;

5507

if (hasMask) {

5508

pixbuf = OS.gdk_pixbuf_new (OS.GDK_COLORSPACE_RGB, true, 8, w [0], h [0]);

5509

if (pixbuf == 0) SWT.error (SWT.ERROR_NO_HANDLES);

5510

OS.gdk_pixbuf_get_from_drawable (pixbuf, image.pixmap, colormap, 0, 0, 0, 0, w [0], h [0]);

5511

- int /*long*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, w [0], h [0]);

5512

+ long /*int*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, w [0], h [0]);

5513

if (maskPixbuf == 0) SWT.error (SWT.ERROR_NO_HANDLES);

5514

OS.gdk_pixbuf_get_from_drawable(maskPixbuf, image.mask, 0, 0, 0, 0, 0, w [0], h [0]);

5515

int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);

5516

- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

5517

+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

5518

byte[] line = new byte[stride];

5519

int maskStride = OS.gdk_pixbuf_get_rowstride(maskPixbuf);

5520

- int /*long*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);

5521

+ long /*int*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);

5522

byte[] maskLine = new byte[maskStride];

5523

for (int y=0; y<h[0]; y++) {

5524

- int /*long*/ offset = pixels + (y * stride);

5525

+ long /*int*/ offset = pixels + (y * stride);

5526

OS.memmove(line, offset, stride);

5527

- int /*long*/ maskOffset = maskPixels + (y * maskStride);

5528

+ long /*int*/ maskOffset = maskPixels + (y * maskStride);

5529

OS.memmove(maskLine, maskOffset, maskStride);

5530

for (int x=0; x<w[0]; x++) {

5531

if (maskLine[x * 3] == 0) {

5532

@@ -616,10 +616,10 @@

5533

if (hasAlpha) {

5534

byte [] alpha = data.alphaData;

5535

int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);

5536

- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels (pixbuf);

5537

+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels (pixbuf);

5538

byte [] line = new byte [stride];

5539

for (int y = 0; y < h [0]; y++) {

5540

- int /*long*/ offset = pixels + (y * stride);

5541

+ long /*int*/ offset = pixels + (y * stride);

5542

OS.memmove (line, offset, stride);

5543

for (int x = 0; x < w [0]; x++) {

5544

line [x*4+3] = alpha [y*w [0]+x];

5545

diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/DropTarget.java

5546

--- x86/org/eclipse/swt/dnd/DropTarget.java 2009-05-29 17:30:20.000000000 -0400

5547

+++ x86_64/org/eclipse/swt/dnd/DropTarget.java 2009-09-17 08:48:20.000000000 -0400

5548

@@ -245,33 +245,33 @@

5549

return style;

5550

}

5551

5552

-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){

5553

+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){

5554

DropTarget target = FindDropTarget(widget);

5555

if (target == null) return 0;

5556

target.drag_data_received (widget, context, (int)/*64*/x, (int)/*64*/y, data, (int)/*64*/info, (int)/*64*/time);

5557

return 0;

5558

}

5559

5560

-static int /*long*/ Drag_Drop(int /*long*/ widget, int /*long*/ context, int /*long*/ x, int /*long*/ y, int /*long*/ time) {

5561

+static long /*int*/ Drag_Drop(long /*int*/ widget, long /*int*/ context, long /*int*/ x, long /*int*/ y, long /*int*/ time) {

5562

DropTarget target = FindDropTarget(widget);

5563

if (target == null) return 0;

5564

return target.drag_drop (widget, context, (int)/*64*/x, (int)/*64*/y, (int)/*64*/time) ? 1 : 0;

5565

}

5566

5567

-static int /*long*/ Drag_Leave ( int /*long*/ widget, int /*long*/ context, int /*long*/ time){

5568

+static long /*int*/ Drag_Leave ( long /*int*/ widget, long /*int*/ context, long /*int*/ time){

5569

DropTarget target = FindDropTarget(widget);

5570

if (target == null) return 0;

5571

target.drag_leave (widget, context, (int)/*64*/time);

5572

return 0;

5573

}

5574

5575

-static int /*long*/ Drag_Motion ( int /*long*/ widget, int /*long*/ context, int /*long*/ x, int /*long*/ y, int /*long*/ time){

5576

+static long /*int*/ Drag_Motion ( long /*int*/ widget, long /*int*/ context, long /*int*/ x, long /*int*/ y, long /*int*/ time){

5577

DropTarget target = FindDropTarget(widget);

5578

if (target == null) return 0;

5579

return target.drag_motion (widget, context, (int)/*64*/x, (int)/*64*/y, (int)/*64*/time) ? 1 : 0;

5580

}

5581

5582

-static DropTarget FindDropTarget(int /*long*/ handle) {

5583

+static DropTarget FindDropTarget(long /*int*/ handle) {

5584

Display display = Display.findDisplay(Thread.currentThread());

5585

if (display == null || display.isDisposed()) return null;

5586

Widget widget = display.findWidget(handle);

5587

@@ -332,7 +332,7 @@

5588

}

5589

}

5590

5591

-void drag_data_received ( int /*long*/ widget, int /*long*/ context, int x, int y, int /*long*/ data, int info, int time){

5592

+void drag_data_received ( long /*int*/ widget, long /*int*/ context, int x, int y, long /*int*/ data, int info, int time){

5593

DNDEvent event = new DNDEvent();

5594

if (data == 0 || !setEventData(context, x, y, time, event)) {

5595

keyOperation = -1;

5596

@@ -380,7 +380,7 @@

5597

return;

5598

}

5599

5600

-boolean drag_drop(int /*long*/ widget, int /*long*/ context, int x, int y, int time) {

5601

+boolean drag_drop(long /*int*/ widget, long /*int*/ context, int x, int y, int time) {

5602

DNDEvent event = new DNDEvent();

5603

if (!setEventData(context, x, y, time, event)) {

5604

keyOperation = -1;

5605

@@ -417,7 +417,7 @@

5606

return true;

5607

}

5608

5609

-void drag_leave ( int /*long*/ widget, int /*long*/ context, int time){

5610

+void drag_leave ( long /*int*/ widget, long /*int*/ context, int time){

5611

updateDragOverHover(0, null);

5612

5613

if (keyOperation == -1) return;

5614

@@ -430,7 +430,7 @@

5615

notifyListeners(DND.DragLeave, event);

5616

}

5617

5618

-boolean drag_motion ( int /*long*/ widget, int /*long*/ context, int x, int y, int time){

5619

+boolean drag_motion ( long /*int*/ widget, long /*int*/ context, int x, int y, int time){

5620

int oldKeyOperation = keyOperation;

5621

5622

/*

5623

@@ -694,7 +694,7 @@

5624

}

5625

}

5626

5627

- int /*long*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof);

5628

+ long /*int*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof);

5629

for (int i = 0; i < targets.length; i++) {

5630

OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof);

5631

}

5632

@@ -702,7 +702,7 @@

5633

int actions = opToOsOp(getStyle());

5634

if (control instanceof Combo) {

5635

if ((control.getStyle() & SWT.READ_ONLY) == 0) {

5636

- int /*long*/ entryHandle = OS.gtk_bin_get_child (control.handle);

5637

+ long /*int*/ entryHandle = OS.gtk_bin_get_child (control.handle);

5638

if (entryHandle != 0) {

5639

OS.gtk_drag_dest_unset(entryHandle);

5640

}

5641

@@ -728,7 +728,7 @@

5642

dropEffect = effect;

5643

}

5644

5645

-boolean setEventData(int /*long*/ context, int x, int y, int time, DNDEvent event) {

5646

+boolean setEventData(long /*int*/ context, int x, int y, int time, DNDEvent event) {

5647

if (context == 0) return false;

5648

GdkDragContext dragContext = new GdkDragContext();

5649

OS.memmove(dragContext, context, GdkDragContext.sizeof);

5650

@@ -754,7 +754,7 @@

5651

int length = OS.g_list_length(dragContext.targets);

5652

TransferData[] dataTypes = new TransferData[0];

5653

for (int i = 0; i < length; i++) {

5654

- int /*long*/ pData = OS.g_list_nth(dragContext.targets, i);

5655

+ long /*int*/ pData = OS.g_list_nth(dragContext.targets, i);

5656

GtkTargetPair gtkTargetPair = new GtkTargetPair();

5657

OS.memmove(gtkTargetPair, pData, GtkTargetPair.sizeof);

5658

TransferData data = new TransferData();

5659

@@ -772,7 +772,7 @@

5660

}

5661

if (dataTypes.length == 0) return false;

5662

5663

- int /*long*/ window = OS.GTK_WIDGET_WINDOW(control.handle);

5664

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW(control.handle);

5665

int [] origin_x = new int[1], origin_y = new int[1];

5666

OS.gdk_window_get_origin(window, origin_x, origin_y);

5667

Point coordinates = new Point(origin_x[0] + x, origin_y[0] + y);

5668

diff -urN x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/FileTransfer.java

5669

--- x86/org/eclipse/swt/dnd/FileTransfer.java 2009-05-29 17:30:22.000000000 -0400

5670

+++ x86_64/org/eclipse/swt/dnd/FileTransfer.java 2009-09-17 08:48:20.000000000 -0400

5671

@@ -85,13 +85,13 @@

5672

if (length == 0) continue;

5673

char[] chars = new char[length];

5674

string.getChars(0, length, chars, 0);

5675

- int /*long*/[] error = new int /*long*/[1];

5676

- int /*long*/ utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error);

5677

+ long /*int*/[] error = new long /*int*/[1];

5678

+ long /*int*/ utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error);

5679

if (error[0] != 0 || utf8Ptr == 0) continue;

5680

- int /*long*/ localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error);

5681

+ long /*int*/ localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error);

5682

OS.g_free(utf8Ptr);

5683

if (error[0] != 0 || localePtr == 0) continue;

5684

- int /*long*/ uriPtr = OS.g_filename_to_uri(localePtr, 0, error);

5685

+ long /*int*/ uriPtr = OS.g_filename_to_uri(localePtr, 0, error);

5686

OS.g_free(localePtr);

5687

if (error[0] != 0 || uriPtr == 0) continue;

5688

length = OS.strlen(uriPtr);

5689

@@ -111,7 +111,7 @@

5690

buffer = newBuffer;

5691

}

5692

if (buffer.length == 0) return;

5693

- int /*long*/ ptr = OS.g_malloc(buffer.length+1);

5694

+ long /*int*/ ptr = OS.g_malloc(buffer.length+1);

5695

OS.memset(ptr, '\0', buffer.length+1);

5696

OS.memmove(ptr, buffer, buffer.length);

5697

transferData.pValue = ptr;

5698

@@ -137,7 +137,7 @@

5699

OS.memmove(temp, transferData.pValue, length);

5700

boolean gnomeList = transferData.type == GNOME_LIST_ID;

5701

int sepLength = gnomeList ? 1 : 2;

5702

- int /*long*/[] files = new int /*long*/[0];

5703

+ long /*int*/[] files = new long /*int*/[0];

5704

int offset = 0;

5705

for (int i = 0; i < temp.length - 1; i++) {

5706

boolean terminator = gnomeList ? temp[i] == '\n' : temp[i] == '\r' && temp[i+1] == '\n';

5707

@@ -145,11 +145,11 @@

5708

if (!(gnomeList && offset == 0)) {

5709

/* The content of the first line in a gnome-list is always either 'copy' or 'cut' */

5710

int size = i - offset;

5711

- int /*long*/ file = OS.g_malloc(size + 1);

5712

+ long /*int*/ file = OS.g_malloc(size + 1);

5713

byte[] fileBuffer = new byte[size + 1];

5714

System.arraycopy(temp, offset, fileBuffer, 0, size);

5715

OS.memmove(file, fileBuffer, size + 1);

5716

- int /*long*/[] newFiles = new int /*long*/[files.length + 1];

5717

+ long /*int*/[] newFiles = new long /*int*/[files.length + 1];

5718

System.arraycopy(files, 0, newFiles, 0, files.length);

5719

newFiles[files.length] = file;

5720

files = newFiles;

5721

@@ -159,26 +159,26 @@

5722

}

5723

if (offset < temp.length - sepLength) {

5724

int size = temp.length - offset;

5725

- int /*long*/ file = OS.g_malloc(size + 1);

5726

+ long /*int*/ file = OS.g_malloc(size + 1);

5727

byte[] fileBuffer = new byte[size + 1];

5728

System.arraycopy(temp, offset, fileBuffer, 0, size);

5729

OS.memmove(file, fileBuffer, size + 1);

5730

- int /*long*/[] newFiles = new int /*long*/[files.length + 1];

5731

+ long /*int*/[] newFiles = new long /*int*/[files.length + 1];

5732

System.arraycopy(files, 0, newFiles, 0, files.length);

5733

newFiles[files.length] = file;

5734

files = newFiles;

5735

}

5736

String[] fileNames = new String[0];

5737

for (int i = 0; i < files.length; i++) {

5738

- int /*long*/[] error = new int /*long*/[1];

5739

- int /*long*/ localePtr = OS.g_filename_from_uri(files[i], null, error);

5740

+ long /*int*/[] error = new long /*int*/[1];

5741

+ long /*int*/ localePtr = OS.g_filename_from_uri(files[i], null, error);

5742

OS.g_free(files[i]);

5743

if (error[0] != 0 || localePtr == 0) continue;

5744

- int /*long*/ utf8Ptr = OS.g_filename_to_utf8(localePtr, -1, null, null, error);

5745

+ long /*int*/ utf8Ptr = OS.g_filename_to_utf8(localePtr, -1, null, null, error);

5746

OS.g_free(localePtr);

5747

if (error[0] != 0 || utf8Ptr == 0) continue;

5748

- int /*long*/[] items_written = new int /*long*/[1];

5749

- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16(utf8Ptr, -1, null, items_written, null);

5750

+ long /*int*/[] items_written = new long /*int*/[1];

5751

+ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16(utf8Ptr, -1, null, items_written, null);

5752

OS.g_free(utf8Ptr);

5753

length = (int)/*64*/items_written[0];

5754

char[] buffer = new char[length];

5755

diff -urN x86/org/eclipse/swt/dnd/HTMLTransfer.java x86_64/org/eclipse/swt/dnd/HTMLTransfer.java

5756

--- x86/org/eclipse/swt/dnd/HTMLTransfer.java 2008-06-05 13:31:50.000000000 -0400

5757

+++ x86_64/org/eclipse/swt/dnd/HTMLTransfer.java 2009-09-17 08:48:20.000000000 -0400

5758

@@ -65,7 +65,7 @@

5759

char [] chars = new char[charCount +1];

5760

string.getChars(0, charCount , chars, 0);

5761

int byteCount = chars.length*2;

5762

- int /*long*/ pValue = OS.g_malloc(byteCount);

5763

+ long /*int*/ pValue = OS.g_malloc(byteCount);

5764

if (pValue == 0) return;

5765

OS.memmove(pValue, chars, byteCount);

5766

transferData.length = byteCount;

5767

diff -urN x86/org/eclipse/swt/dnd/ImageTransfer.java x86_64/org/eclipse/swt/dnd/ImageTransfer.java

5768

--- x86/org/eclipse/swt/dnd/ImageTransfer.java 2009-05-29 17:30:20.000000000 -0400

5769

+++ x86_64/org/eclipse/swt/dnd/ImageTransfer.java 2009-09-17 08:48:20.000000000 -0400

5770

@@ -89,12 +89,12 @@

5771

ImageData imgData = (ImageData)object;

5772

if (imgData == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

5773

Image image = new Image(Display.getCurrent(), imgData);

5774

- int /*long*/ pixmap = image.pixmap;

5775

+ long /*int*/ pixmap = image.pixmap;

5776

int width = imgData.width;

5777

int height = imgData.height;

5778

- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height);

5779

+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height);

5780

if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES);

5781

- int /*long*/ colormap = OS.gdk_colormap_get_system();

5782

+ long /*int*/ colormap = OS.gdk_colormap_get_system();

5783

OS.gdk_pixbuf_get_from_drawable(pixbuf, pixmap, colormap, 0, 0, 0, 0, width, height);

5784

5785

String typeStr = "";

5786

@@ -110,8 +110,8 @@

5787

if (transferData.type == XPM_ID) typeStr = "xpm";

5788

if (transferData.type == XV_ID) typeStr = "xv";

5789

byte[] type = Converter.wcsToMbcs(null, typeStr , true);

5790

- int /*long*/ [] buffer = new int /*long*/ [1];

5791

- int /*long*/ [] len = new int /*long*/ [1];

5792

+ long /*int*/ [] buffer = new long /*int*/ [1];

5793

+ long /*int*/ [] len = new long /*int*/ [1];

5794

if (type == null) return;

5795

OS.gdk_pixbuf_save_to_bufferv(pixbuf, buffer, len, type, null, null, null);

5796

OS.g_object_unref(pixbuf);

5797

@@ -136,15 +136,15 @@

5798

ImageData imgData = null;

5799

if (transferData.length > 0)

5800

{

5801

- int /*long*/ loader = OS.gdk_pixbuf_loader_new();

5802

+ long /*int*/ loader = OS.gdk_pixbuf_loader_new();

5803

OS.gdk_pixbuf_loader_write(loader, transferData.pValue, transferData.length, null);

5804

OS.gdk_pixbuf_loader_close(loader, null);

5805

- int /*long*/ pixbuf = OS.gdk_pixbuf_loader_get_pixbuf(loader);

5806

+ long /*int*/ pixbuf = OS.gdk_pixbuf_loader_get_pixbuf(loader);

5807

if (pixbuf != 0) {

5808

OS.g_object_ref(pixbuf);

5809

- int /*long*/ [] pixmap_return = new int /*long*/ [1];

5810

+ long /*int*/ [] pixmap_return = new long /*int*/ [1];

5811

OS.gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, null, 0);

5812

- int /*long*/ handle = pixmap_return[0];

5813

+ long /*int*/ handle = pixmap_return[0];

5814

if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);

5815

OS.g_object_unref(loader);

5816

Image img = Image.gtk_new(Display.getCurrent(), SWT.BITMAP, handle, 0);

5817

diff -urN x86/org/eclipse/swt/dnd/RTFTransfer.java x86_64/org/eclipse/swt/dnd/RTFTransfer.java

5818

--- x86/org/eclipse/swt/dnd/RTFTransfer.java 2008-06-05 13:31:48.000000000 -0400

5819

+++ x86_64/org/eclipse/swt/dnd/RTFTransfer.java 2009-09-17 08:48:20.000000000 -0400

5820

@@ -65,7 +65,7 @@

5821

}

5822

String string = (String)object;

5823

byte [] buffer = Converter.wcsToMbcs (null, string, true);

5824

- int /*long*/ pValue = OS.g_malloc(buffer.length);

5825

+ long /*int*/ pValue = OS.g_malloc(buffer.length);

5826

if (pValue == 0) return;

5827

OS.memmove(pValue, buffer, buffer.length);

5828

transferData.length = buffer.length - 1;

5829

diff -urN x86/org/eclipse/swt/dnd/TableDragSourceEffect.java x86_64/org/eclipse/swt/dnd/TableDragSourceEffect.java

5830

--- x86/org/eclipse/swt/dnd/TableDragSourceEffect.java 2008-06-05 13:31:50.000000000 -0400

5831

+++ x86_64/org/eclipse/swt/dnd/TableDragSourceEffect.java 2009-09-17 08:48:20.000000000 -0400

5832

@@ -88,26 +88,26 @@

5833

* in versions smaller than 2.2.4 if the model is NULL. The fix is

5834

* to give a valid pointer instead.

5835

*/

5836

- int /*long*/ handle = table.handle;

5837

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

5838

- int /*long*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new int /*long*/ [1] : null;

5839

- int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

5840

+ long /*int*/ handle = table.handle;

5841

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

5842

+ long /*int*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new long /*int*/ [1] : null;

5843

+ long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

5844

if (list == 0) return null;

5845

int count = Math.min(10, OS.g_list_length (list));

5846

5847

Display display = table.getDisplay();

5848

if (count == 1) {

5849

- int /*long*/ path = OS.g_list_nth_data (list, 0);

5850

- int /*long*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path);

5851

+ long /*int*/ path = OS.g_list_nth_data (list, 0);

5852

+ long /*int*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path);

5853

dragSourceImage = Image.gtk_new(display, SWT.ICON, pixmap, 0);

5854

} else {

5855

int width = 0, height = 0;

5856

int[] w = new int[1], h = new int[1];

5857

int[] yy = new int[count], hh = new int[count];

5858

- int /*long*/ [] pixmaps = new int /*long*/ [count];

5859

+ long /*int*/ [] pixmaps = new long /*int*/ [count];

5860

GdkRectangle rect = new GdkRectangle ();

5861

for (int i=0; i<count; i++) {

5862

- int /*long*/ path = OS.g_list_nth_data (list, i);

5863

+ long /*int*/ path = OS.g_list_nth_data (list, i);

5864

OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);

5865

pixmaps[i] = OS.gtk_tree_view_create_row_drag_icon(handle, path);

5866

OS.gdk_drawable_get_size(pixmaps[i], w, h);

5867

@@ -116,10 +116,10 @@

5868

yy[i] = rect.y;

5869

hh[i] = h[0];

5870

}

5871

- int /*long*/ source = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), width, height, -1);

5872

- int /*long*/ gcSource = OS.gdk_gc_new(source);

5873

- int /*long*/ mask = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), width, height, 1);

5874

- int /*long*/ gcMask = OS.gdk_gc_new(mask);

5875

+ long /*int*/ source = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), width, height, -1);

5876

+ long /*int*/ gcSource = OS.gdk_gc_new(source);

5877

+ long /*int*/ mask = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), width, height, 1);

5878

+ long /*int*/ gcMask = OS.gdk_gc_new(mask);

5879

GdkColor color = new GdkColor();

5880

color.pixel = 0;

5881

OS.gdk_gc_set_foreground(gcMask, color);

5882

diff -urN x86/org/eclipse/swt/dnd/TableDropTargetEffect.java x86_64/org/eclipse/swt/dnd/TableDropTargetEffect.java

5883

--- x86/org/eclipse/swt/dnd/TableDropTargetEffect.java 2008-06-05 13:31:48.000000000 -0400

5884

+++ x86_64/org/eclipse/swt/dnd/TableDropTargetEffect.java 2009-09-17 08:48:20.000000000 -0400

5885

@@ -102,7 +102,7 @@

5886

*/

5887

public void dragLeave(DropTargetEvent event) {

5888

Table table = (Table) control;

5889

- int /*long*/ handle = table.handle;

5890

+ long /*int*/ handle = table.handle;

5891

OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);

5892

5893

scrollBeginTime = 0;

5894

@@ -128,15 +128,15 @@

5895

*/

5896

public void dragOver(DropTargetEvent event) {

5897

Table table = (Table) control;

5898

- int /*long*/ handle = table.handle;

5899

+ long /*int*/ handle = table.handle;

5900

int effect = checkEffect(event.feedback);

5901

Point coordinates = new Point(event.x, event.y);

5902

coordinates = table.toControl(coordinates);

5903

- int /*long*/ [] path = new int /*long*/ [1];

5904

+ long /*int*/ [] path = new long /*int*/ [1];

5905

OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);

5906

int index = -1;

5907

if (path[0] != 0) {

5908

- int /*long*/ indices = OS.gtk_tree_path_get_indices (path[0]);

5909

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path[0]);

5910

if (indices != 0) {

5911

int[] temp = new int[1];

5912

OS.memmove (temp, indices, 4);

5913

diff -urN x86/org/eclipse/swt/dnd/TextTransfer.java x86_64/org/eclipse/swt/dnd/TextTransfer.java

5914

--- x86/org/eclipse/swt/dnd/TextTransfer.java 2008-06-05 13:31:50.000000000 -0400

5915

+++ x86_64/org/eclipse/swt/dnd/TextTransfer.java 2009-09-17 08:48:20.000000000 -0400

5916

@@ -66,9 +66,9 @@

5917

String string = (String)object;

5918

byte[] utf8 = Converter.wcsToMbcs (null, string, true);

5919

if (transferData.type == COMPOUND_TEXT_ID) {

5920

- int /*long*/[] encoding = new int /*long*/[1];

5921

+ long /*int*/[] encoding = new long /*int*/[1];

5922

int[] format = new int[1];

5923

- int /*long*/[] ctext = new int /*long*/[1];

5924

+ long /*int*/[] ctext = new long /*int*/[1];

5925

int[] length = new int[1];

5926

boolean result = OS.gdk_utf8_to_compound_text(utf8, encoding, format, ctext, length);

5927

if (!result) return;

5928

@@ -79,7 +79,7 @@

5929

transferData.result = 1;

5930

}

5931

if (transferData.type == UTF8_STRING_ID) {

5932

- int /*long*/ pValue = OS.g_malloc(utf8.length);

5933

+ long /*int*/ pValue = OS.g_malloc(utf8.length);

5934

if (pValue == 0) return;

5935

OS.memmove(pValue, utf8, utf8.length);

5936

transferData.type = UTF8_STRING_ID;

5937

@@ -89,7 +89,7 @@

5938

transferData.result = 1;

5939

}

5940

if (transferData.type == STRING_ID) {

5941

- int /*long*/ string_target = OS.gdk_utf8_to_string_target(utf8);

5942

+ long /*int*/ string_target = OS.gdk_utf8_to_string_target(utf8);

5943

if (string_target == 0) return;

5944

transferData.type = STRING_ID;

5945

transferData.format = 8;

5946

@@ -110,10 +110,10 @@

5947

*/

5948

public Object nativeToJava(TransferData transferData){

5949

if (!isSupportedType(transferData) || transferData.pValue == 0) return null;

5950

- int /*long*/[] list = new int /*long*/[1];

5951

+ long /*int*/[] list = new long /*int*/[1];

5952

int count = OS.gdk_text_property_to_utf8_list(transferData.type, transferData.format, transferData.pValue, transferData.length, list);

5953

if (count == 0) return null;

5954

- int /*long*/[] ptr = new int /*long*/[1];

5955

+ long /*int*/[] ptr = new long /*int*/[1];

5956

OS.memmove(ptr, list[0], OS.PTR_SIZEOF);

5957

int length = OS.strlen(ptr[0]);

5958

byte[] utf8 = new byte[length];

5959

diff -urN x86/org/eclipse/swt/dnd/TransferData.java x86_64/org/eclipse/swt/dnd/TransferData.java

5960

--- x86/org/eclipse/swt/dnd/TransferData.java 2008-06-05 13:31:48.000000000 -0400

5961

+++ x86_64/org/eclipse/swt/dnd/TransferData.java 2009-09-17 08:48:20.000000000 -0400

5962

@@ -38,7 +38,7 @@

5963

* platforms and should never be accessed from application code.

5964

*

5965

*/

5966

- public int /*long*/ type;

5967

+ public long /*int*/ type;

5968

5969

/**

5970

* Specifies the number of units in pValue.

5971

@@ -78,7 +78,7 @@

5972

* platforms and should never be accessed from application code.

5973

*

5974

*/

5975

- public int /*long*/ pValue;

5976

+ public long /*int*/ pValue;

5977

5978

/**

5979

* The result field contains the result of converting a

5980

diff -urN x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java x86_64/org/eclipse/swt/dnd/TreeDragSourceEffect.java

5981

--- x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java 2008-06-05 13:31:48.000000000 -0400

5982

+++ x86_64/org/eclipse/swt/dnd/TreeDragSourceEffect.java 2009-09-17 08:48:20.000000000 -0400

5983

@@ -87,26 +87,26 @@

5984

* in versions smaller than 2.2.4 if the model is NULL. The fix is

5985

* to give a valid pointer instead.

5986

*/

5987

- int /*long*/ handle = tree.handle;

5988

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

5989

- int /*long*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new int /*long*/ [1] : null;

5990

- int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

5991

+ long /*int*/ handle = tree.handle;

5992

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

5993

+ long /*int*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new long /*int*/ [1] : null;

5994

+ long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

5995

if (list == 0) return null;

5996

int count = Math.min(10, OS.g_list_length (list));

5997

5998

Display display = tree.getDisplay();

5999

if (count == 1) {

6000

- int /*long*/ path = OS.g_list_nth_data (list, 0);

6001

- int /*long*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path);

6002

+ long /*int*/ path = OS.g_list_nth_data (list, 0);

6003

+ long /*int*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path);

6004

dragSourceImage = Image.gtk_new(display, SWT.ICON, pixmap, 0);

6005

} else {

6006

int width = 0, height = 0;

6007

int[] w = new int[1], h = new int[1];

6008

int[] yy = new int[count], hh = new int[count];

6009

- int /*long*/ [] pixmaps = new int /*long*/ [count];

6010

+ long /*int*/ [] pixmaps = new long /*int*/ [count];

6011

GdkRectangle rect = new GdkRectangle ();

6012

for (int i=0; i<count; i++) {

6013

- int /*long*/ path = OS.g_list_nth_data (list, i);

6014

+ long /*int*/ path = OS.g_list_nth_data (list, i);

6015

OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);

6016

pixmaps[i] = OS.gtk_tree_view_create_row_drag_icon(handle, path);

6017

OS.gdk_drawable_get_size(pixmaps[i], w, h);

6018

@@ -115,10 +115,10 @@

6019

yy[i] = rect.y;

6020

hh[i] = h[0];

6021

}

6022

- int /*long*/ source = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), width, height, -1);

6023

- int /*long*/ gcSource = OS.gdk_gc_new(source);

6024

- int /*long*/ mask = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), width, height, 1);

6025

- int /*long*/ gcMask = OS.gdk_gc_new(mask);

6026

+ long /*int*/ source = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), width, height, -1);

6027

+ long /*int*/ gcSource = OS.gdk_gc_new(source);

6028

+ long /*int*/ mask = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), width, height, 1);

6029

+ long /*int*/ gcMask = OS.gdk_gc_new(mask);

6030

GdkColor color = new GdkColor();

6031

color.pixel = 0;

6032

OS.gdk_gc_set_foreground(gcMask, color);

6033

diff -urN x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java x86_64/org/eclipse/swt/dnd/TreeDropTargetEffect.java

6034

--- x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java 2008-06-05 13:31:48.000000000 -0400

6035

+++ x86_64/org/eclipse/swt/dnd/TreeDropTargetEffect.java 2009-09-17 08:48:20.000000000 -0400

6036

@@ -111,7 +111,7 @@

6037

*/

6038

public void dragLeave(DropTargetEvent event) {

6039

Tree tree = (Tree) control;

6040

- int /*long*/ handle = tree.handle;

6041

+ long /*int*/ handle = tree.handle;

6042

OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);

6043

6044

scrollBeginTime = 0;

6045

@@ -142,14 +142,14 @@

6046

Tree tree = (Tree) control;

6047

int effect = checkEffect(event.feedback);

6048

6049

- int /*long*/ handle = tree.handle;

6050

+ long /*int*/ handle = tree.handle;

6051

Point coordinates = new Point(event.x, event.y);

6052

coordinates = tree.toControl(coordinates);

6053

- int /*long*/ [] path = new int /*long*/ [1];

6054

+ long /*int*/ [] path = new long /*int*/ [1];

6055

OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);

6056

int index = -1;

6057

if (path[0] != 0) {

6058

- int /*long*/ indices = OS.gtk_tree_path_get_indices(path[0]);

6059

+ long /*int*/ indices = OS.gtk_tree_path_get_indices(path[0]);

6060

if (indices != 0) {

6061

int depth = OS.gtk_tree_path_get_depth(path[0]);

6062

int[] temp = new int[depth];

6063

diff -urN x86/org/eclipse/swt/dnd/URLTransfer.java x86_64/org/eclipse/swt/dnd/URLTransfer.java

6064

--- x86/org/eclipse/swt/dnd/URLTransfer.java 2009-05-29 17:30:22.000000000 -0400

6065

+++ x86_64/org/eclipse/swt/dnd/URLTransfer.java 2009-09-17 08:48:20.000000000 -0400

6066

@@ -66,7 +66,7 @@

6067

char [] chars = new char[charCount +1];

6068

string.getChars(0, charCount , chars, 0);

6069

int byteCount = chars.length*2;

6070

- int /*long*/ pValue = OS.g_malloc(byteCount);

6071

+ long /*int*/ pValue = OS.g_malloc(byteCount);

6072

if (pValue == 0) return;

6073

OS.memmove(pValue, chars, byteCount);

6074

transferData.length = byteCount;

6075

diff -urN x86/org/eclipse/swt/graphics/Color.java x86_64/org/eclipse/swt/graphics/Color.java

6076

--- x86/org/eclipse/swt/graphics/Color.java 2008-06-05 13:32:00.000000000 -0400

6077

+++ x86_64/org/eclipse/swt/graphics/Color.java 2009-09-17 08:48:24.000000000 -0400

6078

@@ -115,7 +115,7 @@

6079

device.gdkColors[pixel] = null;

6080

}

6081

}

6082

- int /*long*/ colormap = OS.gdk_colormap_get_system();

6083

+ long /*int*/ colormap = OS.gdk_colormap_get_system();

6084

OS.gdk_colormap_free_colors(colormap, handle, 1);

6085

handle = null;

6086

}

6087

@@ -242,7 +242,7 @@

6088

gdkColor.red = (short)((red & 0xFF) | ((red & 0xFF) << 8));

6089

gdkColor.green = (short)((green & 0xFF) | ((green & 0xFF) << 8));

6090

gdkColor.blue = (short)((blue & 0xFF) | ((blue & 0xFF) << 8));

6091

- int /*long*/ colormap = OS.gdk_colormap_get_system();

6092

+ long /*int*/ colormap = OS.gdk_colormap_get_system();

6093

if (!OS.gdk_colormap_alloc_color(colormap, gdkColor, true, true)) {

6094

/* Allocate black. */

6095

gdkColor = new GdkColor();

6096

diff -urN x86/org/eclipse/swt/graphics/Cursor.java x86_64/org/eclipse/swt/graphics/Cursor.java

6097

--- x86/org/eclipse/swt/graphics/Cursor.java 2008-06-05 13:32:00.000000000 -0400

6098

+++ x86_64/org/eclipse/swt/graphics/Cursor.java 2009-09-17 08:48:24.000000000 -0400

6099

@@ -52,7 +52,7 @@

6100

* platforms and should never be accessed from application code.

6101

*

6102

*/

6103

- public int /*long*/ handle;

6104

+ public long /*int*/ handle;

6105

6106

static final byte[] APPSTARTING_SRC = {

6107

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,

6108

@@ -284,15 +284,15 @@

6109

hotspotY >= source.height || hotspotY < 0) {

6110

SWT.error(SWT.ERROR_INVALID_ARGUMENT);

6111

}

6112

- int /*long*/ display = 0;

6113

+ long /*int*/ display = 0;

6114

if (OS.GTK_VERSION >= OS.VERSION(2, 4, 0) && OS.gdk_display_supports_cursor_color(display = OS.gdk_display_get_default ())) {

6115

int width = source.width;

6116

int height = source.height;

6117

PaletteData palette = source.palette;

6118

- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height);

6119

+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height);

6120

if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6121

int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);

6122

- int /*long*/ data = OS.gdk_pixbuf_get_pixels(pixbuf);

6123

+ long /*int*/ data = OS.gdk_pixbuf_get_pixels(pixbuf);

6124

byte[] buffer = source.data;

6125

if (!palette.isDirect || source.depth != 24 || stride != source.bytesPerLine || palette.redMask != 0xFF000000 || palette.greenMask != 0xFF0000 || palette.blueMask != 0xFF00) {

6126

buffer = new byte[source.width * source.height * 4];

6127

@@ -426,10 +426,10 @@

6128

init();

6129

}

6130

6131

-int /*long*/ createCursor(byte[] sourceData, byte[] maskData, int width, int height, int hotspotX, int hotspotY, boolean reverse) {

6132

- int /*long*/ sourcePixmap = OS.gdk_bitmap_create_from_data(0, sourceData, width, height);

6133

- int /*long*/ maskPixmap = OS.gdk_bitmap_create_from_data(0, maskData, width, height);

6134

- int /*long*/ cursor = 0;

6135

+long /*int*/ createCursor(byte[] sourceData, byte[] maskData, int width, int height, int hotspotX, int hotspotY, boolean reverse) {

6136

+ long /*int*/ sourcePixmap = OS.gdk_bitmap_create_from_data(0, sourceData, width, height);

6137

+ long /*int*/ maskPixmap = OS.gdk_bitmap_create_from_data(0, maskData, width, height);

6138

+ long /*int*/ cursor = 0;

6139

if (sourcePixmap != 0 && maskPixmap != 0) {

6140

GdkColor foreground = new GdkColor();

6141

if (!reverse) foreground.red = foreground.green = foreground.blue = (short)0xFFFF;

6142

@@ -479,7 +479,7 @@

6143

*

6144

* @private

6145

*/

6146

-public static Cursor gtk_new(Device device, int /*long*/ handle) {

6147

+public static Cursor gtk_new(Device device, long /*int*/ handle) {

6148

Cursor cursor = new Cursor(device);

6149

cursor.handle = handle;

6150

return cursor;

6151

diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphics/Device.java

6152

--- x86/org/eclipse/swt/graphics/Device.java 2009-05-29 17:30:26.000000000 -0400

6153

+++ x86_64/org/eclipse/swt/graphics/Device.java 2009-09-17 08:48:24.000000000 -0400

6154

@@ -34,8 +34,8 @@

6155

* platforms and should never be accessed from application code.

6156

*

6157

*/

6158

- protected int /*long*/ xDisplay;

6159

- int /*long*/ shellHandle;

6160

+ protected long /*int*/ xDisplay;

6161

+ long /*int*/ shellHandle;

6162

6163

/* Debugging */

6164

public static boolean DEBUG;

6165

@@ -53,7 +53,7 @@

6166

boolean disposed;

6167

6168

/* Warning and Error Handlers */

6169

- int /*long*/ logProc;

6170

+ long /*int*/ logProc;

6171

Callback logCallback;

6172

//NOT DONE - get list of valid names

6173

String [] log_domains = {"GLib-GObject", "GLib", "GObject", "Pango", "ATK", "GdkPixbuf", "Gdk", "Gtk", "GnomeVFS"};

6174

@@ -62,7 +62,7 @@

6175

6176

/* X Warning and Error Handlers */

6177

static Callback XErrorCallback, XIOErrorCallback;

6178

- static int /*long*/ XErrorProc, XIOErrorProc, XNullErrorProc, XNullIOErrorProc;

6179

+ static long /*int*/ XErrorProc, XIOErrorProc, XNullErrorProc, XNullIOErrorProc;

6180

static Device[] Devices = new Device[4];

6181

6182

/*

6183

@@ -77,7 +77,7 @@

6184

/* System Font */

6185

Font systemFont;

6186

6187

- int /*long*/ emptyTab;

6188

+ long /*int*/ emptyTab;

6189

6190

boolean useXRender;

6191

6192

@@ -160,7 +160,7 @@

6193

try {

6194

/* Check if cairo is available on the system */

6195

byte[] buffer = Converter.wcsToMbcs(null, "libcairo.so.2", true);

6196

- int /*long*/ libcairo = OS.dlopen(buffer, OS.RTLD_LAZY);

6197

+ long /*int*/ libcairo = OS.dlopen(buffer, OS.RTLD_LAZY);

6198

if (libcairo != 0) {

6199

OS.dlclose(libcairo);

6200

} else {

6201

@@ -259,7 +259,7 @@

6202

}

6203

}

6204

6205

-static synchronized Device findDevice (int /*long*/ xDisplay) {

6206

+static synchronized Device findDevice (long /*int*/ xDisplay) {

6207

for (int i=0; i<Devices.length; i++) {

6208

Device device = Devices [i];

6209

if (device != null && device.xDisplay == xDisplay) {

6210

@@ -414,13 +414,13 @@

6211

public FontData[] getFontList (String faceName, boolean scalable) {

6212

checkDevice ();

6213

if (!scalable) return new FontData[0];

6214

- int /*long*/[] family = new int /*long*/[1];

6215

- int /*long*/[] face = new int /*long*/[1];

6216

- int /*long*/[] families = new int /*long*/[1];

6217

+ long /*int*/[] family = new long /*int*/[1];

6218

+ long /*int*/[] face = new long /*int*/[1];

6219

+ long /*int*/[] families = new long /*int*/[1];

6220

int[] n_families = new int[1];

6221

- int /*long*/[] faces = new int /*long*/[1];

6222

+ long /*int*/[] faces = new long /*int*/[1];

6223

int[] n_faces = new int[1];

6224

- int /*long*/ context = OS.gdk_pango_context_get();

6225

+ long /*int*/ context = OS.gdk_pango_context_get();

6226

OS.pango_context_list_families(context, families, n_families);

6227

int nFds = 0;

6228

FontData[] fds = new FontData[faceName != null ? 4 : n_families[0]];

6229

@@ -428,7 +428,7 @@

6230

OS.memmove(family, families[0] + i * OS.PTR_SIZEOF, OS.PTR_SIZEOF);

6231

boolean match = true;

6232

if (faceName != null) {

6233

- int /*long*/ familyName = OS.pango_font_family_get_name(family[0]);

6234

+ long /*int*/ familyName = OS.pango_font_family_get_name(family[0]);

6235

int length = OS.strlen(familyName);

6236

byte[] buffer = new byte[length];

6237

OS.memmove(buffer, familyName, length);

6238

@@ -439,7 +439,7 @@

6239

OS.pango_font_family_list_faces(family[0], faces, n_faces);

6240

for (int j=0; j<n_faces[0]; j++) {

6241

OS.memmove(face, faces[0] + j * OS.PTR_SIZEOF, OS.PTR_SIZEOF);

6242

- int /*long*/ fontDesc = OS.pango_font_face_describe(face[0]);

6243

+ long /*int*/ fontDesc = OS.pango_font_face_describe(face[0]);

6244

Font font = Font.gtk_new(this, fontDesc);

6245

FontData data = font.getFontData()[0];

6246

if (nFds == fds.length) {

6247

@@ -650,7 +650,7 @@

6248

* @param data the platform specific GC data

6249

* @return the platform specific GC handle

6250

*/

6251

-public abstract int /*long*/ internal_new_GC (GCData data);

6252

+public abstract long /*int*/ internal_new_GC (GCData data);

6253

6254

/**

6255

* Invokes platform specific functionality to dispose a GC handle.

6256

@@ -665,7 +665,7 @@

6257

* @param hDC the platform specific GC handle

6258

* @param data the platform specific GC data

6259

*/

6260

-public abstract void internal_dispose_GC (int /*long*/ handle, GCData data);

6261

+public abstract void internal_dispose_GC (long /*int*/ handle, GCData data);

6262

6263

/**

6264

* Returns <code>true</code> if the device has been disposed,

6265

@@ -706,7 +706,7 @@

6266

return OS.FcConfigAppFontAddFile (0, buffer);

6267

}

6268

6269

-int /*long*/ logProc (int /*long*/ log_domain, int /*long*/ log_level, int /*long*/ message, int /*long*/ user_data) {

6270

+long /*int*/ logProc (long /*int*/ log_domain, long /*int*/ log_level, long /*int*/ message, long /*int*/ user_data) {

6271

if (warningLevel == 0) {

6272

if (DEBUG || debug) {

6273

new Error ().printStackTrace ();

6274

@@ -777,7 +777,7 @@

6275

shellHandle = 0;

6276

6277

if (gdkColors != null) {

6278

- int /*long*/ colormap = OS.gdk_colormap_get_system();

6279

+ long /*int*/ colormap = OS.gdk_colormap_get_system();

6280

for (int i = 0; i < gdkColors.length; i++) {

6281

GdkColor color = gdkColors [i];

6282

if (color != null) {

6283

@@ -870,7 +870,7 @@

6284

}

6285

}

6286

6287

-static int /*long*/ XErrorProc (int /*long*/ xDisplay, int /*long*/ xErrorEvent) {

6288

+static long /*int*/ XErrorProc (long /*int*/ xDisplay, long /*int*/ xErrorEvent) {

6289

Device device = findDevice (xDisplay);

6290

if (device != null) {

6291

if (device.warningLevel == 0) {

6292

@@ -886,7 +886,7 @@

6293

return 0;

6294

}

6295

6296

-static int /*long*/ XIOErrorProc (int /*long*/ xDisplay) {

6297

+static long /*int*/ XIOErrorProc (long /*int*/ xDisplay) {

6298

Device device = findDevice (xDisplay);

6299

if (device != null) {

6300

if (DEBUG || device.debug) {

6301

diff -urN x86/org/eclipse/swt/graphics/Drawable.java x86_64/org/eclipse/swt/graphics/Drawable.java

6302

--- x86/org/eclipse/swt/graphics/Drawable.java 2009-05-29 17:30:12.000000000 -0400

6303

+++ x86_64/org/eclipse/swt/graphics/Drawable.java 2009-09-17 08:48:24.000000000 -0400

6304

@@ -43,7 +43,7 @@

6305

* @return the platform specific GC handle

6306

*/

6307

6308

-public int /*long*/ internal_new_GC (GCData data);

6309

+public long /*int*/ internal_new_GC (GCData data);

6310

6311

/**

6312

* Invokes platform specific functionality to dispose a GC handle.

6313

@@ -58,6 +58,6 @@

6314

* @param handle the platform specific GC handle

6315

* @param data the platform specific GC data

6316

*/

6317

-public void internal_dispose_GC (int /*long*/ handle, GCData data);

6318

+public void internal_dispose_GC (long /*int*/ handle, GCData data);

6319

6320

}

6321

diff -urN x86/org/eclipse/swt/graphics/Font.java x86_64/org/eclipse/swt/graphics/Font.java

6322

--- x86/org/eclipse/swt/graphics/Font.java 2008-06-05 13:32:00.000000000 -0400

6323

+++ x86_64/org/eclipse/swt/graphics/Font.java 2009-09-17 08:48:24.000000000 -0400

6324

@@ -42,7 +42,7 @@

6325

* platforms and should never be accessed from application code.

6326

*

6327

*/

6328

- public int /*long*/ handle;

6329

+ public long /*int*/ handle;

6330

6331

Font(Device device) {

6332

super(device);

6333

@@ -178,7 +178,7 @@

6334

public FontData[] getFontData() {

6335

if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

6336

6337

- int /*long*/ family = OS.pango_font_description_get_family(handle);

6338

+ long /*int*/ family = OS.pango_font_description_get_family(handle);

6339

int length = OS.strlen(family);

6340

byte[] buffer = new byte[length];

6341

OS.memmove(buffer, family, length);

6342

@@ -190,7 +190,7 @@

6343

if (pangoStyle == OS.PANGO_STYLE_ITALIC) style |= SWT.ITALIC;

6344

if (pangoStyle == OS.PANGO_STYLE_OBLIQUE) style |= SWT.ROMAN;

6345

if (pangoWeight >= OS.PANGO_WEIGHT_BOLD) style |= SWT.BOLD;

6346

- int /*long*/ fontString = OS.pango_font_description_to_string (handle);

6347

+ long /*int*/ fontString = OS.pango_font_description_to_string (handle);

6348

length = OS.strlen (fontString);

6349

buffer = new byte [length + 1];

6350

OS.memmove (buffer, fontString, length);

6351

@@ -215,7 +215,7 @@

6352

*

6353

* @private

6354

*/

6355

-public static Font gtk_new(Device device, int /*long*/ handle) {

6356

+public static Font gtk_new(Device device, long /*int*/ handle) {

6357

Font font = new Font(device);

6358

font.handle = handle;

6359

return font;

6360

diff -urN x86/org/eclipse/swt/graphics/GCData.java x86_64/org/eclipse/swt/graphics/GCData.java

6361

--- x86/org/eclipse/swt/graphics/GCData.java 2009-05-29 17:30:24.000000000 -0400

6362

+++ x86_64/org/eclipse/swt/graphics/GCData.java 2009-09-17 08:48:24.000000000 -0400

6363

@@ -34,7 +34,7 @@

6364

public Font font;

6365

public Pattern foregroundPattern;

6366

public Pattern backgroundPattern;

6367

- public int /*long*/ clipRgn;

6368

+ public long /*int*/ clipRgn;

6369

public float lineWidth;

6370

public int lineStyle = SWT.LINE_SOLID;

6371

public float[] lineDashes;

6372

@@ -46,12 +46,12 @@

6373

public int alpha = 0xFF;

6374

public int interpolation = SWT.DEFAULT;

6375

6376

- public int /*long*/ context;

6377

- public int /*long*/ layout;

6378

- public int /*long*/ damageRgn;

6379

+ public long /*int*/ context;

6380

+ public long /*int*/ layout;

6381

+ public long /*int*/ damageRgn;

6382

public Image image;

6383

- public int /*long*/ drawable;

6384

- public int /*long*/ cairo;

6385

+ public long /*int*/ drawable;

6386

+ public long /*int*/ cairo;

6387

public double cairoXoffset, cairoYoffset;

6388

public boolean disposeCairo;

6389

public double[] clippingTransform;

6390

diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC.java

6391

--- x86/org/eclipse/swt/graphics/GC.java 2009-05-29 17:30:26.000000000 -0400

6392

+++ x86_64/org/eclipse/swt/graphics/GC.java 2009-09-17 08:48:24.000000000 -0400

6393

@@ -67,7 +67,7 @@

6394

* platforms and should never be accessed from application code.

6395

*

6396

*/

6397

- public int /*long*/ handle;

6398

+ public long /*int*/ handle;

6399

6400

Drawable drawable;

6401

GCData data;

6402

@@ -154,7 +154,7 @@

6403

if (drawable == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

6404

GCData data = new GCData();

6405

data.style = checkStyle(style);

6406

- int /*long*/ gdkGC = drawable.internal_new_GC(data);

6407

+ long /*int*/ gdkGC = drawable.internal_new_GC(data);

6408

Device device = data.device;

6409

if (device == null) device = Device.getDevice();

6410

if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

6411

@@ -163,10 +163,10 @@

6412

init();

6413

}

6414

6415

-static void addCairoString(int /*long*/ cairo, String string, float x, float y, Font font) {

6416

+static void addCairoString(long /*int*/ cairo, String string, float x, float y, Font font) {

6417

byte[] buffer = Converter.wcsToMbcs(null, string, true);

6418

if (OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {

6419

- int /*long*/ layout = OS.pango_cairo_create_layout(cairo);

6420

+ long /*int*/ layout = OS.pango_cairo_create_layout(cairo);

6421

if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6422

OS.pango_layout_set_text(layout, buffer, -1);

6423

OS.pango_layout_set_font_description(layout, font.handle);

6424

@@ -192,7 +192,7 @@

6425

return style & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT);

6426

}

6427

6428

-public static GC gtk_new(int /*long*/ handle, GCData data) {

6429

+public static GC gtk_new(long /*int*/ handle, GCData data) {

6430

GC gc = new GC();

6431

gc.device = data.device;

6432

gc.init(null, data, handle);

6433

@@ -201,7 +201,7 @@

6434

6435

public static GC gtk_new(Drawable drawable, GCData data) {

6436

GC gc = new GC();

6437

- int /*long*/ gdkGC = drawable.internal_new_GC(data);

6438

+ long /*int*/ gdkGC = drawable.internal_new_GC(data);

6439

gc.device = data.device;

6440

gc.init(drawable, data, gdkGC);

6441

return gc;

6442

@@ -212,7 +212,7 @@

6443

if ((state & mask) == mask) return;

6444

state = (state ^ mask) & mask;

6445

data.state |= mask;

6446

- int /*long*/ cairo = data.cairo;

6447

+ long /*int*/ cairo = data.cairo;

6448

if (cairo != 0) {

6449

if ((state & (BACKGROUND | FOREGROUND)) != 0) {

6450

GdkColor color;

6451

@@ -228,7 +228,7 @@

6452

}

6453

if (pattern != null) {

6454

if ((data.style & SWT.MIRRORED) != 0 && pattern.surface != 0) {

6455

- int /*long*/ newPattern = Cairo.cairo_pattern_create_for_surface(pattern.surface);

6456

+ long /*int*/ newPattern = Cairo.cairo_pattern_create_for_surface(pattern.surface);

6457

if (newPattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6458

Cairo.cairo_pattern_set_extend(newPattern, Cairo.CAIRO_EXTEND_REPEAT);

6459

double[] matrix = {-1, 0, 0, 1, 0, 0};

6460

@@ -388,10 +388,10 @@

6461

}

6462

}

6463

6464

-int /*long*/ convertRgn(int /*long*/ rgn, double[] matrix) {

6465

- int /*long*/ newRgn = OS.gdk_region_new();

6466

+long /*int*/ convertRgn(long /*int*/ rgn, double[] matrix) {

6467

+ long /*int*/ newRgn = OS.gdk_region_new();

6468

int[] nRects = new int[1];

6469

- int /*long*/[] rects = new int /*long*/[1];

6470

+ long /*int*/[] rects = new long /*int*/[1];

6471

OS.gdk_region_get_rectangles(rgn, rects, nRects);

6472

GdkRectangle rect = new GdkRectangle();

6473

int[] pointArray = new int[8];

6474

@@ -418,7 +418,7 @@

6475

Cairo.cairo_matrix_transform_point(matrix, x, y);

6476

pointArray[6] = (int)x[0];

6477

pointArray[7] = (int)Math.round(y[0]);

6478

- int /*long*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE);

6479

+ long /*int*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE);

6480

OS.gdk_region_union(newRgn, polyRgn);

6481

OS.gdk_region_destroy(polyRgn);

6482

}

6483

@@ -447,7 +447,7 @@

6484

if (image == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

6485

if (image.type != SWT.BITMAP || image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

6486

Rectangle rect = image.getBounds();

6487

- int /*long*/ gdkGC = OS.gdk_gc_new(image.pixmap);

6488

+ long /*int*/ gdkGC = OS.gdk_gc_new(image.pixmap);

6489

if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6490

OS.gdk_gc_set_subwindow(gdkGC, OS.GDK_INCLUDE_INFERIORS);

6491

OS.gdk_draw_drawable(image.pixmap, gdkGC, data.drawable, x, y, 0, 0, rect.width, rect.height);

6492

@@ -495,7 +495,7 @@

6493

if (width <= 0 || height <= 0) return;

6494

int deltaX = destX - srcX, deltaY = destY - srcY;

6495

if (deltaX == 0 && deltaY == 0) return;

6496

- int /*long*/ drawable = data.drawable;

6497

+ long /*int*/ drawable = data.drawable;

6498

if (data.image == null && paint) OS.gdk_gc_set_exposures(handle, true);

6499

OS.gdk_draw_drawable(drawable, handle, drawable, srcX, srcY, destX, destY, width, height);

6500

if (data.image == null & paint) {

6501

@@ -535,10 +535,10 @@

6502

}

6503

6504

void createLayout() {

6505

- int /*long*/ context = OS.gdk_pango_context_get();

6506

+ long /*int*/ context = OS.gdk_pango_context_get();

6507

if (context == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6508

data.context = context;

6509

- int /*long*/ layout = OS.pango_layout_new(context);

6510

+ long /*int*/ layout = OS.pango_layout_new(context);

6511

if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6512

data.layout = layout;

6513

OS.pango_context_set_language(context, OS.gtk_get_default_language());

6514

@@ -558,13 +558,13 @@

6515

6516

void destroy() {

6517

if (data.disposeCairo) {

6518

- int /*long*/ cairo = data.cairo;

6519

+ long /*int*/ cairo = data.cairo;

6520

if (cairo != 0) Cairo.cairo_destroy(cairo);

6521

data.cairo = 0;

6522

}

6523

6524

/* Free resources */

6525

- int /*long*/ clipRgn = data.clipRgn;

6526

+ long /*int*/ clipRgn = data.clipRgn;

6527

if (clipRgn != 0) OS.gdk_region_destroy(clipRgn);

6528

Image image = data.image;

6529

if (image != null) {

6530

@@ -627,7 +627,7 @@

6531

height = -height;

6532

}

6533

if (width == 0 || height == 0 || arcAngle == 0) return;

6534

- int /*long*/ cairo = data.cairo;

6535

+ long /*int*/ cairo = data.cairo;

6536

if (cairo != 0) {

6537

double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;

6538

if (width == height) {

6539

@@ -678,8 +678,8 @@

6540

* are not valid in the default style. The fix is to use a style

6541

* from a widget.

6542

*/

6543

- int /*long*/ style = OS.gtk_widget_get_style(data.device.shellHandle);

6544

- int /*long*/ cairo = data.cairo;

6545

+ long /*int*/ style = OS.gtk_widget_get_style(data.device.shellHandle);

6546

+ long /*int*/ cairo = data.cairo;

6547

if (cairo != 0) {

6548

checkGC(FOREGROUND);

6549

int[] lineWidth = new int[1];

6550

@@ -784,7 +784,7 @@

6551

SWT.error(SWT.ERROR_INVALID_ARGUMENT);

6552

}

6553

}

6554

- int /*long*/ cairo = data.cairo;

6555

+ long /*int*/ cairo = data.cairo;

6556

if (cairo != 0) {

6557

if (data.alpha != 0) {

6558

srcImage.createSurface();

6559

@@ -806,7 +806,7 @@

6560

case SWT.LOW: filter = Cairo.CAIRO_FILTER_FAST; break;

6561

case SWT.HIGH: filter = Cairo.CAIRO_FILTER_BEST; break;

6562

}

6563

- int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface(srcImage.surface);

6564

+ long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface(srcImage.surface);

6565

if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6566

if (srcWidth != destWidth || srcHeight != destHeight) {

6567

/*

6568

@@ -825,8 +825,8 @@

6569

* the image that was created or the edges are still faded.

6570

*/

6571

if (Cairo.cairo_version () >= Cairo.CAIRO_VERSION_ENCODE(1, 4, 0)) {

6572

- int /*long*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, imgWidth * 3, imgHeight * 3);

6573

- int /*long*/ cr = Cairo.cairo_create(surface);

6574

+ long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, imgWidth * 3, imgHeight * 3);

6575

+ long /*int*/ cr = Cairo.cairo_create(surface);

6576

Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, imgHeight);

6577

Cairo.cairo_paint(cr);

6578

Cairo.cairo_scale(cr, -1, -1);

6579

@@ -849,7 +849,7 @@

6580

Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, -imgHeight * 3);

6581

Cairo.cairo_paint(cr);

6582

Cairo.cairo_destroy(cr);

6583

- int /*long*/ newPattern = Cairo.cairo_pattern_create_for_surface(surface);

6584

+ long /*int*/ newPattern = Cairo.cairo_pattern_create_for_surface(surface);

6585

Cairo.cairo_surface_destroy(surface);

6586

if (newPattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6587

Cairo.cairo_pattern_destroy(pattern);

6588

@@ -889,7 +889,7 @@

6589

drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, 0, -1);

6590

return;

6591

}

6592

- int /*long*/ pixbuf = scale(srcImage.pixmap, srcX, srcY, srcWidth, srcHeight, destWidth, destHeight);

6593

+ long /*int*/ pixbuf = scale(srcImage.pixmap, srcX, srcY, srcWidth, srcHeight, destWidth, destHeight);

6594

if (pixbuf != 0) {

6595

OS.gdk_pixbuf_render_to_drawable(pixbuf, data.drawable, handle, 0, 0, destX, destY, destWidth, destHeight, OS.GDK_RGB_DITHER_NORMAL, 0, 0);

6596

OS.g_object_unref(pixbuf);

6597

@@ -906,12 +906,12 @@

6598

drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, srcImage.mask, OS.PictStandardA8);

6599

return;

6600

}

6601

- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, srcWidth, srcHeight);

6602

+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, srcWidth, srcHeight);

6603

if (pixbuf == 0) return;

6604

- int /*long*/ colormap = OS.gdk_colormap_get_system();

6605

+ long /*int*/ colormap = OS.gdk_colormap_get_system();

6606

OS.gdk_pixbuf_get_from_drawable(pixbuf, srcImage.pixmap, colormap, srcX, srcY, 0, 0, srcWidth, srcHeight);

6607

int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);

6608

- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

6609

+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

6610

byte[] line = new byte[stride];

6611

byte alpha = (byte)srcImage.alpha;

6612

byte[] alphaData = srcImage.alphaData;

6613

@@ -924,7 +924,7 @@

6614

OS.memmove(pixels + (y * stride), line, stride);

6615

}

6616

if (srcWidth != destWidth || srcHeight != destHeight) {

6617

- int /*long*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, destWidth, destHeight, OS.GDK_INTERP_BILINEAR);

6618

+ long /*int*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, destWidth, destHeight, OS.GDK_INTERP_BILINEAR);

6619

OS.g_object_unref(pixbuf);

6620

if (scaledPixbuf == 0) return;

6621

pixbuf = scaledPixbuf;

6622

@@ -941,33 +941,33 @@

6623

OS.g_object_unref(pixbuf);

6624

}

6625

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) {

6626

- int /*long*/ drawable = data.drawable;

6627

- int /*long*/ colorPixmap = srcImage.pixmap;

6628

+ long /*int*/ drawable = data.drawable;

6629

+ long /*int*/ colorPixmap = srcImage.pixmap;

6630

/* Generate the mask if necessary. */

6631

if (srcImage.transparentPixel != -1) srcImage.createMask();

6632

- int /*long*/ maskPixmap = srcImage.mask;

6633

+ long /*int*/ maskPixmap = srcImage.mask;

6634

6635

if (device.useXRender) {

6636

drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, maskPixmap, OS.PictStandardA1);

6637

} else {

6638

if (srcWidth != destWidth || srcHeight != destHeight) {

6639

- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, srcWidth, srcHeight);

6640

+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, srcWidth, srcHeight);

6641

if (pixbuf != 0) {

6642

- int /*long*/ colormap = OS.gdk_colormap_get_system();

6643

+ long /*int*/ colormap = OS.gdk_colormap_get_system();

6644

OS.gdk_pixbuf_get_from_drawable(pixbuf, colorPixmap, colormap, srcX, srcY, 0, 0, srcWidth, srcHeight);

6645

- int /*long*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, srcWidth, srcHeight);

6646

+ long /*int*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, srcWidth, srcHeight);

6647

if (maskPixbuf != 0) {

6648

OS.gdk_pixbuf_get_from_drawable(maskPixbuf, maskPixmap, 0, srcX, srcY, 0, 0, srcWidth, srcHeight);

6649

int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);

6650

- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

6651

+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

6652

byte[] line = new byte[stride];

6653

int maskStride = OS.gdk_pixbuf_get_rowstride(maskPixbuf);

6654

- int /*long*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);

6655

+ long /*int*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);

6656

byte[] maskLine = new byte[maskStride];

6657

for (int y=0; y<srcHeight; y++) {

6658

- int /*long*/ offset = pixels + (y * stride);

6659

+ long /*int*/ offset = pixels + (y * stride);

6660

OS.memmove(line, offset, stride);

6661

- int /*long*/ maskOffset = maskPixels + (y * maskStride);

6662

+ long /*int*/ maskOffset = maskPixels + (y * maskStride);

6663

OS.memmove(maskLine, maskOffset, maskStride);

6664

for (int x=0; x<srcWidth; x++) {

6665

if (maskLine[x * 3] == 0) {

6666

@@ -977,10 +977,10 @@

6667

OS.memmove(offset, line, stride);

6668

}

6669

OS.g_object_unref(maskPixbuf);

6670

- int /*long*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, destWidth, destHeight, OS.GDK_INTERP_BILINEAR);

6671

+ long /*int*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, destWidth, destHeight, OS.GDK_INTERP_BILINEAR);

6672

if (scaledPixbuf != 0) {

6673

- int /*long*/[] colorBuffer = new int /*long*/[1];

6674

- int /*long*/[] maskBuffer = new int /*long*/[1];

6675

+ long /*int*/[] colorBuffer = new long /*int*/[1];

6676

+ long /*int*/[] maskBuffer = new long /*int*/[1];

6677

OS.gdk_pixbuf_render_pixmap_and_mask(scaledPixbuf, colorBuffer, maskBuffer, 128);

6678

colorPixmap = colorBuffer[0];

6679

maskPixmap = maskBuffer[0];

6680

@@ -1001,9 +1001,9 @@

6681

int newHeight = srcY + srcHeight;

6682

int bytesPerLine = (newWidth + 7) / 8;

6683

byte[] maskData = new byte[bytesPerLine * newHeight];

6684

- int /*long*/ mask = OS.gdk_bitmap_create_from_data(0, maskData, newWidth, newHeight);

6685

+ long /*int*/ mask = OS.gdk_bitmap_create_from_data(0, maskData, newWidth, newHeight);

6686

if (mask != 0) {

6687

- int /*long*/ gc = OS.gdk_gc_new(mask);

6688

+ long /*int*/ gc = OS.gdk_gc_new(mask);

6689

OS.gdk_region_offset(data.clipRgn, -destX + srcX, -destY + srcY);

6690

OS.gdk_gc_set_clip_region(gc, data.clipRgn);

6691

OS.gdk_region_offset(data.clipRgn, destX - srcX, destY - srcY);

6692

@@ -1035,19 +1035,19 @@

6693

/* Destroy the image mask if the there is a GC created on the image */

6694

if (srcImage.transparentPixel != -1 && srcImage.memGC != null) srcImage.destroyMask();

6695

}

6696

-void drawImageXRender(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*/ maskPixmap, int maskType) {

6697

+void drawImageXRender(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight, long /*int*/ maskPixmap, int maskType) {

6698

int translateX = 0, translateY = 0;

6699

- int /*long*/ drawable = data.drawable;

6700

+ long /*int*/ drawable = data.drawable;

6701

if (data.image == null && !data.realDrawable) {

6702

int[] x = new int[1], y = new int[1];

6703

- int /*long*/ [] real_drawable = new int /*long*/ [1];

6704

+ long /*int*/ [] real_drawable = new long /*int*/ [1];

6705

OS.gdk_window_get_internal_paint_info(drawable, real_drawable, x, y);

6706

drawable = real_drawable[0];

6707

translateX = -x[0];

6708

translateY = -y[0];

6709

}

6710

- int /*long*/ xDisplay = OS.GDK_DISPLAY();

6711

- int /*long*/ maskPict = 0;

6712

+ long /*int*/ xDisplay = OS.GDK_DISPLAY();

6713

+ long /*int*/ maskPict = 0;

6714

if (maskPixmap != 0) {

6715

int attribCount = 0;

6716

XRenderPictureAttributes attrib = null;

6717

@@ -1059,10 +1059,10 @@

6718

maskPict = OS.XRenderCreatePicture(xDisplay, OS.gdk_x11_drawable_get_xid(maskPixmap), OS.XRenderFindStandardFormat(xDisplay, maskType), attribCount, attrib);

6719

if (maskPict == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6720

}

6721

- int /*long*/ format = OS.XRenderFindVisualFormat(xDisplay, OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system()));

6722

- int /*long*/ destPict = OS.XRenderCreatePicture(xDisplay, OS.gdk_x11_drawable_get_xid(drawable), format, 0, null);

6723

+ long /*int*/ format = OS.XRenderFindVisualFormat(xDisplay, OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system()));

6724

+ long /*int*/ destPict = OS.XRenderCreatePicture(xDisplay, OS.gdk_x11_drawable_get_xid(drawable), format, 0, null);

6725

if (destPict == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6726

- int /*long*/ srcPict = OS.XRenderCreatePicture(xDisplay, OS.gdk_x11_drawable_get_xid(srcImage.pixmap), format, 0, null);

6727

+ long /*int*/ srcPict = OS.XRenderCreatePicture(xDisplay, OS.gdk_x11_drawable_get_xid(srcImage.pixmap), format, 0, null);

6728

if (srcPict == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6729

if (srcWidth != destWidth || srcHeight != destHeight) {

6730

int[] transform = new int[]{(int)(((float)srcWidth / destWidth) * 65536), 0, 0, 0, (int)(((float)srcHeight / destHeight) * 65536), 0, 0, 0, 65536};

6731

@@ -1071,7 +1071,7 @@

6732

srcX *= destWidth / (float)srcWidth;

6733

srcY *= destHeight / (float)srcHeight;

6734

}

6735

- int /*long*/ clipping = data.clipRgn;

6736

+ long /*int*/ clipping = data.clipRgn;

6737

if (data.damageRgn != 0) {

6738

if (clipping == 0) {

6739

clipping = data.damageRgn;

6740

@@ -1083,7 +1083,7 @@

6741

}

6742

if (clipping != 0) {

6743

int[] nRects = new int[1];

6744

- int /*long*/[] rects = new int /*long*/[1];

6745

+ long /*int*/[] rects = new long /*int*/[1];

6746

OS.gdk_region_get_rectangles(clipping, rects, nRects);

6747

GdkRectangle rect = new GdkRectangle();

6748

short[] xRects = new short[nRects[0] * 4];

6749

@@ -1105,12 +1105,12 @@

6750

OS.XRenderFreePicture(xDisplay, srcPict);

6751

if (maskPict != 0) OS.XRenderFreePicture(xDisplay, maskPict);

6752

}

6753

-int /*long*/ scale(int /*long*/ src, int srcX, int srcY, int srcWidth, int srcHeight, int destWidth, int destHeight) {

6754

- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, srcWidth, srcHeight);

6755

+long /*int*/ scale(long /*int*/ src, int srcX, int srcY, int srcWidth, int srcHeight, int destWidth, int destHeight) {

6756

+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, srcWidth, srcHeight);

6757

if (pixbuf == 0) return 0;

6758

- int /*long*/ colormap = OS.gdk_colormap_get_system();

6759

+ long /*int*/ colormap = OS.gdk_colormap_get_system();

6760

OS.gdk_pixbuf_get_from_drawable(pixbuf, src, colormap, srcX, srcY, 0, 0, srcWidth, srcHeight);

6761

- int /*long*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, destWidth, destHeight, OS.GDK_INTERP_BILINEAR);

6762

+ long /*int*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, destWidth, destHeight, OS.GDK_INTERP_BILINEAR);

6763

OS.g_object_unref(pixbuf);

6764

return scaledPixbuf;

6765

}

6766

@@ -1131,7 +1131,7 @@

6767

public void drawLine(int x1, int y1, int x2, int y2) {

6768

if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

6769

checkGC(DRAW);

6770

- int /*long*/ cairo = data.cairo;

6771

+ long /*int*/ cairo = data.cairo;

6772

if (cairo != 0) {

6773

double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;

6774

Cairo.cairo_move_to(cairo, x1 + xOffset, y1 + yOffset);

6775

@@ -1174,7 +1174,7 @@

6776

y = y + height;

6777

height = -height;

6778

}

6779

- int /*long*/ cairo = data.cairo;

6780

+ long /*int*/ cairo = data.cairo;

6781

if (cairo != 0) {

6782

double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;

6783

if (width == height) {

6784

@@ -1221,11 +1221,11 @@

6785

if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

6786

initCairo();

6787

checkGC(DRAW);

6788

- int /*long*/ cairo = data.cairo;

6789

+ long /*int*/ cairo = data.cairo;

6790

Cairo.cairo_save(cairo);

6791

double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;

6792

Cairo.cairo_translate(cairo, xOffset, yOffset);

6793

- int /*long*/ copy = Cairo.cairo_copy_path(path.handle);

6794

+ long /*int*/ copy = Cairo.cairo_copy_path(path.handle);

6795

if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6796

Cairo.cairo_append_path(cairo, copy);

6797

Cairo.cairo_path_destroy(copy);

6798

@@ -1253,7 +1253,7 @@

6799

public void drawPoint (int x, int y) {

6800

if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

6801

checkGC(DRAW);

6802

- int /*long*/ cairo = data.cairo;

6803

+ long /*int*/ cairo = data.cairo;

6804

if (cairo != 0) {

6805

Cairo.cairo_rectangle(cairo, x, y, 1, 1);

6806

Cairo.cairo_fill(cairo);

6807

@@ -1283,7 +1283,7 @@

6808

if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

6809

if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

6810

checkGC(DRAW);

6811

- int /*long*/ cairo = data.cairo;

6812

+ long /*int*/ cairo = data.cairo;

6813

if (cairo != 0) {

6814

drawPolyline(cairo, pointArray, true);

6815

Cairo.cairo_stroke(cairo);

6816

@@ -1313,7 +1313,7 @@

6817

if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

6818

if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

6819

checkGC(DRAW);

6820

- int /*long*/ cairo = data.cairo;

6821

+ long /*int*/ cairo = data.cairo;

6822

if (cairo != 0) {

6823

drawPolyline(cairo, pointArray, false);

6824

Cairo.cairo_stroke(cairo);

6825

@@ -1322,7 +1322,7 @@

6826

OS.gdk_draw_lines(data.drawable, handle, pointArray, pointArray.length / 2);

6827

}

6828

6829

-void drawPolyline(int /*long*/ cairo, int[] pointArray, boolean close) {

6830

+void drawPolyline(long /*int*/ cairo, int[] pointArray, boolean close) {

6831

int count = pointArray.length / 2;

6832

if (count == 0) return;

6833

double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;

6834

@@ -1359,7 +1359,7 @@

6835

y = y + height;

6836

height = -height;

6837

}

6838

- int /*long*/ cairo = data.cairo;

6839

+ long /*int*/ cairo = data.cairo;

6840

if (cairo != 0) {

6841

double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;

6842

Cairo.cairo_rectangle(cairo, x + xOffset, y + yOffset, width, height);

6843

@@ -1429,7 +1429,7 @@

6844

}

6845

if (naw < 0) naw = 0 - naw;

6846

if (nah < 0) nah = 0 - nah;

6847

- int /*long*/ cairo = data.cairo;

6848

+ long /*int*/ cairo = data.cairo;

6849

if (cairo != 0) {

6850

double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;

6851

if (naw == 0 || nah == 0) {

6852

@@ -1455,7 +1455,7 @@

6853

}

6854

int naw2 = naw / 2;

6855

int nah2 = nah / 2;

6856

- int /*long*/ drawable = data.drawable;

6857

+ long /*int*/ drawable = data.drawable;

6858

if (nw > naw) {

6859

if (nh > nah) {

6860

OS.gdk_draw_arc(drawable, handle, 0, nx, ny, naw, nah, 5760, 5760);

6861

@@ -1615,7 +1615,7 @@

6862

if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

6863

if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

6864

if (string.length() == 0) return;

6865

- int /*long*/ cairo = data.cairo;

6866

+ long /*int*/ cairo = data.cairo;

6867

if (cairo != 0) {

6868

if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {

6869

//TODO - honor flags

6870

@@ -1664,13 +1664,13 @@

6871

if (!data.xorMode) {

6872

OS.gdk_draw_layout_with_colors(data.drawable, handle, x, y, data.layout, null, background);

6873

} else {

6874

- int /*long*/ layout = data.layout;

6875

+ long /*int*/ layout = data.layout;

6876

if (data.stringWidth == -1) {

6877

computeStringSize();

6878

}

6879

- int /*long*/ pixmap = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), data.stringWidth, data.stringHeight, -1);

6880

+ long /*int*/ pixmap = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), data.stringWidth, data.stringHeight, -1);

6881

if (pixmap == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6882

- int /*long*/ gdkGC = OS.gdk_gc_new(pixmap);

6883

+ long /*int*/ gdkGC = OS.gdk_gc_new(pixmap);

6884

if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6885

GdkColor black = new GdkColor();

6886

OS.gdk_gc_set_foreground(gdkGC, black);

6887

@@ -1743,7 +1743,7 @@

6888

height = -height;

6889

}

6890

if (width == 0 || height == 0 || arcAngle == 0) return;

6891

- int /*long*/ cairo = data.cairo;

6892

+ long /*int*/ cairo = data.cairo;

6893

if (cairo != 0) {

6894

if (width == height) {

6895

if (arcAngle >= 0) {

6896

@@ -1820,9 +1820,9 @@

6897

fillRectangle(x, y, width, height);

6898

return;

6899

}

6900

- int /*long*/ cairo = data.cairo;

6901

+ long /*int*/ cairo = data.cairo;

6902

if (cairo != 0) {

6903

- int /*long*/ pattern;

6904

+ long /*int*/ pattern;

6905

if (vertical) {

6906

pattern = Cairo.cairo_pattern_create_linear (0.0, 0.0, 0.0, 1.0);

6907

} else {

6908

@@ -1872,7 +1872,7 @@

6909

y = y + height;

6910

height = -height;

6911

}

6912

- int /*long*/ cairo = data.cairo;

6913

+ long /*int*/ cairo = data.cairo;

6914

if (cairo != 0) {

6915

if (width == height) {

6916

Cairo.cairo_arc_negative(cairo, x + width / 2f, y + height / 2f, width / 2f, 0, 2 * (float)Compatibility.PI);

6917

@@ -1918,8 +1918,8 @@

6918

if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

6919

initCairo();

6920

checkGC(FILL);

6921

- int /*long*/ cairo = data.cairo;

6922

- int /*long*/ copy = Cairo.cairo_copy_path(path.handle);

6923

+ long /*int*/ cairo = data.cairo;

6924

+ long /*int*/ copy = Cairo.cairo_copy_path(path.handle);

6925

if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);

6926

Cairo.cairo_append_path(cairo, copy);

6927

Cairo.cairo_path_destroy(copy);

6928

@@ -1949,7 +1949,7 @@

6929

if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

6930

if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

6931

checkGC(FILL);

6932

- int /*long*/ cairo = data.cairo;

6933

+ long /*int*/ cairo = data.cairo;

6934

if (cairo != 0) {

6935

drawPolyline(cairo, pointArray, true);

6936

Cairo.cairo_fill(cairo);

6937

@@ -1984,7 +1984,7 @@

6938

y = y + height;

6939

height = -height;

6940

}

6941

- int /*long*/ cairo = data.cairo;

6942

+ long /*int*/ cairo = data.cairo;

6943

if (cairo != 0) {

6944

Cairo.cairo_rectangle(cairo, x, y, width, height);

6945

Cairo.cairo_fill(cairo);

6946

@@ -2050,7 +2050,7 @@

6947

}

6948

if (naw < 0) naw = 0 - naw;

6949

if (nah < 0) nah = 0 - nah;

6950

- int /*long*/ cairo = data.cairo;

6951

+ long /*int*/ cairo = data.cairo;

6952

if (cairo != 0) {

6953

if (naw == 0 || nah == 0) {

6954

Cairo.cairo_rectangle(cairo, x, y, width, height);

6955

@@ -2075,7 +2075,7 @@

6956

}

6957

int naw2 = naw / 2;

6958

int nah2 = nah / 2;

6959

- int /*long*/ drawable = data.drawable;

6960

+ long /*int*/ drawable = data.drawable;

6961

if (nw > naw) {

6962

if (nh > nah) {

6963

OS.gdk_draw_arc(drawable, handle, 1, nx, ny, naw, nah, 5760, 5760);

6964

@@ -2294,11 +2294,11 @@

6965

height = h[0];

6966

}

6967

/* Intersect visible bounds with clipping in device space and then convert then to user space */

6968

- int /*long*/ cairo = data.cairo;

6969

- int /*long*/ clipRgn = data.clipRgn;

6970

- int /*long*/ damageRgn = data.damageRgn;

6971

+ long /*int*/ cairo = data.cairo;

6972

+ long /*int*/ clipRgn = data.clipRgn;

6973

+ long /*int*/ damageRgn = data.damageRgn;

6974

if (clipRgn != 0 || damageRgn != 0 || cairo != 0) {

6975

- int /*long*/ rgn = OS.gdk_region_new();

6976

+ long /*int*/ rgn = OS.gdk_region_new();

6977

GdkRectangle rect = new GdkRectangle();

6978

rect.width = width;

6979

rect.height = height;

6980

@@ -2354,10 +2354,10 @@

6981

if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

6982

if (region == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

6983

if (region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

6984

- int /*long*/ clipping = region.handle;

6985

+ long /*int*/ clipping = region.handle;

6986

OS.gdk_region_subtract(clipping, clipping);

6987

- int /*long*/ cairo = data.cairo;

6988

- int /*long*/ clipRgn = data.clipRgn;

6989

+ long /*int*/ cairo = data.cairo;

6990

+ long /*int*/ clipRgn = data.clipRgn;

6991

if (clipRgn == 0) {

6992

GdkRectangle rect = new GdkRectangle();

6993

if (data.width != -1 && data.height != -1) {

6994

@@ -2373,7 +2373,7 @@

6995

} else {

6996

/* Convert clipping to device space if needed */

6997

if (data.clippingTransform != null) {

6998

- int /*long*/ rgn = convertRgn(clipRgn, data.clippingTransform);

6999

+ long /*int*/ rgn = convertRgn(clipRgn, data.clippingTransform);

7000

OS.gdk_region_union(clipping, rgn);

7001

OS.gdk_region_destroy(rgn);

7002

} else {

7003

@@ -2388,7 +2388,7 @@

7004

double[] matrix = new double[6];

7005

Cairo.cairo_get_matrix(cairo, matrix);

7006

Cairo.cairo_matrix_invert(matrix);

7007

- int /*long*/ rgn = convertRgn(clipping, matrix);

7008

+ long /*int*/ rgn = convertRgn(clipping, matrix);

7009

OS.gdk_region_subtract(clipping, clipping);

7010

OS.gdk_region_union(clipping, rgn);

7011

OS.gdk_region_destroy(rgn);

7012

@@ -2409,7 +2409,7 @@

7013

*/

7014

public int getFillRule() {

7015

if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

7016

- int /*long*/ cairo = data.cairo;

7017

+ long /*int*/ cairo = data.cairo;

7018

if (cairo == 0) return SWT.FILL_EVEN_ODD;

7019

return Cairo.cairo_get_fill_rule(cairo) == Cairo.CAIRO_FILL_RULE_WINDING ? SWT.FILL_WINDING : SWT.FILL_EVEN_ODD;

7020

}

7021

@@ -2445,9 +2445,9 @@

7022

if (data.context == 0) createLayout();

7023

checkGC(FONT);

7024

Font font = data.font;

7025

- int /*long*/ context = data.context;

7026

- int /*long*/ lang = OS.pango_context_get_language(context);

7027

- int /*long*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang);

7028

+ long /*int*/ context = data.context;

7029

+ long /*int*/ lang = OS.pango_context_get_language(context);

7030

+ long /*int*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang);

7031

FontMetrics fm = new FontMetrics();

7032

fm.ascent = OS.PANGO_PIXELS(OS.pango_font_metrics_get_ascent(metrics));

7033

fm.descent = OS.PANGO_PIXELS(OS.pango_font_metrics_get_descent(metrics));

7034

@@ -2691,13 +2691,13 @@

7035

if (data.cairo == 0) return SWT.DEFAULT;

7036

int antialias = Cairo.CAIRO_ANTIALIAS_DEFAULT;

7037

if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {

7038

- int /*long*/ options = Cairo.cairo_font_options_create();

7039

+ long /*int*/ options = Cairo.cairo_font_options_create();

7040

Cairo.cairo_get_font_options(data.cairo, options);

7041

antialias = Cairo.cairo_font_options_get_antialias(options);

7042

Cairo.cairo_font_options_destroy(options);

7043

} else {

7044

if (data.context != 0) {

7045

- int /*long*/ options = OS.pango_cairo_context_get_font_options(data.context);

7046

+ long /*int*/ options = OS.pango_cairo_context_get_font_options(data.context);

7047

if (options != 0) antialias = Cairo.cairo_font_options_get_antialias(options);

7048

}

7049

}

7050

@@ -2732,7 +2732,7 @@

7051

if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

7052

if (transform == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

7053

if (transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

7054

- int /*long*/ cairo = data.cairo;

7055

+ long /*int*/ cairo = data.cairo;

7056

if (cairo != 0) {

7057

Cairo.cairo_get_matrix(cairo, transform.handle);

7058

double[] identity = identity();

7059

@@ -2792,7 +2792,7 @@

7060

return identity;

7061

}

7062

7063

-void init(Drawable drawable, GCData data, int /*long*/ gdkGC) {

7064

+void init(Drawable drawable, GCData data, long /*int*/ gdkGC) {

7065

if (data.foreground != null) data.state &= ~FOREGROUND;

7066

if (data.background != null) data.state &= ~(BACKGROUND | BACKGROUND_BG);

7067

if (data.font != null) data.state &= ~FONT;

7068

@@ -2812,26 +2812,26 @@

7069

handle = gdkGC;

7070

if ((data.style & SWT.MIRRORED) != 0) {

7071

initCairo();

7072

- int /*long*/ cairo = data.cairo;

7073

+ long /*int*/ cairo = data.cairo;

7074

Cairo.cairo_set_matrix(cairo, identity());

7075

}

7076

}

7077

7078

void initCairo() {

7079

data.device.checkCairo();

7080

- int /*long*/ cairo = data.cairo;

7081

+ long /*int*/ cairo = data.cairo;

7082

if (cairo != 0) return;

7083

- int /*long*/ xDisplay = OS.GDK_DISPLAY();

7084

- int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());

7085

- int /*long*/ xDrawable = 0;

7086

+ long /*int*/ xDisplay = OS.GDK_DISPLAY();

7087

+ long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());

7088

+ long /*int*/ xDrawable = 0;

7089

int translateX = 0, translateY = 0;

7090

- int /*long*/ drawable = data.drawable;

7091

+ long /*int*/ drawable = data.drawable;

7092

if (data.image != null) {

7093

xDrawable = OS.GDK_PIXMAP_XID(drawable);

7094

} else {

7095

if (!data.realDrawable) {

7096

int[] x = new int[1], y = new int[1];

7097

- int /*long*/ [] real_drawable = new int /*long*/ [1];

7098

+ long /*int*/ [] real_drawable = new long /*int*/ [1];

7099

OS.gdk_window_get_internal_paint_info(drawable, real_drawable, x, y);

7100

xDrawable = OS.gdk_x11_drawable_get_xid(real_drawable[0]);

7101

translateX = -x[0];

7102

@@ -2841,7 +2841,7 @@

7103

int[] w = new int[1], h = new int[1];

7104

OS.gdk_drawable_get_size(drawable, w, h);

7105

int width = w[0], height = h[0];

7106

- int /*long*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height);

7107

+ long /*int*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height);

7108

if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7109

Cairo.cairo_surface_set_device_offset(surface, translateX, translateY);

7110

data.cairo = cairo = Cairo.cairo_create(surface);

7111

@@ -2962,7 +2962,7 @@

7112

} catch (SWTException e) {}

7113

} else {

7114

if (!data.disposeCairo) return;

7115

- int /*long*/ cairo = data.cairo;

7116

+ long /*int*/ cairo = data.cairo;

7117

if (cairo != 0) Cairo.cairo_destroy(cairo);

7118

data.cairo = 0;

7119

data.interpolation = SWT.DEFAULT;

7120

@@ -3042,7 +3042,7 @@

7121

SWT.error(SWT.ERROR_INVALID_ARGUMENT);

7122

}

7123

initCairo();

7124

- int /*long*/ cairo = data.cairo;

7125

+ long /*int*/ cairo = data.cairo;

7126

Cairo.cairo_set_antialias(cairo, mode);

7127

}

7128

7129

@@ -3104,12 +3104,12 @@

7130

data.state &= ~BACKGROUND;

7131

}

7132

7133

-static void setCairoFont(int /*long*/ cairo, Font font) {

7134

+static void setCairoFont(long /*int*/ cairo, Font font) {

7135

setCairoFont(cairo, font.handle);

7136

}

7137

7138

-static void setCairoFont(int /*long*/ cairo, int /*long*/ font) {

7139

- int /*long*/ family = OS.pango_font_description_get_family(font);

7140

+static void setCairoFont(long /*int*/ cairo, long /*int*/ font) {

7141

+ long /*int*/ family = OS.pango_font_description_get_family(font);

7142

int length = OS.strlen(family);

7143

byte[] buffer = new byte[length + 1];

7144

OS.memmove(buffer, family, length);

7145

@@ -3126,12 +3126,12 @@

7146

Cairo.cairo_set_font_size(cairo, height);

7147

}

7148

7149

-static void setCairoRegion(int /*long*/ cairo, int /*long*/ rgn) {

7150

+static void setCairoRegion(long /*int*/ cairo, long /*int*/ rgn) {

7151

if (OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {

7152

OS.gdk_cairo_region(cairo, rgn);

7153

} else {

7154

int[] nRects = new int[1];

7155

- int /*long*/[] rects = new int /*long*/[1];

7156

+ long /*int*/[] rects = new long /*int*/[1];

7157

OS.gdk_region_get_rectangles(rgn, rects, nRects);

7158

GdkRectangle rect = new GdkRectangle();

7159

for (int i=0; i<nRects[0]; i++) {

7160

@@ -3142,7 +3142,7 @@

7161

}

7162

}

7163

7164

-static void setCairoPatternColor(int /*long*/ pattern, int offset, Color c, int alpha) {

7165

+static void setCairoPatternColor(long /*int*/ pattern, int offset, Color c, int alpha) {

7166

GdkColor color = c.handle;

7167

double aa = (alpha & 0xFF) / (double)0xFF;

7168

double red = ((color.red & 0xFFFF) / (double)0xFFFF);

7169

@@ -3151,8 +3151,8 @@

7170

Cairo.cairo_pattern_add_color_stop_rgba(pattern, offset, red, green, blue, aa);

7171

}

7172

7173

-void setCairoClip(int /*long*/ damageRgn, int /*long*/ clipRgn) {

7174

- int /*long*/ cairo = data.cairo;

7175

+void setCairoClip(long /*int*/ damageRgn, long /*int*/ clipRgn) {

7176

+ long /*int*/ cairo = data.cairo;

7177

Cairo.cairo_reset_clip(cairo);

7178

if (damageRgn != 0) {

7179

double[] matrix = new double[6];

7180

@@ -3170,8 +3170,8 @@

7181

}

7182

}

7183

7184

-void setClipping(int /*long*/ clipRgn) {

7185

- int /*long*/ cairo = data.cairo;

7186

+void setClipping(long /*int*/ clipRgn) {

7187

+ long /*int*/ cairo = data.cairo;

7188

if (clipRgn == 0) {

7189

if (data.clipRgn != 0) {

7190

OS.gdk_region_destroy(data.clipRgn);

7191

@@ -3181,7 +3181,7 @@

7192

data.clippingTransform = null;

7193

setCairoClip(data.damageRgn, 0);

7194

} else {

7195

- int /*long*/ clipping = data.damageRgn != 0 ? data.damageRgn : 0;

7196

+ long /*int*/ clipping = data.damageRgn != 0 ? data.damageRgn : 0;

7197

OS.gdk_gc_set_clip_region(handle, clipping);

7198

}

7199

} else {

7200

@@ -3193,7 +3193,7 @@

7201

Cairo.cairo_get_matrix(cairo, data.clippingTransform);

7202

setCairoClip(data.damageRgn, clipRgn);

7203

} else {

7204

- int /*long*/ clipping = clipRgn;

7205

+ long /*int*/ clipping = clipRgn;

7206

if (data.damageRgn != 0) {

7207

clipping = OS.gdk_region_new();

7208

OS.gdk_region_union(clipping, clipRgn);

7209

@@ -3234,7 +3234,7 @@

7210

rect.y = y;

7211

rect.width = width;

7212

rect.height = height;

7213

- int /*long*/ clipRgn = OS.gdk_region_new();

7214

+ long /*int*/ clipRgn = OS.gdk_region_new();

7215

OS.gdk_region_union_with_rect(clipRgn, rect);

7216

setClipping(clipRgn);

7217

OS.gdk_region_destroy(clipRgn);

7218

@@ -3272,8 +3272,8 @@

7219

setClipping(0);

7220

if (path != null) {

7221

initCairo();

7222

- int /*long*/ cairo = data.cairo;

7223

- int /*long*/ copy = Cairo.cairo_copy_path(path.handle);

7224

+ long /*int*/ cairo = data.cairo;

7225

+ long /*int*/ copy = Cairo.cairo_copy_path(path.handle);

7226

if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7227

Cairo.cairo_append_path(cairo, copy);

7228

Cairo.cairo_path_destroy(copy);

7229

@@ -3376,7 +3376,7 @@

7230

}

7231

//TODO - need fill rule in X, GDK has no API

7232

initCairo();

7233

- int /*long*/ cairo = data.cairo;

7234

+ long /*int*/ cairo = data.cairo;

7235

if (cairo != 0) {

7236

Cairo.cairo_set_fill_rule(cairo, cairo_mode);

7237

}

7238

@@ -3767,7 +3767,7 @@

7239

}

7240

byte[] buffer;

7241

int mnemonic, length = string.length ();

7242

- int /*long*/ layout = data.layout;

7243

+ long /*int*/ layout = data.layout;

7244

char[] text = new char[length];

7245

string.getChars(0, length, text, 0);

7246

if ((flags & SWT.DRAW_MNEMONIC) != 0 && (mnemonic = fixMnemonic(text)) != -1) {

7247

@@ -3780,8 +3780,8 @@

7248

buffer = new byte[buffer1.length + buffer2.length];

7249

System.arraycopy(buffer1, 0, buffer, 0, buffer1.length);

7250

System.arraycopy(buffer2, 0, buffer, buffer1.length, buffer2.length);

7251

- int /*long*/ attr_list = OS.pango_attr_list_new();

7252

- int /*long*/ attr = OS.pango_attr_underline_new(OS.PANGO_UNDERLINE_LOW);

7253

+ long /*int*/ attr_list = OS.pango_attr_list_new();

7254

+ long /*int*/ attr = OS.pango_attr_underline_new(OS.PANGO_UNDERLINE_LOW);

7255

PangoAttribute attribute = new PangoAttribute();

7256

OS.memmove(attribute, attr, PangoAttribute.sizeof);

7257

attribute.start_index = buffer1.length;

7258

@@ -3843,7 +3843,7 @@

7259

SWT.error(SWT.ERROR_INVALID_ARGUMENT);

7260

}

7261

initCairo();

7262

- int /*long*/ options = Cairo.cairo_font_options_create();

7263

+ long /*int*/ options = Cairo.cairo_font_options_create();

7264

Cairo.cairo_font_options_set_antialias(options, mode);

7265

if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {

7266

Cairo.cairo_set_font_options(data.cairo, options);

7267

@@ -3885,7 +3885,7 @@

7268

if (transform != null && transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

7269

if (data.cairo == 0 && transform == null) return;

7270

initCairo();

7271

- int /*long*/ cairo = data.cairo;

7272

+ long /*int*/ cairo = data.cairo;

7273

double[] identity = identity();

7274

if (transform != null) {

7275

Cairo.cairo_matrix_multiply(identity, transform.handle, identity);

7276

@@ -4001,7 +4001,7 @@

7277

public Point textExtent(String string, int flags) {

7278

if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

7279

if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

7280

- int /*long*/ cairo = data.cairo;

7281

+ long /*int*/ cairo = data.cairo;

7282

if (cairo != 0) {

7283

if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {

7284

//TODO - honor flags

7285

diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics/Image.java

7286

--- x86/org/eclipse/swt/graphics/Image.java 2008-10-21 12:10:46.000000000 -0400

7287

+++ x86_64/org/eclipse/swt/graphics/Image.java 2009-09-17 08:48:24.000000000 -0400

7288

@@ -92,7 +92,7 @@

7289

* platforms and should never be accessed from application code.

7290

*

7291

*/

7292

- public int /*long*/ pixmap;

7293

+ public long /*int*/ pixmap;

7294

7295

/**

7296

* The handle to the OS mask resource.

7297

@@ -104,9 +104,9 @@

7298

* platforms and should never be accessed from application code.

7299

*

7300

*/

7301

- public int /*long*/ mask;

7302

+ public long /*int*/ mask;

7303

7304

- int /*long*/ surface, surfaceData;

7305

+ long /*int*/ surface, surfaceData;

7306

7307

/**

7308

* specifies the transparent pixel

7309

@@ -239,9 +239,9 @@

7310

if ((srcImage.type == SWT.ICON && srcImage.mask != 0) || srcImage.transparentPixel != -1) {

7311

/* Generate the mask if necessary. */

7312

if (srcImage.transparentPixel != -1) srcImage.createMask();

7313

- int /*long*/ mask = OS.gdk_pixmap_new(0, width, height, 1);

7314

+ long /*int*/ mask = OS.gdk_pixmap_new(0, width, height, 1);

7315

if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7316

- int /*long*/ gdkGC = OS.gdk_gc_new(mask);

7317

+ long /*int*/ gdkGC = OS.gdk_gc_new(mask);

7318

if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7319

OS.gdk_draw_drawable(mask, gdkGC, srcImage.mask, 0, 0, 0, 0, width, height);

7320

OS.g_object_unref(gdkGC);

7321

@@ -260,9 +260,9 @@

7322

createAlphaMask(width, height);

7323

7324

/* Create the new pixmap */

7325

- int /*long*/ pixmap = OS.gdk_pixmap_new (OS.GDK_ROOT_PARENT(), width, height, -1);

7326

+ long /*int*/ pixmap = OS.gdk_pixmap_new (OS.GDK_ROOT_PARENT(), width, height, -1);

7327

if (pixmap == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7328

- int /*long*/ gdkGC = OS.gdk_gc_new(pixmap);

7329

+ long /*int*/ gdkGC = OS.gdk_gc_new(pixmap);

7330

if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7331

this.pixmap = pixmap;

7332

7333

@@ -272,12 +272,12 @@

7334

} else {

7335

7336

/* Retrieve the source pixmap data */

7337

- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);

7338

+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);

7339

if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7340

- int /*long*/ colormap = OS.gdk_colormap_get_system();

7341

+ long /*int*/ colormap = OS.gdk_colormap_get_system();

7342

OS.gdk_pixbuf_get_from_drawable(pixbuf, srcImage.pixmap, colormap, 0, 0, 0, 0, width, height);

7343

int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);

7344

- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

7345

+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

7346

7347

/* Apply transformation */

7348

switch (flag) {

7349

@@ -539,7 +539,7 @@

7350

char [] chars = new char [length];

7351

filename.getChars (0, length, chars, 0);

7352

byte [] buffer = Converter.wcsToMbcs(null, chars, true);

7353

- int /*long*/ pixbuf = OS.gdk_pixbuf_new_from_file(buffer, null);

7354

+ long /*int*/ pixbuf = OS.gdk_pixbuf_new_from_file(buffer, null);

7355

if (pixbuf != 0) {

7356

boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha(pixbuf);

7357

if (hasAlpha) {

7358

@@ -553,7 +553,7 @@

7359

int width = OS.gdk_pixbuf_get_width(pixbuf);

7360

int height = OS.gdk_pixbuf_get_height(pixbuf);

7361

int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);

7362

- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

7363

+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

7364

byte[] line = new byte[stride];

7365

alphaData = new byte[width * height];

7366

for (int y = 0; y < height; y++) {

7367

@@ -566,7 +566,7 @@

7368

}

7369

createAlphaMask(width, height);

7370

}

7371

- int /*long*/ [] pixmap_return = new int /*long*/ [1];

7372

+ long /*int*/ [] pixmap_return = new long /*int*/ [1];

7373

OS.gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, null, 0);

7374

this.type = SWT.BITMAP;

7375

this.pixmap = pixmap_return[0];

7376

@@ -580,14 +580,14 @@

7377

if (device.useXRender && (alpha != -1 || alphaData != null)) {

7378

mask = OS.gdk_pixmap_new(0, alpha != -1 ? 1 : width, alpha != -1 ? 1 : height, 8);

7379

if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7380

- int /*long*/ gc = OS.gdk_gc_new(mask);

7381

+ long /*int*/ gc = OS.gdk_gc_new(mask);

7382

if (alpha != -1) {

7383

GdkColor color = new GdkColor();

7384

color.pixel = (alpha & 0xFF) << 8 | (alpha & 0xFF);

7385

OS.gdk_gc_set_foreground(gc, color);

7386

OS.gdk_draw_rectangle(mask, gc, 1, 0, 0, 1, 1);

7387

} else {

7388

- int /*long*/ imagePtr = OS.gdk_drawable_get_image(mask, 0, 0, width, height);

7389

+ long /*int*/ imagePtr = OS.gdk_drawable_get_image(mask, 0, 0, width, height);

7390

if (imagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7391

GdkImage gdkImage = new GdkImage();

7392

OS.memmove(gdkImage, imagePtr);

7393

@@ -616,7 +616,7 @@

7394

if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7395

}

7396

7397

-int /*long*/ createMask(ImageData image, boolean copy) {

7398

+long /*int*/ createMask(ImageData image, boolean copy) {

7399

ImageData mask = image.getTransparencyMask();

7400

byte[] data = mask.data;

7401

byte[] maskData = copy ? new byte[data.length] : data;

7402

@@ -638,21 +638,21 @@

7403

OS.gdk_drawable_get_size(pixmap, w, h);

7404

int width = w[0], height = h[0];

7405

if (mask != 0 || alpha != -1 || alphaData != null) {

7406

- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height);

7407

+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height);

7408

if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7409

- int /*long*/ colormap = OS.gdk_colormap_get_system();

7410

+ long /*int*/ colormap = OS.gdk_colormap_get_system();

7411

OS.gdk_pixbuf_get_from_drawable(pixbuf, pixmap, colormap, 0, 0, 0, 0, width, height);

7412

int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);

7413

- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

7414

+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

7415

byte[] line = new byte[stride];

7416

if (mask != 0 && OS.gdk_drawable_get_depth(mask) == 1) {

7417

- int /*long*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);

7418

+ long /*int*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);

7419

if (maskPixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7420

OS.gdk_pixbuf_get_from_drawable(maskPixbuf, mask, 0, 0, 0, 0, 0, width, height);

7421

int maskStride = OS.gdk_pixbuf_get_rowstride(maskPixbuf);

7422

- int /*long*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);

7423

+ long /*int*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);

7424

byte[] maskLine = new byte[maskStride];

7425

- int /*long*/ offset = pixels, maskOffset = maskPixels;

7426

+ long /*int*/ offset = pixels, maskOffset = maskPixels;

7427

for (int y=0; y<height; y++) {

7428

OS.memmove(line, offset, stride);

7429

OS.memmove(maskLine, maskOffset, maskStride);

7430

@@ -670,7 +670,7 @@

7431

}

7432

OS.g_object_unref(maskPixbuf);

7433

} else if (alpha != -1) {

7434

- int /*long*/ offset = pixels;

7435

+ long /*int*/ offset = pixels;

7436

for (int y=0; y<height; y++) {

7437

OS.memmove(line, offset, stride);

7438

for (int x=0, offset1=0; x<width; x++, offset1 += 4) {

7439

@@ -690,7 +690,7 @@

7440

offset += stride;

7441

}

7442

} else if (alphaData != null) {

7443

- int /*long*/ offset = pixels;

7444

+ long /*int*/ offset = pixels;

7445

for (int y = 0; y < h [0]; y++) {

7446

OS.memmove (line, offset, stride);

7447

for (int x=0, offset1=0; x<width; x++, offset1 += 4) {

7448

@@ -711,7 +711,7 @@

7449

offset += stride;

7450

}

7451

} else {

7452

- int /*long*/ offset = pixels;

7453

+ long /*int*/ offset = pixels;

7454

for (int y = 0; y < h [0]; y++) {

7455

OS.memmove (line, offset, stride);

7456

for (int x=0, offset1=0; x<width; x++, offset1 += 4) {

7457

@@ -729,9 +729,9 @@

7458

surface = Cairo.cairo_image_surface_create_for_data(surfaceData, Cairo.CAIRO_FORMAT_ARGB32, width, height, stride);

7459

OS.g_object_unref(pixbuf);

7460

} else {

7461

- int /*long*/ xDisplay = OS.GDK_DISPLAY();

7462

- int /*long*/ xDrawable = OS.GDK_PIXMAP_XID(pixmap);

7463

- int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());

7464

+ long /*int*/ xDisplay = OS.GDK_DISPLAY();

7465

+ long /*int*/ xDrawable = OS.GDK_PIXMAP_XID(pixmap);

7466

+ long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());

7467

surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height);

7468

}

7469

/* Destroy the image mask if the there is a GC created on the image */

7470

@@ -841,12 +841,12 @@

7471

int[] w = new int[1], h = new int[1];

7472

OS.gdk_drawable_get_size(pixmap, w, h);

7473

int width = w[0], height = h[0];

7474

- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);

7475

+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);

7476

if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7477

- int /*long*/ colormap = OS.gdk_colormap_get_system();

7478

+ long /*int*/ colormap = OS.gdk_colormap_get_system();

7479

OS.gdk_pixbuf_get_from_drawable(pixbuf, pixmap, colormap, 0, 0, 0, 0, width, height);

7480

int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);

7481

- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

7482

+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

7483

byte[] srcData = new byte[stride * height];

7484

OS.memmove(srcData, pixels, srcData.length);

7485

OS.g_object_unref(pixbuf);

7486

@@ -857,7 +857,7 @@

7487

7488

if (transparentPixel == -1 && type == SWT.ICON && mask != 0) {

7489

/* Get the icon mask data */

7490

- int /*long*/ gdkImagePtr = OS.gdk_drawable_get_image(mask, 0, 0, width, height);

7491

+ long /*int*/ gdkImagePtr = OS.gdk_drawable_get_image(mask, 0, 0, width, height);

7492

if (gdkImagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7493

GdkImage gdkImage = new GdkImage();

7494

OS.memmove(gdkImage, gdkImagePtr);

7495

@@ -909,7 +909,7 @@

7496

*

7497

* @private

7498

*/

7499

-public static Image gtk_new(Device device, int type, int /*long*/ pixmap, int /*long*/ mask) {

7500

+public static Image gtk_new(Device device, int type, long /*int*/ pixmap, long /*int*/ mask) {

7501

Image image = new Image(device);

7502

image.type = type;

7503

image.pixmap = pixmap;

7504

@@ -945,9 +945,9 @@

7505

white.red = (short)0xFFFF;

7506

white.green = (short)0xFFFF;

7507

white.blue = (short)0xFFFF;

7508

- int /*long*/ colormap = OS.gdk_colormap_get_system();

7509

+ long /*int*/ colormap = OS.gdk_colormap_get_system();

7510

OS.gdk_colormap_alloc_color(colormap, white, true, true);

7511

- int /*long*/ gdkGC = OS.gdk_gc_new(pixmap);

7512

+ long /*int*/ gdkGC = OS.gdk_gc_new(pixmap);

7513

OS.gdk_gc_set_foreground(gdkGC, white);

7514

OS.gdk_draw_rectangle(pixmap, gdkGC, 1, 0, 0, width, height);

7515

OS.g_object_unref(gdkGC);

7516

@@ -962,10 +962,10 @@

7517

if (!(((image.depth == 1 || image.depth == 2 || image.depth == 4 || image.depth == 8) && !palette.isDirect) ||

7518

((image.depth == 8) || (image.depth == 16 || image.depth == 24 || image.depth == 32) && palette.isDirect)))

7519

SWT.error (SWT.ERROR_UNSUPPORTED_DEPTH);

7520

- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);

7521

+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);

7522

if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7523

int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);

7524

- int /*long*/ data = OS.gdk_pixbuf_get_pixels(pixbuf);

7525

+ long /*int*/ data = OS.gdk_pixbuf_get_pixels(pixbuf);

7526

byte[] buffer = image.data;

7527

if (!palette.isDirect || image.depth != 24 || stride != image.bytesPerLine || palette.redMask != 0xFF0000 || palette.greenMask != 0xFF00 || palette.blueMask != 0xFF) {

7528

buffer = new byte[stride * height];

7529

@@ -996,9 +996,9 @@

7530

}

7531

}

7532

OS.memmove(data, buffer, stride * height);

7533

- int /*long*/ pixmap = OS.gdk_pixmap_new (OS.GDK_ROOT_PARENT(), width, height, -1);

7534

+ long /*int*/ pixmap = OS.gdk_pixmap_new (OS.GDK_ROOT_PARENT(), width, height, -1);

7535

if (pixmap == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7536

- int /*long*/ gdkGC = OS.gdk_gc_new(pixmap);

7537

+ long /*int*/ gdkGC = OS.gdk_gc_new(pixmap);

7538

if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7539

OS.gdk_pixbuf_render_to_drawable(pixbuf, pixmap, gdkGC, 0, 0, 0, 0, width, height, OS.GDK_RGB_DITHER_NORMAL, 0, 0);

7540

OS.g_object_unref(gdkGC);

7541

@@ -1019,7 +1019,7 @@

7542

transparentPixel = rgb.red << 16 | rgb.green << 8 | rgb.blue;

7543

}

7544

}

7545

- int /*long*/ mask = createMask(image, isIcon);

7546

+ long /*int*/ mask = createMask(image, isIcon);

7547

if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7548

this.mask = mask;

7549

if (isIcon) {

7550

@@ -1053,12 +1053,12 @@

7551

* @param data the platform specific GC data

7552

* @return the platform specific GC handle

7553

*/

7554

-public int /*long*/ internal_new_GC (GCData data) {

7555

+public long /*int*/ internal_new_GC (GCData data) {

7556

if (pixmap == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

7557

if (type != SWT.BITMAP || memGC != null) {

7558

SWT.error(SWT.ERROR_INVALID_ARGUMENT);

7559

}

7560

- int /*long*/ gdkGC = OS.gdk_gc_new(pixmap);

7561

+ long /*int*/ gdkGC = OS.gdk_gc_new(pixmap);

7562

if (data != null) {

7563

int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;

7564

if ((data.style & mask) == 0) {

7565

@@ -1091,7 +1091,7 @@

7566

* @param hDC the platform specific GC handle

7567

* @param data the platform specific GC data

7568

*/

7569

-public void internal_dispose_GC (int /*long*/ gdkGC, GCData data) {

7570

+public void internal_dispose_GC (long /*int*/ gdkGC, GCData data) {

7571

OS.g_object_unref(gdkGC);

7572

}

7573

7574

diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics/Path.java

7575

--- x86/org/eclipse/swt/graphics/Path.java 2008-06-05 13:32:04.000000000 -0400

7576

+++ x86_64/org/eclipse/swt/graphics/Path.java 2009-09-17 08:48:24.000000000 -0400

7577

@@ -47,7 +47,7 @@

7578

* platforms and should never be accessed from application code.

7579

*

7580

*/

7581

- public int /*long*/ handle;

7582

+ public long /*int*/ handle;

7583

7584

boolean moved, closed = true;

7585

7586

@@ -76,7 +76,7 @@

7587

public Path (Device device) {

7588

super(device);

7589

this.device.checkCairo();

7590

- int /*long*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1);

7591

+ long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1);

7592

if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7593

handle = Cairo.cairo_create(surface);

7594

Cairo.cairo_surface_destroy(surface);

7595

@@ -119,12 +119,12 @@

7596

super(device);

7597

if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

7598

if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

7599

- int /*long*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1);

7600

+ long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1);

7601

if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7602

handle = Cairo.cairo_create(surface);

7603

Cairo.cairo_surface_destroy(surface);

7604

if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7605

- int /*long*/ copy;

7606

+ long /*int*/ copy;

7607

flatness = Math.max(0, flatness);

7608

if (flatness == 0) {

7609

copy = Cairo.cairo_copy_path(path.handle);

7610

@@ -249,7 +249,7 @@

7611

if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

7612

if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

7613

moved = false;

7614

- int /*long*/ copy = Cairo.cairo_copy_path(path.handle);

7615

+ long /*int*/ copy = Cairo.cairo_copy_path(path.handle);

7616

if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7617

Cairo.cairo_append_path(handle, copy);

7618

Cairo.cairo_path_destroy(copy);

7619

@@ -348,8 +348,8 @@

7620

gc.initCairo();

7621

gc.checkGC(GC.LINE_CAP | GC.LINE_JOIN | GC.LINE_STYLE | GC.LINE_WIDTH);

7622

boolean result = false;

7623

- int /*long*/ cairo = gc.data.cairo;

7624

- int /*long*/ copy = Cairo.cairo_copy_path(handle);

7625

+ long /*int*/ cairo = gc.data.cairo;

7626

+ long /*int*/ copy = Cairo.cairo_copy_path(handle);

7627

if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7628

Cairo.cairo_append_path(cairo, copy);

7629

Cairo.cairo_path_destroy(copy);

7630

@@ -407,7 +407,7 @@

7631

if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

7632

if (bounds == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

7633

if (bounds.length < 4) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

7634

- int /*long*/ copy = Cairo.cairo_copy_path(handle);

7635

+ long /*int*/ copy = Cairo.cairo_copy_path(handle);

7636

if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7637

cairo_path_t path = new cairo_path_t();

7638

Cairo.memmove(path, copy, cairo_path_t.sizeof);

7639

@@ -419,7 +419,7 @@

7640

double[] points = new double[6];

7641

cairo_path_data_t data = new cairo_path_data_t();

7642

while (i < path.num_data) {

7643

- int /*long*/ offset = path.data + i * cairo_path_data_t.sizeof;

7644

+ long /*int*/ offset = path.data + i * cairo_path_data_t.sizeof;

7645

Cairo.memmove(data, offset, cairo_path_data_t.sizeof);

7646

switch (data.type) {

7647

case Cairo.CAIRO_PATH_MOVE_TO:

7648

@@ -500,7 +500,7 @@

7649

*/

7650

public PathData getPathData() {

7651

if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

7652

- int /*long*/ copy = Cairo.cairo_copy_path(handle);

7653

+ long /*int*/ copy = Cairo.cairo_copy_path(handle);

7654

if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);

7655

cairo_path_t path = new cairo_path_t();

7656

Cairo.memmove(path, copy, cairo_path_t.sizeof);

7657

@@ -512,7 +512,7 @@

7658

double[] points = new double[6];

7659

cairo_path_data_t data = new cairo_path_data_t();

7660

while (i < path.num_data) {

7661

- int /*long*/ offset = path.data + i * cairo_path_data_t.sizeof;

7662

+ long /*int*/ offset = path.data + i * cairo_path_data_t.sizeof;

7663

Cairo.memmove(data, offset, cairo_path_data_t.sizeof);

7664

switch (data.type) {

7665

case Cairo.CAIRO_PATH_MOVE_TO:

7666

diff -urN x86/org/eclipse/swt/graphics/Pattern.java x86_64/org/eclipse/swt/graphics/Pattern.java

7667

--- x86/org/eclipse/swt/graphics/Pattern.java 2008-06-05 13:32:04.000000000 -0400

7668

+++ x86_64/org/eclipse/swt/graphics/Pattern.java 2009-09-17 08:48:24.000000000 -0400

7669

@@ -44,9 +44,9 @@

7670

* platforms and should never be accessed from application code.

7671

*

7672

*/

7673

- public int /*long*/ handle;

7674

+ public long /*int*/ handle;

7675

7676

- int /*long*/ surface;

7677

+ long /*int*/ surface;

7678

7679

/**

7680

* Constructs a new Pattern given an image. Drawing with the resulting

7681

diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphics/Region.java

7682

--- x86/org/eclipse/swt/graphics/Region.java 2008-06-05 13:32:00.000000000 -0400

7683

+++ x86_64/org/eclipse/swt/graphics/Region.java 2009-09-17 08:48:24.000000000 -0400

7684

@@ -38,7 +38,7 @@

7685

* platforms and should never be accessed from application code.

7686

*

7687

*/

7688

- public int /*long*/ handle;

7689

+ public long /*int*/ handle;

7690

7691

/**

7692

* Constructs a new empty region.

7693

@@ -77,7 +77,7 @@

7694

init();

7695

}

7696

7697

-Region(Device device, int /*long*/ handle) {

7698

+Region(Device device, long /*int*/ handle) {

7699

super(device);

7700

this.handle = handle;

7701

}

7702

@@ -107,7 +107,7 @@

7703

* with enough points for a polygon.

7704

*/

7705

if (pointArray.length < 6) return;

7706

- int /*long*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE);

7707

+ long /*int*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE);

7708

OS.gdk_region_union(handle, polyRgn);

7709

OS.gdk_region_destroy(polyRgn);

7710

}

7711

@@ -263,7 +263,7 @@

7712

return new Rectangle(gdkRect.x, gdkRect.y, gdkRect.width, gdkRect.height);

7713

}

7714

7715

-public static Region gtk_new(Device device, int /*long*/ handle) {

7716

+public static Region gtk_new(Device device, long /*int*/ handle) {

7717

return new Region(device, handle);

7718

}

7719

7720

@@ -329,7 +329,7 @@

7721

gdkRect.y = y;

7722

gdkRect.width = width;

7723

gdkRect.height = height;

7724

- int /*long*/ rectRgn = OS.gdk_region_rectangle(gdkRect);

7725

+ long /*int*/ rectRgn = OS.gdk_region_rectangle(gdkRect);

7726

OS.gdk_region_intersect(handle, rectRgn);

7727

OS.gdk_region_destroy(rectRgn);

7728

}

7729

@@ -460,7 +460,7 @@

7730

* with enough points for a polygon.

7731

*/

7732

if (pointArray.length < 6) return;

7733

- int /*long*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE);

7734

+ long /*int*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE);

7735

OS.gdk_region_subtract(handle, polyRgn);

7736

OS.gdk_region_destroy(polyRgn);

7737

}

7738

@@ -513,7 +513,7 @@

7739

gdkRect.y = y;

7740

gdkRect.width = width;

7741

gdkRect.height = height;

7742

- int /*long*/ rectRgn = OS.gdk_region_rectangle(gdkRect);

7743

+ long /*int*/ rectRgn = OS.gdk_region_rectangle(gdkRect);

7744

OS.gdk_region_subtract(handle, rectRgn);

7745

OS.gdk_region_destroy(rectRgn);

7746

}

7747

diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/graphics/TextLayout.java

7748

--- x86/org/eclipse/swt/graphics/TextLayout.java 2009-05-29 17:30:26.000000000 -0400

7749

+++ x86_64/org/eclipse/swt/graphics/TextLayout.java 2009-09-17 08:48:24.000000000 -0400

7750

@@ -51,7 +51,7 @@

7751

int[] segments;

7752

int[] tabs;

7753

StyleItem[] styles;

7754

- int /*long*/ layout, context, attrList;

7755

+ long /*int*/ layout, context, attrList;

7756

int[] invalidOffsets;

7757

static final char LTR_MARK = '\u200E', RTL_MARK = '\u200F', ZWS = '\u200B', ZWNBS = '\uFEFF';

7758

7759

@@ -103,7 +103,7 @@

7760

byte[] buffer = Converter.wcsToMbcs(null, segmentsText, false);

7761

OS.pango_layout_set_text (layout, buffer, buffer.length);

7762

if (styles.length == 2 && styles[0].style == null && ascent == -1 && descent == -1 && segments == null) return;

7763

- int /*long*/ ptr = OS.pango_layout_get_text(layout);

7764

+ long /*int*/ ptr = OS.pango_layout_get_text(layout);

7765

attrList = OS.pango_attr_list_new();

7766

PangoAttribute attribute = new PangoAttribute();

7767

char[] chars = null;

7768

@@ -117,12 +117,12 @@

7769

int oldPos = 0, lineIndex = 0;

7770

PangoLayoutLine line = new PangoLayoutLine();

7771

while (lineIndex < lineCount) {

7772

- int /*long*/ linePtr = OS.pango_layout_get_line(layout, lineIndex);

7773

+ long /*int*/ linePtr = OS.pango_layout_get_line(layout, lineIndex);

7774

OS.memmove(line, linePtr, PangoLayoutLine.sizeof);

7775

int bytePos = line.start_index;

7776

/* Note: The length in bytes of ZWS and ZWNBS are both equals to 3 */

7777

int offset = lineIndex * 6;

7778

- int /*long*/ attr = OS.pango_attr_shape_new (rect, rect);

7779

+ long /*int*/ attr = OS.pango_attr_shape_new (rect, rect);

7780

OS.memmove (attribute, attr, PangoAttribute.sizeof);

7781

attribute.start_index = bytePos + offset;

7782

attribute.end_index = bytePos + offset + 3;

7783

@@ -178,7 +178,7 @@

7784

byteEnd = Math.min(byteEnd, strlen);

7785

Font font = style.font;

7786

if (font != null && !font.isDisposed() && !defaultFont.equals(font)) {

7787

- int /*long*/ attr = OS.pango_attr_font_desc_new (font.handle);

7788

+ long /*int*/ attr = OS.pango_attr_font_desc_new (font.handle);

7789

OS.memmove (attribute, attr, PangoAttribute.sizeof);

7790

attribute.start_index = byteStart;

7791

attribute.end_index = byteEnd;

7792

@@ -202,7 +202,7 @@

7793

break;

7794

case SWT.UNDERLINE_LINK: {

7795

if (style.foreground == null) {

7796

- int /*long*/ attr = OS.pango_attr_foreground_new((short)0, (short)0x3333, (short)0x9999);

7797

+ long /*int*/ attr = OS.pango_attr_foreground_new((short)0, (short)0x3333, (short)0x9999);

7798

OS.memmove (attribute, attr, PangoAttribute.sizeof);

7799

attribute.start_index = byteStart;

7800

attribute.end_index = byteEnd;

7801

@@ -216,7 +216,7 @@

7802

}

7803

}

7804

if (underlineStyle != OS.PANGO_UNDERLINE_NONE && style.underlineColor == null) {

7805

- int /*long*/ attr = OS.pango_attr_underline_new(underlineStyle);

7806

+ long /*int*/ attr = OS.pango_attr_underline_new(underlineStyle);

7807

OS.memmove(attribute, attr, PangoAttribute.sizeof);

7808

attribute.start_index = byteStart;

7809

attribute.end_index = byteEnd;

7810

@@ -225,7 +225,7 @@

7811

}

7812

}

7813

if (style.strikeout && style.strikeoutColor == null) {

7814

- int /*long*/ attr = OS.pango_attr_strikethrough_new(true);

7815

+ long /*int*/ attr = OS.pango_attr_strikethrough_new(true);

7816

OS.memmove(attribute, attr, PangoAttribute.sizeof);

7817

attribute.start_index = byteStart;

7818

attribute.end_index = byteEnd;

7819

@@ -235,7 +235,7 @@

7820

Color foreground = style.foreground;

7821

if (foreground != null && !foreground.isDisposed()) {

7822

GdkColor fg = foreground.handle;

7823

- int /*long*/ attr = OS.pango_attr_foreground_new(fg.red, fg.green, fg.blue);

7824

+ long /*int*/ attr = OS.pango_attr_foreground_new(fg.red, fg.green, fg.blue);

7825

OS.memmove (attribute, attr, PangoAttribute.sizeof);

7826

attribute.start_index = byteStart;

7827

attribute.end_index = byteEnd;

7828

@@ -245,7 +245,7 @@

7829

Color background = style.background;

7830

if (background != null && !background.isDisposed()) {

7831

GdkColor bg = background.handle;

7832

- int /*long*/ attr = OS.pango_attr_background_new(bg.red, bg.green, bg.blue);

7833

+ long /*int*/ attr = OS.pango_attr_background_new(bg.red, bg.green, bg.blue);

7834

OS.memmove (attribute, attr, PangoAttribute.sizeof);

7835

attribute.start_index = byteStart;

7836

attribute.end_index = byteEnd;

7837

@@ -258,7 +258,7 @@

7838

rect.y = -(metrics.ascent * OS.PANGO_SCALE);

7839

rect.height = (metrics.ascent + metrics.descent) * OS.PANGO_SCALE;

7840

rect.width = metrics.width * OS.PANGO_SCALE;

7841

- int /*long*/ attr = OS.pango_attr_shape_new (rect, rect);

7842

+ long /*int*/ attr = OS.pango_attr_shape_new (rect, rect);

7843

OS.memmove (attribute, attr, PangoAttribute.sizeof);

7844

attribute.start_index = byteStart;

7845

attribute.end_index = byteEnd;

7846

@@ -267,7 +267,7 @@

7847

}

7848

int rise = style.rise;

7849

if (rise != 0) {

7850

- int /*long*/ attr = OS.pango_attr_rise_new (rise * OS.PANGO_SCALE);

7851

+ long /*int*/ attr = OS.pango_attr_rise_new (rise * OS.PANGO_SCALE);

7852

OS.memmove (attribute, attr, PangoAttribute.sizeof);

7853

attribute.start_index = byteStart;

7854

attribute.end_index = byteEnd;

7855

@@ -392,15 +392,15 @@

7856

int length = text.length();

7857

boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1;

7858

GCData data = gc.data;

7859

- int /*long*/ cairo = data.cairo;

7860

+ long /*int*/ cairo = data.cairo;

7861

if (flags != 0 && (hasSelection || (flags & SWT.LAST_LINE_SELECTION) != 0)) {

7862

- int /*long*/[] attrs = new int /*long*/[1];

7863

+ long /*int*/[] attrs = new long /*int*/[1];

7864

int[] nAttrs = new int[1];

7865

PangoLogAttr logAttr = new PangoLogAttr();

7866

PangoRectangle rect = new PangoRectangle();

7867

int lineCount = OS.pango_layout_get_line_count(layout);

7868

- int /*long*/ ptr = OS.pango_layout_get_text(layout);

7869

- int /*long*/ iter = OS.pango_layout_get_iter(layout);

7870

+ long /*int*/ ptr = OS.pango_layout_get_text(layout);

7871

+ long /*int*/ iter = OS.pango_layout_get_iter(layout);

7872

if (selectionBackground == null) selectionBackground = device.getSystemColor(SWT.COLOR_LIST_SELECTION);

7873

if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {

7874

Cairo.cairo_save(cairo);

7875

@@ -487,7 +487,7 @@

7876

boolean fullSelection = selectionStart == 0 && selectionEnd == length - 1;

7877

if (fullSelection) {

7878

if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {

7879

- int /*long*/ ptr = OS.pango_layout_get_text(layout);

7880

+ long /*int*/ ptr = OS.pango_layout_get_text(layout);

7881

if ((data.style & SWT.MIRRORED) != 0) {

7882

Cairo.cairo_save(cairo);

7883

Cairo.cairo_scale(cairo, -1, 1);

7884

@@ -502,7 +502,7 @@

7885

drawBorder(gc, x, y, selectionForeground.handle);

7886

}

7887

} else {

7888

- int /*long*/ ptr = OS.pango_layout_get_text(layout);

7889

+ long /*int*/ ptr = OS.pango_layout_get_text(layout);

7890

int byteSelStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, selectionStart) - ptr);

7891

int byteSelEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, selectionEnd + 1) - ptr);

7892

int strlen = OS.strlen(ptr);

7893

@@ -524,7 +524,7 @@

7894

OS.gdk_draw_layout(data.drawable, gc.handle, x, y, layout);

7895

drawBorder(gc, x, y, null);

7896

int[] ranges = new int[]{byteSelStart, byteSelEnd};

7897

- int /*long*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);

7898

+ long /*int*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);

7899

if (rgn != 0) {

7900

OS.gdk_gc_set_clip_region(gc.handle, rgn);

7901

OS.gdk_region_destroy(rgn);

7902

@@ -540,7 +540,7 @@

7903

7904

void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelection, GdkColor fg, GdkColor bg) {

7905

GCData data = gc.data;

7906

- int /*long*/ cairo = data.cairo;

7907

+ long /*int*/ cairo = data.cairo;

7908

Cairo.cairo_save(cairo);

7909

if (!fullSelection) {

7910

Cairo.cairo_move_to(cairo, x, y);

7911

@@ -548,7 +548,7 @@

7912

drawBorder(gc, x, y, null);

7913

}

7914

int[] ranges = new int[]{start, end};

7915

- int /*long*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);

7916

+ long /*int*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);

7917

if (rgn != 0) {

7918

OS.gdk_cairo_region(cairo, rgn);

7919

Cairo.cairo_clip(cairo);

7920

@@ -565,9 +565,9 @@

7921

7922

void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {

7923

GCData data = gc.data;

7924

- int /*long*/ cairo = data.cairo;

7925

- int /*long*/ gdkGC = gc.handle;

7926

- int /*long*/ ptr = OS.pango_layout_get_text(layout);

7927

+ long /*int*/ cairo = data.cairo;

7928

+ long /*int*/ gdkGC = gc.handle;

7929

+ long /*int*/ ptr = OS.pango_layout_get_text(layout);

7930

GdkGCValues gcValues = null;

7931

if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {

7932

Cairo.cairo_save(cairo);

7933

@@ -587,10 +587,10 @@

7934

int byteStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, start) - ptr);

7935

int byteEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, end + 1) - ptr);

7936

int[] ranges = new int[]{byteStart, byteEnd};

7937

- int /*long*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);

7938

+ long /*int*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);

7939

if (rgn != 0) {

7940

int[] nRects = new int[1];

7941

- int /*long*/[] rects = new int /*long*/[1];

7942

+ long /*int*/[] rects = new long /*int*/[1];

7943

OS.gdk_region_get_rectangles(rgn, rects, nRects);

7944

GdkRectangle rect = new GdkRectangle();

7945

GdkColor color = null;

7946

@@ -665,10 +665,10 @@

7947

int byteStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, start) - ptr);

7948

int byteEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, end + 1) - ptr);

7949

int[] ranges = new int[]{byteStart, byteEnd};

7950

- int /*long*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);

7951

+ long /*int*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);

7952

if (rgn != 0) {

7953

int[] nRects = new int[1];

7954

- int /*long*/[] rects = new int /*long*/[1];

7955

+ long /*int*/[] rects = new long /*int*/[1];

7956

OS.gdk_region_get_rectangles(rgn, rects, nRects);

7957

GdkRectangle rect = new GdkRectangle();

7958

GdkColor color = null;

7959

@@ -691,8 +691,8 @@

7960

Font font = style.font;

7961

if (font == null) font = this.font;

7962

if (font == null) font = device.systemFont;

7963

- int /*long*/ lang = OS.pango_context_get_language(context);

7964

- int /*long*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang);

7965

+ long /*int*/ lang = OS.pango_context_get_language(context);

7966

+ long /*int*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang);

7967

underlinePosition = OS.PANGO_PIXELS(OS.pango_font_metrics_get_underline_position(metrics));

7968

underlineThickness = OS.PANGO_PIXELS(OS.pango_font_metrics_get_underline_thickness(metrics));

7969

OS.pango_font_metrics_unref(metrics);

7970

@@ -764,10 +764,10 @@

7971

int byteStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, start) - ptr);

7972

int byteEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, end + 1) - ptr);

7973

int[] ranges = new int[]{byteStart, byteEnd};

7974

- int /*long*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);

7975

+ long /*int*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);

7976

if (rgn != 0) {

7977

int[] nRects = new int[1];

7978

- int /*long*/[] rects = new int /*long*/[1];

7979

+ long /*int*/[] rects = new long /*int*/[1];

7980

OS.gdk_region_get_rectangles(rgn, rects, nRects);

7981

GdkRectangle rect = new GdkRectangle();

7982

GdkColor color = null;

7983

@@ -790,8 +790,8 @@

7984

Font font = style.font;

7985

if (font == null) font = this.font;

7986

if (font == null) font = device.systemFont;

7987

- int /*long*/ lang = OS.pango_context_get_language(context);

7988

- int /*long*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang);

7989

+ long /*int*/ lang = OS.pango_context_get_language(context);

7990

+ long /*int*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang);

7991

strikeoutPosition = OS.PANGO_PIXELS(OS.pango_font_metrics_get_strikethrough_position(metrics));

7992

strikeoutThickness = OS.PANGO_PIXELS(OS.pango_font_metrics_get_strikethrough_thickness(metrics));

7993

OS.pango_font_metrics_unref(metrics);

7994

@@ -930,14 +930,14 @@

7995

end = Math.min(Math.max(0, end), length - 1);

7996

start = translateOffset(start);

7997

end = translateOffset(end);

7998

- int /*long*/ ptr = OS.pango_layout_get_text(layout);

7999

+ long /*int*/ ptr = OS.pango_layout_get_text(layout);

8000

int byteStart = (int)/*64*/(OS.g_utf8_offset_to_pointer (ptr, start) - ptr);

8001

int byteEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer (ptr, end + 1) - ptr);

8002

int strlen = OS.strlen(ptr);

8003

byteStart = Math.min(byteStart, strlen);

8004

byteEnd = Math.min(byteEnd, strlen);

8005

int[] ranges = new int[]{byteStart, byteEnd};

8006

- int /*long*/ clipRegion = OS.gdk_pango_layout_get_clip_region(layout, 0, 0, ranges, 1);

8007

+ long /*int*/ clipRegion = OS.gdk_pango_layout_get_clip_region(layout, 0, 0, ranges, 1);

8008

if (clipRegion == 0) return new Rectangle(0, 0, 0, 0);

8009

GdkRectangle rect = new GdkRectangle();

8010

8011

@@ -947,9 +947,9 @@

8012

* is to subtract these areas from the clip region.

8013

*/

8014

PangoRectangle pangoRect = new PangoRectangle();

8015

- int /*long*/ iter = OS.pango_layout_get_iter(layout);

8016

+ long /*int*/ iter = OS.pango_layout_get_iter(layout);

8017

if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);

8018

- int /*long*/ linesRegion = OS.gdk_region_new();

8019

+ long /*int*/ linesRegion = OS.gdk_region_new();

8020

if (linesRegion == 0) SWT.error(SWT.ERROR_NO_HANDLES);

8021

int lineEnd = 0;

8022

do {

8023

@@ -1064,17 +1064,17 @@

8024

int length = text.length();

8025

if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);

8026

offset = translateOffset(offset);

8027

- int /*long*/ iter = OS.pango_layout_get_iter(layout);

8028

+ long /*int*/ iter = OS.pango_layout_get_iter(layout);

8029

if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);

8030

int level = 0;

8031

PangoItem item = new PangoItem();

8032

PangoLayoutRun run = new PangoLayoutRun();

8033

- int /*long*/ ptr = OS.pango_layout_get_text(layout);

8034

- int /*long*/ byteOffset = OS.g_utf8_offset_to_pointer(ptr, offset) - ptr;

8035

+ long /*int*/ ptr = OS.pango_layout_get_text(layout);

8036

+ long /*int*/ byteOffset = OS.g_utf8_offset_to_pointer(ptr, offset) - ptr;

8037

int strlen = OS.strlen(ptr);

8038

byteOffset = Math.min(byteOffset, strlen);

8039

do {

8040

- int /*long*/ runPtr = OS.pango_layout_iter_get_run(iter);

8041

+ long /*int*/ runPtr = OS.pango_layout_iter_get_run(iter);

8042

if (runPtr != 0) {

8043

OS.memmove(run, runPtr, PangoLayoutRun.sizeof);

8044

OS.memmove(item, run.item, PangoItem.sizeof);

8045

@@ -1106,7 +1106,7 @@

8046

computeRuns();

8047

int lineCount = OS.pango_layout_get_line_count(layout);

8048

if (!(0 <= lineIndex && lineIndex < lineCount)) SWT.error(SWT.ERROR_INVALID_RANGE);

8049

- int /*long*/ iter = OS.pango_layout_get_iter(layout);

8050

+ long /*int*/ iter = OS.pango_layout_get_iter(layout);

8051

if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);

8052

for (int i = 0; i < lineIndex; i++) OS.pango_layout_iter_next_line(iter);

8053

PangoRectangle rect = new PangoRectangle();

8054

@@ -1162,11 +1162,11 @@

8055

if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

8056

offset = translateOffset(offset);

8057

int line = 0;

8058

- int /*long*/ ptr = OS.pango_layout_get_text(layout);

8059

- int /*long*/ byteOffset = OS.g_utf8_offset_to_pointer(ptr,offset) - ptr;

8060

+ long /*int*/ ptr = OS.pango_layout_get_text(layout);

8061

+ long /*int*/ byteOffset = OS.g_utf8_offset_to_pointer(ptr,offset) - ptr;

8062

int strlen = OS.strlen(ptr);

8063

byteOffset = Math.min(byteOffset, strlen);

8064

- int /*long*/ iter = OS.pango_layout_get_iter(layout);

8065

+ long /*int*/ iter = OS.pango_layout_get_iter(layout);

8066

if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);

8067

while (OS.pango_layout_iter_next_line(iter)) {

8068

if (OS.pango_layout_iter_get_index(iter) > byteOffset) break;

8069

@@ -1198,9 +1198,9 @@

8070

PangoLayoutLine line = new PangoLayoutLine();

8071

OS.memmove(line, OS.pango_layout_get_line(layout, lineIndex), PangoLayoutLine.sizeof);

8072

if (line.runs == 0) {

8073

- int /*long*/ font = this.font != null ? this.font.handle : device.systemFont.handle;

8074

- int /*long*/ lang = OS.pango_context_get_language(context);

8075

- int /*long*/ metrics = OS.pango_context_get_metrics(context, font, lang);

8076

+ long /*int*/ font = this.font != null ? this.font.handle : device.systemFont.handle;

8077

+ long /*int*/ lang = OS.pango_context_get_language(context);

8078

+ long /*int*/ metrics = OS.pango_context_get_metrics(context, font, lang);

8079

ascent = OS.pango_font_metrics_get_ascent(metrics);

8080

descent = OS.pango_font_metrics_get_descent(metrics);

8081

OS.pango_font_metrics_unref(metrics);

8082

@@ -1231,10 +1231,10 @@

8083

computeRuns();

8084

int lineCount = OS.pango_layout_get_line_count(layout);

8085

int[] offsets = new int [lineCount + 1];

8086

- int /*long*/ ptr = OS.pango_layout_get_text(layout);

8087

+ long /*int*/ ptr = OS.pango_layout_get_text(layout);

8088

PangoLayoutLine line = new PangoLayoutLine();

8089

for (int i = 0; i < lineCount; i++) {

8090

- int /*long*/ linePtr = OS.pango_layout_get_line(layout, i);

8091

+ long /*int*/ linePtr = OS.pango_layout_get_line(layout, i);

8092

OS.memmove(line, linePtr, PangoLayoutLine.sizeof);

8093

int pos = (int)/*64*/OS.g_utf8_pointer_to_offset(ptr, ptr + line.start_index);

8094

offsets[i] = untranslateOffset(pos);

8095

@@ -1265,7 +1265,7 @@

8096

int length = text.length();

8097

if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);

8098

offset = translateOffset(offset);

8099

- int /*long*/ ptr = OS.pango_layout_get_text(layout);

8100

+ long /*int*/ ptr = OS.pango_layout_get_text(layout);

8101

int byteOffset = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, offset) - ptr);

8102

int strlen = OS.strlen(ptr);

8103

byteOffset = Math.min(byteOffset, strlen);

8104

@@ -1315,7 +1315,7 @@

8105

}

8106

int step = forward ? 1 : -1;

8107

if ((movement & SWT.MOVEMENT_CHAR) != 0) return offset + step;

8108

- int /*long*/[] attrs = new int /*long*/[1];

8109

+ long /*int*/[] attrs = new long /*int*/[1];

8110

int[] nAttrs = new int[1];

8111

OS.pango_layout_get_log_attrs(layout, attrs, nAttrs);

8112

if (attrs[0] == 0) return offset + step;

8113

@@ -1412,7 +1412,7 @@

8114

* visual offset. The fix is to clamp the coordinates inside the

8115

* line bounds.

8116

*/

8117

- int /*long*/ iter = OS.pango_layout_get_iter(layout);

8118

+ long /*int*/ iter = OS.pango_layout_get_iter(layout);

8119

if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);

8120

PangoRectangle rect = new PangoRectangle();

8121

do {

8122

@@ -1432,7 +1432,7 @@

8123

int[] index = new int[1];

8124

int[] piTrailing = new int[1];

8125

OS.pango_layout_xy_to_index(layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, piTrailing);

8126

- int /*long*/ ptr = OS.pango_layout_get_text(layout);

8127

+ long /*int*/ ptr = OS.pango_layout_get_text(layout);

8128

int offset = (int)/*64*/OS.g_utf8_pointer_to_offset(ptr, ptr + index[0]);

8129

if (trailing != null) trailing[0] = piTrailing[0];

8130

return untranslateOffset(offset);

8131

@@ -2037,7 +2037,7 @@

8132

if (tabs == null) {

8133

OS.pango_layout_set_tabs(layout, device.emptyTab);

8134

} else {

8135

- int /*long*/ tabArray = OS.pango_tab_array_new(tabs.length, true);

8136

+ long /*int*/ tabArray = OS.pango_tab_array_new(tabs.length, true);

8137

if (tabArray != 0) {

8138

for (int i = 0; i < tabs.length; i++) {

8139

OS.pango_tab_array_set_tab(tabArray, i, OS.PANGO_TAB_LEFT, tabs[i]);

8140

diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java

8141

--- x86/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java 2009-05-29 17:30:18.000000000 -0400

8142

+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java 2009-09-17 08:48:24.000000000 -0400

8143

@@ -18,17 +18,17 @@

8144

public class AtkActionIface {

8145

// GTypeInterface parent;

8146

/** @field cast=(gboolean (*)()) */

8147

- public int /*long*/ do_action;

8148

+ public long /*int*/ do_action;

8149

/** @field cast=(gint (*)()) */

8150

- public int /*long*/ get_n_actions;

8151

+ public long /*int*/ get_n_actions;

8152

/** @field cast=(G_CONST_RETURN gchar *(*)()) */

8153

- public int /*long*/ get_description;

8154

+ public long /*int*/ get_description;

8155

/** @field cast=(G_CONST_RETURN gchar *(*)()) */

8156

- public int /*long*/ get_name;

8157

+ public long /*int*/ get_name;

8158

/** @field cast=(G_CONST_RETURN gchar *(*)()) */

8159

- public int /*long*/ get_keybinding;

8160

+ public long /*int*/ get_keybinding;

8161

/** @field cast=(gboolean (*)()) */

8162

- public int /*long*/ set_description;

8163

+ public long /*int*/ set_description;

8164

// AtkFunction pad1;

8165

// AtkFunction pad2;

8166

}

8167

diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java

8168

--- x86/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java 2009-05-29 17:30:18.000000000 -0400

8169

+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java 2009-09-17 08:48:24.000000000 -0400

8170

@@ -17,29 +17,29 @@

8171

8172

public class AtkComponentIface {

8173

/** @field cast=(guint (*)()) */

8174

- public int /*long*/ add_focus_handler;

8175

+ public long /*int*/ add_focus_handler;

8176

/** @field cast=(gboolean (*)()) */

8177

- public int /*long*/ contains;

8178

+ public long /*int*/ contains;

8179

/** @field cast=(AtkObject *(*)()) */

8180

- public int /*long*/ ref_accessible_at_point;

8181

+ public long /*int*/ ref_accessible_at_point;

8182

/** @field cast=(void (*)()) */

8183

- public int /*long*/ get_extents;

8184

+ public long /*int*/ get_extents;

8185

/** @field cast=(void (*)()) */

8186

- public int /*long*/ get_position;

8187

+ public long /*int*/ get_position;

8188

/** @field cast=(void (*)()) */

8189

- public int /*long*/ get_size;

8190

+ public long /*int*/ get_size;

8191

/** @field cast=(gboolean (*)()) */

8192

- public int /*long*/ grab_focus;

8193

+ public long /*int*/ grab_focus;

8194

/** @field cast=(void (*)()) */

8195

- public int /*long*/ remove_focus_handler;

8196

+ public long /*int*/ remove_focus_handler;

8197

/** @field cast=(gboolean (*)()) */

8198

- public int /*long*/ set_extents;

8199

+ public long /*int*/ set_extents;

8200

/** @field cast=(gboolean (*)()) */

8201

- public int /*long*/ set_position;

8202

+ public long /*int*/ set_position;

8203

/** @field cast=(gboolean (*)()) */

8204

- public int /*long*/ set_size;

8205

+ public long /*int*/ set_size;

8206

/** @field cast=(AtkLayer (*)()) */

8207

- public int /*long*/ get_layer;

8208

+ public long /*int*/ get_layer;

8209

/** @field cast=(gint (*)()) */

8210

- public int /*long*/ get_mdi_zorder;

8211

+ public long /*int*/ get_mdi_zorder;

8212

}

8213

diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java

8214

--- x86/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java 2009-05-29 17:30:18.000000000 -0400

8215

+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java 2009-09-17 08:48:24.000000000 -0400

8216

@@ -17,9 +17,9 @@

8217

8218

public class AtkHypertextIface {

8219

/** @field cast=(AtkHyperlink *(*)()) */

8220

- public int /*long*/ get_link;

8221

+ public long /*int*/ get_link;

8222

/** @field cast=(gint (*)()) */

8223

- public int /*long*/ get_n_links;

8224

+ public long /*int*/ get_n_links;

8225

/** @field cast=(gint (*)()) */

8226

- public int /*long*/ get_link_index;

8227

+ public long /*int*/ get_link_index;

8228

}

8229

diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/eclipse/swt/internal/accessibility/gtk/ATK.java

8230

--- x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java 2009-05-29 17:30:18.000000000 -0400

8231

+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/ATK.java 2009-09-17 08:48:24.000000000 -0400

8232

@@ -90,8 +90,8 @@

8233

public static final native int AtkObjectFactoryClass_sizeof ();

8234

8235

/** Natives */

8236

-public static final native int /*long*/ _ATK_ACTION_GET_IFACE (int /*long*/ obj);

8237

-public static final int /*long*/ ATK_ACTION_GET_IFACE (int /*long*/ obj) {

8238

+public static final native long /*int*/ _ATK_ACTION_GET_IFACE (long /*int*/ obj);

8239

+public static final long /*int*/ ATK_ACTION_GET_IFACE (long /*int*/ obj) {

8240

lock.lock();

8241

try {

8242

return _ATK_ACTION_GET_IFACE(obj);

8243

@@ -99,8 +99,8 @@

8244

lock.unlock();

8245

}

8246

}

8247

-public static final native int /*long*/ _ATK_COMPONENT_GET_IFACE(int /*long*/ atkHandle);

8248

-public static final int /*long*/ ATK_COMPONENT_GET_IFACE(int /*long*/ atkHandle) {

8249

+public static final native long /*int*/ _ATK_COMPONENT_GET_IFACE(long /*int*/ atkHandle);

8250

+public static final long /*int*/ ATK_COMPONENT_GET_IFACE(long /*int*/ atkHandle) {

8251

lock.lock();

8252

try {

8253

return _ATK_COMPONENT_GET_IFACE(atkHandle);

8254

@@ -108,8 +108,8 @@

8255

lock.unlock();

8256

}

8257

}

8258

-public static final native int /*long*/ _ATK_OBJECT_FACTORY_CLASS (int /*long*/ klass);

8259

-public static final int /*long*/ ATK_OBJECT_FACTORY_CLASS (int /*long*/ klass) {

8260

+public static final native long /*int*/ _ATK_OBJECT_FACTORY_CLASS (long /*int*/ klass);

8261

+public static final long /*int*/ ATK_OBJECT_FACTORY_CLASS (long /*int*/ klass) {

8262

lock.lock();

8263

try {

8264

return _ATK_OBJECT_FACTORY_CLASS(klass);

8265

@@ -117,8 +117,8 @@

8266

lock.unlock();

8267

}

8268

}

8269

-public static final native int /*long*/ _ATK_SELECTION_GET_IFACE (int /*long*/ obj);

8270

-public static final int /*long*/ ATK_SELECTION_GET_IFACE (int /*long*/ obj) {

8271

+public static final native long /*int*/ _ATK_SELECTION_GET_IFACE (long /*int*/ obj);

8272

+public static final long /*int*/ ATK_SELECTION_GET_IFACE (long /*int*/ obj) {

8273

lock.lock();

8274

try {

8275

return _ATK_SELECTION_GET_IFACE(obj);

8276

@@ -126,8 +126,8 @@

8277

lock.unlock();

8278

}

8279

}

8280

-public static final native int /*long*/ _ATK_TEXT_GET_IFACE (int /*long*/ handle);

8281

-public static final int /*long*/ ATK_TEXT_GET_IFACE (int /*long*/ handle) {

8282

+public static final native long /*int*/ _ATK_TEXT_GET_IFACE (long /*int*/ handle);

8283

+public static final long /*int*/ ATK_TEXT_GET_IFACE (long /*int*/ handle) {

8284

lock.lock();

8285

try {

8286

return _ATK_TEXT_GET_IFACE(handle);

8287

@@ -135,8 +135,8 @@

8288

lock.unlock();

8289

}

8290

}

8291

-public static final native int /*long*/ _GTK_ACCESSIBLE (int /*long*/ handle);

8292

-public static final int /*long*/ GTK_ACCESSIBLE (int /*long*/ handle) {

8293

+public static final native long /*int*/ _GTK_ACCESSIBLE (long /*int*/ handle);

8294

+public static final long /*int*/ GTK_ACCESSIBLE (long /*int*/ handle) {

8295

lock.lock();

8296

try {

8297

return _GTK_ACCESSIBLE(handle);

8298

@@ -145,8 +145,8 @@

8299

}

8300

}

8301

/** @param object cast=(AtkObject *) */

8302

-public static final native void _atk_focus_tracker_notify (int /*long*/ object);

8303

-public static final void atk_focus_tracker_notify (int /*long*/ object) {

8304

+public static final native void _atk_focus_tracker_notify (long /*int*/ object);

8305

+public static final void atk_focus_tracker_notify (long /*int*/ object) {

8306

lock.lock();

8307

try {

8308

_atk_focus_tracker_notify(object);

8309

@@ -154,8 +154,8 @@

8310

lock.unlock();

8311

}

8312

}

8313

-public static final native int /*long*/ _atk_get_default_registry ();

8314

-public static final int /*long*/ atk_get_default_registry () {

8315

+public static final native long /*int*/ _atk_get_default_registry ();

8316

+public static final long /*int*/ atk_get_default_registry () {

8317

lock.lock();

8318

try {

8319

return _atk_get_default_registry();

8320

@@ -167,8 +167,8 @@

8321

* @param factory cast=(AtkObjectFactory *)

8322

* @param obj cast=(GObject *)

8323

*/

8324

-public static final native int /*long*/ _atk_object_factory_create_accessible (int /*long*/ factory, int /*long*/ obj);

8325

-public static final int /*long*/ atk_object_factory_create_accessible (int /*long*/ factory, int /*long*/ obj) {

8326

+public static final native long /*int*/ _atk_object_factory_create_accessible (long /*int*/ factory, long /*int*/ obj);

8327

+public static final long /*int*/ atk_object_factory_create_accessible (long /*int*/ factory, long /*int*/ obj) {

8328

lock.lock();

8329

try {

8330

return _atk_object_factory_create_accessible(factory, obj);

8331

@@ -177,8 +177,8 @@

8332

}

8333

}

8334

/** @param factory cast=(AtkObjectFactory *) */

8335

-public static final native int /*long*/ _atk_object_factory_get_accessible_type (int /*long*/ factory);

8336

-public static final int /*long*/ atk_object_factory_get_accessible_type (int /*long*/ factory) {

8337

+public static final native long /*int*/ _atk_object_factory_get_accessible_type (long /*int*/ factory);

8338

+public static final long /*int*/ atk_object_factory_get_accessible_type (long /*int*/ factory) {

8339

lock.lock();

8340

try {

8341

return _atk_object_factory_get_accessible_type(factory);

8342

@@ -190,8 +190,8 @@

8343

* @param accessible cast=(AtkObject *)

8344

* @param data cast=(gpointer)

8345

*/

8346

-public static final native void _atk_object_initialize (int /*long*/ accessible, int /*long*/ data);

8347

-public static final void atk_object_initialize (int /*long*/ accessible, int /*long*/ data) {

8348

+public static final native void _atk_object_initialize (long /*int*/ accessible, long /*int*/ data);

8349

+public static final void atk_object_initialize (long /*int*/ accessible, long /*int*/ data) {

8350

lock.lock();

8351

try {

8352

_atk_object_initialize(accessible, data);

8353

@@ -200,8 +200,8 @@

8354

}

8355

}

8356

/** @param accessible cast=(AtkObject *) */

8357

-public static final native int /*long*/ _atk_object_ref_relation_set (int /*long*/ accessible);

8358

-public static final int /*long*/ atk_object_ref_relation_set (int /*long*/ accessible) {

8359

+public static final native long /*int*/ _atk_object_ref_relation_set (long /*int*/ accessible);

8360

+public static final long /*int*/ atk_object_ref_relation_set (long /*int*/ accessible) {

8361

lock.lock();

8362

try {

8363

return _atk_object_ref_relation_set(accessible);

8364

@@ -213,8 +213,8 @@

8365

* @param registry cast=(AtkRegistry *)

8366

* @param type cast=(GType)

8367

*/

8368

-public static final native int /*long*/ _atk_registry_get_factory (int /*long*/ registry, int /*long*/ type);

8369

-public static final int /*long*/ atk_registry_get_factory (int /*long*/ registry, int /*long*/ type) {

8370

+public static final native long /*int*/ _atk_registry_get_factory (long /*int*/ registry, long /*int*/ type);

8371

+public static final long /*int*/ atk_registry_get_factory (long /*int*/ registry, long /*int*/ type) {

8372

lock.lock();

8373

try {

8374

return _atk_registry_get_factory(registry, type);

8375

@@ -227,8 +227,8 @@

8376

* @param type cast=(GType)

8377

* @param factory_type cast=(GType)

8378

*/

8379

-public static final native void _atk_registry_set_factory_type (int /*long*/ registry, int /*long*/ type, int /*long*/ factory_type);

8380

-public static final void atk_registry_set_factory_type (int /*long*/ registry, int /*long*/ type, int /*long*/ factory_type) {

8381

+public static final native void _atk_registry_set_factory_type (long /*int*/ registry, long /*int*/ type, long /*int*/ factory_type);

8382

+public static final void atk_registry_set_factory_type (long /*int*/ registry, long /*int*/ type, long /*int*/ factory_type) {

8383

lock.lock();

8384

try {

8385

_atk_registry_set_factory_type(registry, type, factory_type);

8386

@@ -237,8 +237,8 @@

8387

}

8388

}

8389

/** @param set cast=(AtkRelationSet *) */

8390

-public static final native int _atk_relation_set_get_n_relations (int /*long*/ set);

8391

-public static final int atk_relation_set_get_n_relations (int /*long*/ set) {

8392

+public static final native int _atk_relation_set_get_n_relations (long /*int*/ set);

8393

+public static final int atk_relation_set_get_n_relations (long /*int*/ set) {

8394

lock.lock();

8395

try {

8396

return _atk_relation_set_get_n_relations(set);

8397

@@ -247,8 +247,8 @@

8398

}

8399

}

8400

/** @param set cast=(AtkRelationSet *) */

8401

-public static final native int /*long*/ _atk_relation_set_get_relation (int /*long*/ set, int i);

8402

-public static final int /*long*/ atk_relation_set_get_relation (int /*long*/ set, int i) {

8403

+public static final native long /*int*/ _atk_relation_set_get_relation (long /*int*/ set, int i);

8404

+public static final long /*int*/ atk_relation_set_get_relation (long /*int*/ set, int i) {

8405

lock.lock();

8406

try {

8407

return _atk_relation_set_get_relation (set, i);

8408

@@ -260,8 +260,8 @@

8409

* @param set cast=(AtkRelationSet *)

8410

* @param relation cast=(AtkRelation *)

8411

*/

8412

-public static final native void _atk_relation_set_remove (int /*long*/ set, int /*long*/ relation);

8413

-public static final void atk_relation_set_remove (int /*long*/ set, int /*long*/ relation) {

8414

+public static final native void _atk_relation_set_remove (long /*int*/ set, long /*int*/ relation);

8415

+public static final void atk_relation_set_remove (long /*int*/ set, long /*int*/ relation) {

8416

lock.lock();

8417

try {

8418

_atk_relation_set_remove (set, relation);

8419

@@ -273,8 +273,8 @@

8420

* @param set cast=(AtkStateSet *)

8421

* @param type cast=(AtkStateType)

8422

*/

8423

-public static final native boolean _atk_state_set_add_state (int /*long*/ set, int type);

8424

-public static final boolean atk_state_set_add_state (int /*long*/ set, int type) {

8425

+public static final native boolean _atk_state_set_add_state (long /*int*/ set, int type);

8426

+public static final boolean atk_state_set_add_state (long /*int*/ set, int type) {

8427

lock.lock();

8428

try {

8429

return _atk_state_set_add_state(set, type);

8430

@@ -282,8 +282,8 @@

8431

lock.unlock();

8432

}

8433

}

8434

-public static final native int /*long*/ _atk_state_set_new ();

8435

-public static final int /*long*/ atk_state_set_new () {

8436

+public static final native long /*int*/ _atk_state_set_new ();

8437

+public static final long /*int*/ atk_state_set_new () {

8438

lock.lock();

8439

try {

8440

return _atk_state_set_new();

8441

@@ -291,8 +291,8 @@

8442

lock.unlock();

8443

}

8444

}

8445

-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0);

8446

-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0) {

8447

+public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0);

8448

+public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0) {

8449

lock.lock();

8450

try {

8451

return _call(function, arg0);

8452

@@ -300,8 +300,8 @@

8453

lock.unlock();

8454

}

8455

}

8456

-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1);

8457

-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1) {

8458

+public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1);

8459

+public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1) {

8460

lock.lock();

8461

try {

8462

return _call(function, arg0, arg1);

8463

@@ -309,8 +309,8 @@

8464

lock.unlock();

8465

}

8466

}

8467

-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2);

8468

-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2) {

8469

+public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2);

8470

+public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {

8471

lock.lock();

8472

try {

8473

return _call(function, arg0, arg1, arg2);

8474

@@ -318,8 +318,8 @@

8475

lock.unlock();

8476

}

8477

}

8478

-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3);

8479

-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) {

8480

+public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3);

8481

+public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {

8482

lock.lock();

8483

try {

8484

return _call(function, arg0, arg1, arg2, arg3);

8485

@@ -327,8 +327,8 @@

8486

lock.unlock();

8487

}

8488

}

8489

-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);

8490

-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4) {

8491

+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);

8492

+public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4) {

8493

lock.lock();

8494

try {

8495

return _call(function, arg0, arg1, arg2, arg3, arg4);

8496

@@ -336,8 +336,8 @@

8497

lock.unlock();

8498

}

8499

}

8500

-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);

8501

-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) {

8502

+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);

8503

+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) {

8504

lock.lock();

8505

try {

8506

return _call(function, arg0, arg1, arg2, arg3, arg4, arg5);

8507

@@ -345,19 +345,19 @@

8508

lock.unlock();

8509

}

8510

}

8511

-public static final native void memmove (AtkActionIface dest, int /*long*/ src);

8512

-public static final native void memmove (AtkComponentIface dest, int /*long*/ src);

8513

-public static final native void memmove (AtkHypertextIface dest, int /*long*/ src);

8514

-public static final native void memmove (AtkObjectClass dest, int /*long*/ src);

8515

-public static final native void memmove (AtkObjectFactoryClass dest, int /*long*/ src);

8516

-public static final native void memmove (AtkSelectionIface dest, int /*long*/ src);

8517

-public static final native void memmove (AtkTextIface dest, int /*long*/ src);

8518

-public static final native void memmove (GtkAccessible dest, int /*long*/ src);

8519

-public static final native void memmove (int /*long*/ dest, AtkActionIface src);

8520

-public static final native void memmove (int /*long*/ dest, AtkComponentIface src);

8521

-public static final native void memmove (int /*long*/ dest, AtkHypertextIface src);

8522

-public static final native void memmove (int /*long*/ dest, AtkObjectClass src);

8523

-public static final native void memmove (int /*long*/ dest, AtkObjectFactoryClass src);

8524

-public static final native void memmove (int /*long*/ dest, AtkSelectionIface src);

8525

-public static final native void memmove (int /*long*/ dest, AtkTextIface src);

8526

+public static final native void memmove (AtkActionIface dest, long /*int*/ src);

8527

+public static final native void memmove (AtkComponentIface dest, long /*int*/ src);

8528

+public static final native void memmove (AtkHypertextIface dest, long /*int*/ src);

8529

+public static final native void memmove (AtkObjectClass dest, long /*int*/ src);

8530

+public static final native void memmove (AtkObjectFactoryClass dest, long /*int*/ src);

8531

+public static final native void memmove (AtkSelectionIface dest, long /*int*/ src);

8532

+public static final native void memmove (AtkTextIface dest, long /*int*/ src);

8533

+public static final native void memmove (GtkAccessible dest, long /*int*/ src);

8534

+public static final native void memmove (long /*int*/ dest, AtkActionIface src);

8535

+public static final native void memmove (long /*int*/ dest, AtkComponentIface src);

8536

+public static final native void memmove (long /*int*/ dest, AtkHypertextIface src);

8537

+public static final native void memmove (long /*int*/ dest, AtkObjectClass src);

8538

+public static final native void memmove (long /*int*/ dest, AtkObjectFactoryClass src);

8539

+public static final native void memmove (long /*int*/ dest, AtkSelectionIface src);

8540

+public static final native void memmove (long /*int*/ dest, AtkTextIface src);

8541

}

8542

diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java

8543

--- x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java 2009-05-29 17:30:18.000000000 -0400

8544

+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java 2009-09-17 08:48:24.000000000 -0400

8545

@@ -17,49 +17,49 @@

8546

8547

public class AtkObjectClass {

8548

/** @field cast=(G_CONST_RETURN gchar *(*)()) */

8549

- public int /*long*/ get_name;

8550

+ public long /*int*/ get_name;

8551

/** @field cast=(G_CONST_RETURN gchar *(*)()) */

8552

- public int /*long*/ get_description;

8553

+ public long /*int*/ get_description;

8554

/** @field cast=(AtkObject *(*)()) */

8555

- public int /*long*/ get_parent;

8556

+ public long /*int*/ get_parent;

8557

/** @field cast=(gint (*)()) */

8558

- public int /*long*/ get_n_children;

8559

+ public long /*int*/ get_n_children;

8560

/** @field cast=(AtkObject *(*)()) */

8561

- public int /*long*/ ref_child;

8562

+ public long /*int*/ ref_child;

8563

/** @field cast=(gint (*)()) */

8564

- public int /*long*/ get_index_in_parent;

8565

+ public long /*int*/ get_index_in_parent;

8566

/** @field cast=(AtkRelationSet *(*)()) */

8567

- public int /*long*/ ref_relation_set;

8568

+ public long /*int*/ ref_relation_set;

8569

/** @field cast=(AtkRole (*)()) */

8570

- public int /*long*/ get_role;

8571

+ public long /*int*/ get_role;

8572

/** @field cast=(AtkLayer (*)()) */

8573

- public int /*long*/ get_layer;

8574

+ public long /*int*/ get_layer;

8575

/** @field cast=(gint (*)()) */

8576

- public int /*long*/ get_mdi_zorder;

8577

+ public long /*int*/ get_mdi_zorder;

8578

/** @field cast=(AtkStateSet *(*)()) */

8579

- public int /*long*/ ref_state_set;

8580

+ public long /*int*/ ref_state_set;

8581

/** @field cast=(void (*)()) */

8582

- public int /*long*/ set_name;

8583

+ public long /*int*/ set_name;

8584

/** @field cast=(void (*)()) */

8585

- public int /*long*/ set_description;

8586

+ public long /*int*/ set_description;

8587

/** @field cast=(void (*)()) */

8588

- public int /*long*/ set_parent;

8589

+ public long /*int*/ set_parent;

8590

/** @field cast=(void (*)()) */

8591

- public int /*long*/ set_role;

8592

+ public long /*int*/ set_role;

8593

/** @field cast=(guint (*)()) */

8594

- public int /*long*/ connect_property_change_handler;

8595

+ public long /*int*/ connect_property_change_handler;

8596

/** @field cast=(void (*)()) */

8597

- public int /*long*/ remove_property_change_handler;

8598

+ public long /*int*/ remove_property_change_handler;

8599

/** @field cast=(void (*)()) */

8600

- public int /*long*/ initialize;

8601

+ public long /*int*/ initialize;

8602

/** @field cast=(void (*)()) */

8603

- public int /*long*/ children_changed;

8604

+ public long /*int*/ children_changed;

8605

/** @field cast=(void (*)()) */

8606

- public int /*long*/ focus_event;

8607

+ public long /*int*/ focus_event;

8608

/** @field cast=(void (*)()) */

8609

- public int /*long*/ property_change;

8610

+ public long /*int*/ property_change;

8611

/** @field cast=(void (*)()) */

8612

- public int /*long*/ state_change;

8613

+ public long /*int*/ state_change;

8614

/** @field cast=(void (*)()) */

8615

- public int /*long*/ visible_data_changed;

8616

+ public long /*int*/ visible_data_changed;

8617

}

8618

diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java

8619

--- x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java 2009-05-29 17:30:18.000000000 -0400

8620

+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java 2009-09-17 08:48:24.000000000 -0400

8621

@@ -17,9 +17,9 @@

8622

8623

public class AtkObjectFactoryClass {

8624

/** @field cast=(AtkObject *(*)()) */

8625

- public int /*long*/ create_accessible;

8626

+ public long /*int*/ create_accessible;

8627

/** @field cast=(void (*)()) */

8628

- public int /*long*/ invalidate;

8629

+ public long /*int*/ invalidate;

8630

/** @field cast=(GType (*)()) */

8631

- public int /*long*/ get_accessible_type;

8632

+ public long /*int*/ get_accessible_type;

8633

}

8634

diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java

8635

--- x86/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java 2009-05-29 17:30:18.000000000 -0400

8636

+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java 2009-09-17 08:48:24.000000000 -0400

8637

@@ -17,19 +17,19 @@

8638

8639

public class AtkSelectionIface {

8640

/** @field cast=(gboolean (*)()) */

8641

- public int /*long*/ add_selection;

8642

+ public long /*int*/ add_selection;

8643

/** @field cast=(gboolean (*)()) */

8644

- public int /*long*/ clear_selection;

8645

+ public long /*int*/ clear_selection;

8646

/** @field cast=(AtkObject *(*)()) */

8647

- public int /*long*/ ref_selection;

8648

+ public long /*int*/ ref_selection;

8649

/** @field cast=(gint (*)()) */

8650

- public int /*long*/ get_selection_count;

8651

+ public long /*int*/ get_selection_count;

8652

/** @field cast=(gboolean (*)()) */

8653

- public int /*long*/ is_child_selected;

8654

+ public long /*int*/ is_child_selected;

8655

/** @field cast=(gboolean (*)()) */

8656

- public int /*long*/ remove_selection;

8657

+ public long /*int*/ remove_selection;

8658

/** @field cast=(gboolean (*)()) */

8659

- public int /*long*/ select_all_selection;

8660

+ public long /*int*/ select_all_selection;

8661

/** @field cast=(void (*)()) */

8662

- public int /*long*/ selection_changed;

8663

+ public long /*int*/ selection_changed;

8664

}

8665

diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java

8666

--- x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java 2009-05-29 17:30:18.000000000 -0400

8667

+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java 2009-09-17 08:48:24.000000000 -0400

8668

@@ -17,43 +17,43 @@

8669

8670

public class AtkTextIface {

8671

/** @field cast=(gchar *(*)()) */

8672

- public int /*long*/ get_text;

8673

+ public long /*int*/ get_text;

8674

/** @field cast=(gchar *(*)()) */

8675

- public int /*long*/ get_text_after_offset;

8676

+ public long /*int*/ get_text_after_offset;

8677

/** @field cast=(gchar *(*)()) */

8678

- public int /*long*/ get_text_at_offset;

8679

+ public long /*int*/ get_text_at_offset;

8680

/** @field cast=(gunichar (*)()) */

8681

- public int /*long*/ get_character_at_offset;

8682

+ public long /*int*/ get_character_at_offset;

8683

/** @field cast=(gchar *(*)()) */

8684

- public int /*long*/ get_text_before_offset;

8685

+ public long /*int*/ get_text_before_offset;

8686

/** @field cast=(gint (*)()) */

8687

- public int /*long*/ get_caret_offset;

8688

+ public long /*int*/ get_caret_offset;

8689

/** @field cast=(AtkAttributeSet *(*)()) */

8690

- public int /*long*/ get_run_attributes;

8691

+ public long /*int*/ get_run_attributes;

8692

/** @field cast=(AtkAttributeSet *(*)()) */

8693

- public int /*long*/ get_default_attributes;

8694

+ public long /*int*/ get_default_attributes;

8695

/** @field cast=(void (*)()) */

8696

- public int /*long*/ get_character_extents;

8697

+ public long /*int*/ get_character_extents;

8698

/** @field cast=(gint (*)()) */

8699

- public int /*long*/ get_character_count;

8700

+ public long /*int*/ get_character_count;

8701

/** @field cast=(gint (*)()) */

8702

- public int /*long*/ get_offset_at_point;

8703

+ public long /*int*/ get_offset_at_point;

8704

/** @field cast=(gint (*)()) */

8705

- public int /*long*/ get_n_selections;

8706

+ public long /*int*/ get_n_selections;

8707

/** @field cast=(gchar *(*)()) */

8708

- public int /*long*/ get_selection;

8709

+ public long /*int*/ get_selection;

8710

/** @field cast=(gboolean (*)()) */

8711

- public int /*long*/ add_selection;

8712

+ public long /*int*/ add_selection;

8713

/** @field cast=(gboolean (*)()) */

8714

- public int /*long*/ remove_selection;

8715

+ public long /*int*/ remove_selection;

8716

/** @field cast=(gboolean (*)()) */

8717

- public int /*long*/ set_selection;

8718

+ public long /*int*/ set_selection;

8719

/** @field cast=(gboolean (*)()) */

8720

- public int /*long*/ set_caret_offset;

8721

+ public long /*int*/ set_caret_offset;

8722

/** @field cast=(void (*)()) */

8723

- public int /*long*/ text_changed;

8724

+ public long /*int*/ text_changed;

8725

/** @field cast=(void (*)()) */

8726

- public int /*long*/ text_caret_moved;

8727

+ public long /*int*/ text_caret_moved;

8728

/** @field cast=(void (*)()) */

8729

- public int /*long*/ text_selection_changed;

8730

+ public long /*int*/ text_selection_changed;

8731

}

8732

diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java x86_64/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java

8733

--- x86/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java 2009-05-29 17:30:18.000000000 -0400

8734

+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java 2009-09-17 08:48:24.000000000 -0400

8735

@@ -17,5 +17,5 @@

8736

8737

public class GtkAccessible {

8738

/** @field cast=(GtkWidget *) */

8739

- public int /*long*/ widget;

8740

+ public long /*int*/ widget;

8741

}

8742

diff -urN x86/org/eclipse/swt/internal/BidiUtil.java x86_64/org/eclipse/swt/internal/BidiUtil.java

8743

--- x86/org/eclipse/swt/internal/BidiUtil.java 2008-06-05 13:31:46.000000000 -0400

8744

+++ x86_64/org/eclipse/swt/internal/BidiUtil.java 2009-09-17 08:48:24.000000000 -0400

8745

@@ -42,7 +42,7 @@

8746

/*

8747

* Not implemented.

8748

*/

8749

-public static void addLanguageListener(int /*long*/ hwnd, Runnable runnable) {

8750

+public static void addLanguageListener(long /*int*/ hwnd, Runnable runnable) {

8751

}

8752

public static void addLanguageListener (Control control, Runnable runnable) {

8753

}

8754

@@ -93,7 +93,7 @@

8755

/*

8756

* Not implemented.

8757

*/

8758

-public static void removeLanguageListener(int /*long*/ hwnd) {

8759

+public static void removeLanguageListener(long /*int*/ hwnd) {

8760

}

8761

public static void removeLanguageListener (Control control) {

8762

}

8763

@@ -105,7 +105,7 @@

8764

/*

8765

* Not implemented.

8766

*/

8767

-public static boolean setOrientation(int /*long*/ hwnd, int orientation) {

8768

+public static boolean setOrientation(long /*int*/ hwnd, int orientation) {

8769

return false;

8770

}

8771

public static boolean setOrientation (Control control, int orientation) {

8772

diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/internal/cairo/Cairo.java

8773

--- x86/org/eclipse/swt/internal/cairo/Cairo.java 2009-05-29 17:30:14.000000000 -0400

8774

+++ x86_64/org/eclipse/swt/internal/cairo/Cairo.java 2009-09-17 08:48:22.000000000 -0400

8775

@@ -109,8 +109,8 @@

8776

* @param cr cast=(cairo_t *)

8777

* @param path cast=(cairo_path_t *)

8778

*/

8779

-public static final native void _cairo_append_path(int /*long*/ cr, int /*long*/ path);

8780

-public static final void cairo_append_path(int /*long*/ cr, int /*long*/ path) {

8781

+public static final native void _cairo_append_path(long /*int*/ cr, long /*int*/ path);

8782

+public static final void cairo_append_path(long /*int*/ cr, long /*int*/ path) {

8783

lock.lock();

8784

try {

8785

_cairo_append_path(cr, path);

8786

@@ -119,8 +119,8 @@

8787

}

8788

}

8789

/** @param cr cast=(cairo_t *) */

8790

-public static final native void _cairo_arc(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2);

8791

-public static final void cairo_arc(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2) {

8792

+public static final native void _cairo_arc(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2);

8793

+public static final void cairo_arc(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2) {

8794

lock.lock();

8795

try {

8796

_cairo_arc(cr, xc, yc, radius, angle1, angle2);

8797

@@ -129,8 +129,8 @@

8798

}

8799

}

8800

/** @param cr cast=(cairo_t *) */

8801

-public static final native void _cairo_arc_negative(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2);

8802

-public static final void cairo_arc_negative(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2) {

8803

+public static final native void _cairo_arc_negative(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2);

8804

+public static final void cairo_arc_negative(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2) {

8805

lock.lock();

8806

try {

8807

_cairo_arc_negative(cr, xc, yc, radius, angle1, angle2);

8808

@@ -139,8 +139,8 @@

8809

}

8810

}

8811

/** @param cr cast=(cairo_t *) */

8812

-public static final native void _cairo_clip(int /*long*/ cr);

8813

-public static final void cairo_clip(int /*long*/ cr) {

8814

+public static final native void _cairo_clip(long /*int*/ cr);

8815

+public static final void cairo_clip(long /*int*/ cr) {

8816

lock.lock();

8817

try {

8818

_cairo_clip(cr);

8819

@@ -149,8 +149,8 @@

8820

}

8821

}

8822

/** @param cr cast=(cairo_t *) */

8823

-public static final native void _cairo_clip_preserve(int /*long*/ cr);

8824

-public static final void cairo_clip_preserve(int /*long*/ cr) {

8825

+public static final native void _cairo_clip_preserve(long /*int*/ cr);

8826

+public static final void cairo_clip_preserve(long /*int*/ cr) {

8827

lock.lock();

8828

try {

8829

_cairo_clip_preserve(cr);

8830

@@ -159,8 +159,8 @@

8831

}

8832

}

8833

/** @param cr cast=(cairo_t *) */

8834

-public static final native void _cairo_close_path(int /*long*/ cr);

8835

-public static final void cairo_close_path(int /*long*/ cr) {

8836

+public static final native void _cairo_close_path(long /*int*/ cr);

8837

+public static final void cairo_close_path(long /*int*/ cr) {

8838

lock.lock();

8839

try {

8840

_cairo_close_path(cr);

8841

@@ -169,8 +169,8 @@

8842

}

8843

}

8844

/** @param cr cast=(cairo_t *) */

8845

-public static final native void _cairo_copy_page(int /*long*/ cr);

8846

-public static final void cairo_copy_page(int /*long*/ cr) {

8847

+public static final native void _cairo_copy_page(long /*int*/ cr);

8848

+public static final void cairo_copy_page(long /*int*/ cr) {

8849

lock.lock();

8850

try {

8851

_cairo_copy_page(cr);

8852

@@ -179,8 +179,8 @@

8853

}

8854

}

8855

/** @param cr cast=(cairo_t *) */

8856

-public static final native int /*long*/ _cairo_copy_path(int /*long*/ cr);

8857

-public static final int /*long*/ cairo_copy_path(int /*long*/ cr) {

8858

+public static final native long /*int*/ _cairo_copy_path(long /*int*/ cr);

8859

+public static final long /*int*/ cairo_copy_path(long /*int*/ cr) {

8860

lock.lock();

8861

try {

8862

return _cairo_copy_path(cr);

8863

@@ -189,8 +189,8 @@

8864

}

8865

}

8866

/** @param cr cast=(cairo_t *) */

8867

-public static final native int /*long*/ _cairo_copy_path_flat(int /*long*/ cr);

8868

-public static final int /*long*/ cairo_copy_path_flat(int /*long*/ cr) {

8869

+public static final native long /*int*/ _cairo_copy_path_flat(long /*int*/ cr);

8870

+public static final long /*int*/ cairo_copy_path_flat(long /*int*/ cr) {

8871

lock.lock();

8872

try {

8873

return _cairo_copy_path_flat(cr);

8874

@@ -199,8 +199,8 @@

8875

}

8876

}

8877

/** @param target cast=(cairo_surface_t *) */

8878

-public static final native int /*long*/ _cairo_create(int /*long*/ target);

8879

-public static final int /*long*/ cairo_create(int /*long*/ target) {

8880

+public static final native long /*int*/ _cairo_create(long /*int*/ target);

8881

+public static final long /*int*/ cairo_create(long /*int*/ target) {

8882

lock.lock();

8883

try {

8884

return _cairo_create(target);

8885

@@ -209,8 +209,8 @@

8886

}

8887

}

8888

/** @param cr cast=(cairo_t *) */

8889

-public static final native void _cairo_curve_to(int /*long*/ cr, double x1, double y1, double x2, double y2, double x3, double y3);

8890

-public static final void cairo_curve_to(int /*long*/ cr, double x1, double y1, double x2, double y2, double x3, double y3) {

8891

+public static final native void _cairo_curve_to(long /*int*/ cr, double x1, double y1, double x2, double y2, double x3, double y3);

8892

+public static final void cairo_curve_to(long /*int*/ cr, double x1, double y1, double x2, double y2, double x3, double y3) {

8893

lock.lock();

8894

try {

8895

_cairo_curve_to(cr, x1, y1, x2, y2, x3, y3);

8896

@@ -219,8 +219,8 @@

8897

}

8898

}

8899

/** @param cr cast=(cairo_t *) */

8900

-public static final native void _cairo_destroy(int /*long*/ cr);

8901

-public static final void cairo_destroy(int /*long*/ cr) {

8902

+public static final native void _cairo_destroy(long /*int*/ cr);

8903

+public static final void cairo_destroy(long /*int*/ cr) {

8904

lock.lock();

8905

try {

8906

_cairo_destroy(cr);

8907

@@ -229,8 +229,8 @@

8908

}

8909

}

8910

/** @param cr cast=(cairo_t *) */

8911

-public static final native void _cairo_device_to_user(int /*long*/ cr, double[] x, double[] y);

8912

-public static final void cairo_device_to_user(int /*long*/ cr, double[] x, double[] y) {

8913

+public static final native void _cairo_device_to_user(long /*int*/ cr, double[] x, double[] y);

8914

+public static final void cairo_device_to_user(long /*int*/ cr, double[] x, double[] y) {

8915

lock.lock();

8916

try {

8917

_cairo_device_to_user(cr, x, y);

8918

@@ -239,8 +239,8 @@

8919

}

8920

}

8921

/** @param cr cast=(cairo_t *) */

8922

-public static final native void _cairo_device_to_user_distance(int /*long*/ cr, double[] dx, double[] dy);

8923

-public static final void cairo_device_to_user_distance(int /*long*/ cr, double[] dx, double[] dy) {

8924

+public static final native void _cairo_device_to_user_distance(long /*int*/ cr, double[] dx, double[] dy);

8925

+public static final void cairo_device_to_user_distance(long /*int*/ cr, double[] dx, double[] dy) {

8926

lock.lock();

8927

try {

8928

_cairo_device_to_user_distance(cr, dx, dy);

8929

@@ -249,8 +249,8 @@

8930

}

8931

}

8932

/** @param cr cast=(cairo_t *) */

8933

-public static final native void _cairo_fill(int /*long*/ cr);

8934

-public static final void cairo_fill(int /*long*/ cr) {

8935

+public static final native void _cairo_fill(long /*int*/ cr);

8936

+public static final void cairo_fill(long /*int*/ cr) {

8937

lock.lock();

8938

try {

8939

_cairo_fill(cr);

8940

@@ -259,8 +259,8 @@

8941

}

8942

}

8943

/** @param cr cast=(cairo_t *) */

8944

-public static final native void _cairo_fill_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);

8945

-public static final void cairo_fill_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2) {

8946

+public static final native void _cairo_fill_extents(long /*int*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);

8947

+public static final void cairo_fill_extents(long /*int*/ cr, double[] x1, double[] y1, double[] x2, double[] y2) {

8948

lock.lock();

8949

try {

8950

_cairo_fill_extents(cr, x1, y1, x2, y2);

8951

@@ -269,8 +269,8 @@

8952

}

8953

}

8954

/** @param cr cast=(cairo_t *) */

8955

-public static final native void _cairo_fill_preserve(int /*long*/ cr);

8956

-public static final void cairo_fill_preserve(int /*long*/ cr) {

8957

+public static final native void _cairo_fill_preserve(long /*int*/ cr);

8958

+public static final void cairo_fill_preserve(long /*int*/ cr) {

8959

lock.lock();

8960

try {

8961

_cairo_fill_preserve(cr);

8962

@@ -279,8 +279,8 @@

8963

}

8964

}

8965

/** @param cr cast=(cairo_t *) */

8966

-public static final native void _cairo_font_extents(int /*long*/ cr, cairo_font_extents_t extents);

8967

-public static final void cairo_font_extents(int /*long*/ cr, cairo_font_extents_t extents) {

8968

+public static final native void _cairo_font_extents(long /*int*/ cr, cairo_font_extents_t extents);

8969

+public static final void cairo_font_extents(long /*int*/ cr, cairo_font_extents_t extents) {

8970

lock.lock();

8971

try {

8972

_cairo_font_extents(cr, extents);

8973

@@ -288,8 +288,8 @@

8974

lock.unlock();

8975

}

8976

}

8977

-public static final native int /*long*/ _cairo_font_options_create();

8978

-public static final int /*long*/ cairo_font_options_create() {

8979

+public static final native long /*int*/ _cairo_font_options_create();

8980

+public static final long /*int*/ cairo_font_options_create() {

8981

lock.lock();

8982

try {

8983

return _cairo_font_options_create();

8984

@@ -298,8 +298,8 @@

8985

}

8986

}

8987

/** @param options cast=(cairo_font_options_t *) */

8988

-public static final native void _cairo_font_options_destroy(int /*long*/ options);

8989

-public static final void cairo_font_options_destroy(int /*long*/ options) {

8990

+public static final native void _cairo_font_options_destroy(long /*int*/ options);

8991

+public static final void cairo_font_options_destroy(long /*int*/ options) {

8992

lock.lock();

8993

try {

8994

_cairo_font_options_destroy(options);

8995

@@ -308,8 +308,8 @@

8996

}

8997

}

8998

/** @param options cast=(cairo_font_options_t *) */

8999

-public static final native int _cairo_font_options_get_antialias(int /*long*/ options);

9000

-public static final int cairo_font_options_get_antialias(int /*long*/ options) {

9001

+public static final native int _cairo_font_options_get_antialias(long /*int*/ options);

9002

+public static final int cairo_font_options_get_antialias(long /*int*/ options) {

9003

lock.lock();

9004

try {

9005

return _cairo_font_options_get_antialias(options);

9006

@@ -318,8 +318,8 @@

9007

}

9008

}

9009

/** @param options cast=(cairo_font_options_t *) */

9010

-public static final native void _cairo_font_options_set_antialias(int /*long*/ options, int antialias);

9011

-public static final void cairo_font_options_set_antialias(int /*long*/ options, int antialias) {

9012

+public static final native void _cairo_font_options_set_antialias(long /*int*/ options, int antialias);

9013

+public static final void cairo_font_options_set_antialias(long /*int*/ options, int antialias) {

9014

lock.lock();

9015

try {

9016

_cairo_font_options_set_antialias(options, antialias);

9017

@@ -328,8 +328,8 @@

9018

}

9019

}

9020

/** @param cr cast=(cairo_t *) */

9021

-public static final native int _cairo_get_antialias(int /*long*/ cr);

9022

-public static final int cairo_get_antialias(int /*long*/ cr) {

9023

+public static final native int _cairo_get_antialias(long /*int*/ cr);

9024

+public static final int cairo_get_antialias(long /*int*/ cr) {

9025

lock.lock();

9026

try {

9027

return _cairo_get_antialias(cr);

9028

@@ -338,8 +338,8 @@

9029

}

9030

}

9031

/** @param cr cast=(cairo_t *) */

9032

-public static final native void _cairo_get_current_point(int /*long*/ cr, double[] x, double[] y);

9033

-public static final void cairo_get_current_point(int /*long*/ cr, double[] x, double[] y) {

9034

+public static final native void _cairo_get_current_point(long /*int*/ cr, double[] x, double[] y);

9035

+public static final void cairo_get_current_point(long /*int*/ cr, double[] x, double[] y) {

9036

lock.lock();

9037

try {

9038

_cairo_get_current_point(cr, x, y);

9039

@@ -348,8 +348,8 @@

9040

}

9041

}

9042

/** @param cr cast=(cairo_t *) */

9043

-public static final native int _cairo_get_fill_rule(int /*long*/ cr);

9044

-public static final int cairo_get_fill_rule(int /*long*/ cr) {

9045

+public static final native int _cairo_get_fill_rule(long /*int*/ cr);

9046

+public static final int cairo_get_fill_rule(long /*int*/ cr) {

9047

lock.lock();

9048

try {

9049

return _cairo_get_fill_rule(cr);

9050

@@ -358,8 +358,8 @@

9051

}

9052

}

9053

/** @param cr cast=(cairo_t *) */

9054

-public static final native int /*long*/ _cairo_get_font_face(int /*long*/ cr);

9055

-public static final int /*long*/ cairo_get_font_face(int /*long*/ cr) {

9056

+public static final native long /*int*/ _cairo_get_font_face(long /*int*/ cr);

9057

+public static final long /*int*/ cairo_get_font_face(long /*int*/ cr) {

9058

lock.lock();

9059

try {

9060

return _cairo_get_font_face(cr);

9061

@@ -371,8 +371,8 @@

9062

* @param cr cast=(cairo_t *)

9063

* @param matrix cast=(cairo_matrix_t *)

9064

*/

9065

-public static final native void _cairo_get_font_matrix(int /*long*/ cr, double[] matrix);

9066

-public static final void cairo_get_font_matrix(int /*long*/ cr, double[] matrix) {

9067

+public static final native void _cairo_get_font_matrix(long /*int*/ cr, double[] matrix);

9068

+public static final void cairo_get_font_matrix(long /*int*/ cr, double[] matrix) {

9069

lock.lock();

9070

try {

9071

_cairo_get_font_matrix(cr, matrix);

9072

@@ -384,8 +384,8 @@

9073

* @param cr cast=(cairo_t *)

9074

* @param options cast=(cairo_font_options_t *)

9075

*/

9076

-public static final native void _cairo_get_font_options(int /*long*/ cr, int /*long*/ options);

9077

-public static final void cairo_get_font_options(int /*long*/ cr, int /*long*/ options) {

9078

+public static final native void _cairo_get_font_options(long /*int*/ cr, long /*int*/ options);

9079

+public static final void cairo_get_font_options(long /*int*/ cr, long /*int*/ options) {

9080

lock.lock();

9081

try {

9082

_cairo_get_font_options(cr, options);

9083

@@ -394,8 +394,8 @@

9084

}

9085

}

9086

/** @param cr cast=(cairo_t *) */

9087

-public static final native int _cairo_get_line_cap(int /*long*/ cr);

9088

-public static final int cairo_get_line_cap(int /*long*/ cr) {

9089

+public static final native int _cairo_get_line_cap(long /*int*/ cr);

9090

+public static final int cairo_get_line_cap(long /*int*/ cr) {

9091

lock.lock();

9092

try {

9093

return _cairo_get_line_cap(cr);

9094

@@ -404,8 +404,8 @@

9095

}

9096

}

9097

/** @param cr cast=(cairo_t *) */

9098

-public static final native int _cairo_get_line_join(int /*long*/ cr);

9099

-public static final int cairo_get_line_join(int /*long*/ cr) {

9100

+public static final native int _cairo_get_line_join(long /*int*/ cr);

9101

+public static final int cairo_get_line_join(long /*int*/ cr) {

9102

lock.lock();

9103

try {

9104

return _cairo_get_line_join(cr);

9105

@@ -414,8 +414,8 @@

9106

}

9107

}

9108

/** @param cr cast=(cairo_t *) */

9109

-public static final native double _cairo_get_line_width(int /*long*/ cr);

9110

-public static final double cairo_get_line_width(int /*long*/ cr) {

9111

+public static final native double _cairo_get_line_width(long /*int*/ cr);

9112

+public static final double cairo_get_line_width(long /*int*/ cr) {

9113

lock.lock();

9114

try {

9115

return _cairo_get_line_width(cr);

9116

@@ -427,8 +427,8 @@

9117

* @param cr cast=(cairo_t *)

9118

* @param matrix cast=(cairo_matrix_t *)

9119

*/

9120

-public static final native void _cairo_get_matrix(int /*long*/ cr, double[] matrix);

9121

-public static final void cairo_get_matrix(int /*long*/ cr, double[] matrix) {

9122

+public static final native void _cairo_get_matrix(long /*int*/ cr, double[] matrix);

9123

+public static final void cairo_get_matrix(long /*int*/ cr, double[] matrix) {

9124

lock.lock();

9125

try {

9126

_cairo_get_matrix(cr, matrix);

9127

@@ -437,8 +437,8 @@

9128

}

9129

}

9130

/** @param cr cast=(cairo_t *) */

9131

-public static final native double _cairo_get_miter_limit(int /*long*/ cr);

9132

-public static final double cairo_get_miter_limit(int /*long*/ cr) {

9133

+public static final native double _cairo_get_miter_limit(long /*int*/ cr);

9134

+public static final double cairo_get_miter_limit(long /*int*/ cr) {

9135

lock.lock();

9136

try {

9137

return _cairo_get_miter_limit(cr);

9138

@@ -447,8 +447,8 @@

9139

}

9140

}

9141

/** @param cr cast=(cairo_t *) */

9142

-public static final native int _cairo_get_operator(int /*long*/ cr);

9143

-public static final int cairo_get_operator(int /*long*/ cr) {

9144

+public static final native int _cairo_get_operator(long /*int*/ cr);

9145

+public static final int cairo_get_operator(long /*int*/ cr) {

9146

lock.lock();

9147

try {

9148

return _cairo_get_operator(cr);

9149

@@ -457,8 +457,8 @@

9150

}

9151

}

9152

/** @param cr cast=(cairo_t *) */

9153

-public static final native int /*long*/ _cairo_get_source(int /*long*/ cr);

9154

-public static final int /*long*/ cairo_get_source(int /*long*/ cr) {

9155

+public static final native long /*int*/ _cairo_get_source(long /*int*/ cr);

9156

+public static final long /*int*/ cairo_get_source(long /*int*/ cr) {

9157

lock.lock();

9158

try {

9159

return _cairo_get_source(cr);

9160

@@ -467,8 +467,8 @@

9161

}

9162

}

9163

/** @param cr cast=(cairo_t *) */

9164

-public static final native int /*long*/ _cairo_get_target(int /*long*/ cr);

9165

-public static final int /*long*/ cairo_get_target(int /*long*/ cr) {

9166

+public static final native long /*int*/ _cairo_get_target(long /*int*/ cr);

9167

+public static final long /*int*/ cairo_get_target(long /*int*/ cr) {

9168

lock.lock();

9169

try {

9170

return _cairo_get_target(cr);

9171

@@ -477,8 +477,8 @@

9172

}

9173

}

9174

/** @param cr cast=(cairo_t *) */

9175

-public static final native double _cairo_get_tolerance(int /*long*/ cr);

9176

-public static final double cairo_get_tolerance(int /*long*/ cr) {

9177

+public static final native double _cairo_get_tolerance(long /*int*/ cr);

9178

+public static final double cairo_get_tolerance(long /*int*/ cr) {

9179

lock.lock();

9180

try {

9181

return _cairo_get_tolerance(cr);

9182

@@ -491,8 +491,8 @@

9183

* @param glyphs cast=(cairo_glyph_t *)

9184

* @param extents cast=(cairo_text_extents_t *)

9185

*/

9186

-public static final native void _cairo_glyph_extents(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs, int /*long*/ extents);

9187

-public static final void cairo_glyph_extents(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs, int /*long*/ extents) {

9188

+public static final native void _cairo_glyph_extents(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs, long /*int*/ extents);

9189

+public static final void cairo_glyph_extents(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs, long /*int*/ extents) {

9190

lock.lock();

9191

try {

9192

_cairo_glyph_extents(cr, glyphs, num_glyphs, extents);

9193

@@ -504,8 +504,8 @@

9194

* @param cr cast=(cairo_t *)

9195

* @param glyphs cast=(cairo_glyph_t *)

9196

*/

9197

-public static final native void _cairo_glyph_path(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs);

9198

-public static final void cairo_glyph_path(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs) {

9199

+public static final native void _cairo_glyph_path(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs);

9200

+public static final void cairo_glyph_path(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs) {

9201

lock.lock();

9202

try {

9203

_cairo_glyph_path(cr, glyphs, num_glyphs);

9204

@@ -514,8 +514,8 @@

9205

}

9206

}

9207

/** @param cr cast=(cairo_t *) */

9208

-public static final native void _cairo_identity_matrix(int /*long*/ cr);

9209

-public static final void cairo_identity_matrix(int /*long*/ cr) {

9210

+public static final native void _cairo_identity_matrix(long /*int*/ cr);

9211

+public static final void cairo_identity_matrix(long /*int*/ cr) {

9212

lock.lock();

9213

try {

9214

_cairo_identity_matrix(cr);

9215

@@ -523,8 +523,8 @@

9216

lock.unlock();

9217

}

9218

}

9219

-public static final native int /*long*/ _cairo_image_surface_create(int format, int width, int height);

9220

-public static final int /*long*/ cairo_image_surface_create(int format, int width, int height) {

9221

+public static final native long /*int*/ _cairo_image_surface_create(int format, int width, int height);

9222

+public static final long /*int*/ cairo_image_surface_create(int format, int width, int height) {

9223

lock.lock();

9224

try {

9225

return _cairo_image_surface_create(format, width, height);

9226

@@ -533,8 +533,8 @@

9227

}

9228

}

9229

/** @param data cast=(unsigned char *) */

9230

-public static final native int /*long*/ _cairo_image_surface_create_for_data(int /*long*/ data, int format, int width, int height, int stride);

9231

-public static final int /*long*/ cairo_image_surface_create_for_data(int /*long*/ data, int format, int width, int height, int stride) {

9232

+public static final native long /*int*/ _cairo_image_surface_create_for_data(long /*int*/ data, int format, int width, int height, int stride);

9233

+public static final long /*int*/ cairo_image_surface_create_for_data(long /*int*/ data, int format, int width, int height, int stride) {

9234

lock.lock();

9235

try {

9236

return _cairo_image_surface_create_for_data(data, format, width, height, stride);

9237

@@ -543,8 +543,8 @@

9238

}

9239

}

9240

/** @param surface cast=(cairo_surface_t *) */

9241

-public static final native int _cairo_image_surface_get_height(int /*long*/ surface);

9242

-public static final int cairo_image_surface_get_height(int /*long*/ surface) {

9243

+public static final native int _cairo_image_surface_get_height(long /*int*/ surface);

9244

+public static final int cairo_image_surface_get_height(long /*int*/ surface) {

9245

lock.lock();

9246

try {

9247

return _cairo_image_surface_get_height(surface);

9248

@@ -553,8 +553,8 @@

9249

}

9250

}

9251

/** @param surface cast=(cairo_surface_t *) */

9252

-public static final native int _cairo_image_surface_get_width(int /*long*/ surface);

9253

-public static final int cairo_image_surface_get_width(int /*long*/ surface) {

9254

+public static final native int _cairo_image_surface_get_width(long /*int*/ surface);

9255

+public static final int cairo_image_surface_get_width(long /*int*/ surface) {

9256

lock.lock();

9257

try {

9258

return _cairo_image_surface_get_width(surface);

9259

@@ -563,8 +563,8 @@

9260

}

9261

}

9262

/** @param cr cast=(cairo_t *) */

9263

-public static final native int _cairo_in_fill(int /*long*/ cr, double x, double y);

9264

-public static final int cairo_in_fill(int /*long*/ cr, double x, double y) {

9265

+public static final native int _cairo_in_fill(long /*int*/ cr, double x, double y);

9266

+public static final int cairo_in_fill(long /*int*/ cr, double x, double y) {

9267

lock.lock();

9268

try {

9269

return _cairo_in_fill(cr, x, y);

9270

@@ -573,8 +573,8 @@

9271

}

9272

}

9273

/** @param cr cast=(cairo_t *) */

9274

-public static final native int _cairo_in_stroke(int /*long*/ cr, double x, double y);

9275

-public static final int cairo_in_stroke(int /*long*/ cr, double x, double y) {

9276

+public static final native int _cairo_in_stroke(long /*int*/ cr, double x, double y);

9277

+public static final int cairo_in_stroke(long /*int*/ cr, double x, double y) {

9278

lock.lock();

9279

try {

9280

return _cairo_in_stroke(cr, x, y);

9281

@@ -583,8 +583,8 @@

9282

}

9283

}

9284

/** @param cr cast=(cairo_t *) */

9285

-public static final native void _cairo_line_to(int /*long*/ cr, double x, double y);

9286

-public static final void cairo_line_to(int /*long*/ cr, double x, double y) {

9287

+public static final native void _cairo_line_to(long /*int*/ cr, double x, double y);

9288

+public static final void cairo_line_to(long /*int*/ cr, double x, double y) {

9289

lock.lock();

9290

try {

9291

_cairo_line_to(cr, x, y);

9292

@@ -596,8 +596,8 @@

9293

* @param cr cast=(cairo_t *)

9294

* @param pattern cast=(cairo_pattern_t *)

9295

*/

9296

-public static final native void _cairo_mask(int /*long*/ cr, int /*long*/ pattern);

9297

-public static final void cairo_mask(int /*long*/ cr, int /*long*/ pattern) {

9298

+public static final native void _cairo_mask(long /*int*/ cr, long /*int*/ pattern);

9299

+public static final void cairo_mask(long /*int*/ cr, long /*int*/ pattern) {

9300

lock.lock();

9301

try {

9302

_cairo_mask(cr, pattern);

9303

@@ -609,8 +609,8 @@

9304

* @param cr cast=(cairo_t *)

9305

* @param surface cast=(cairo_surface_t *)

9306

*/

9307

-public static final native void _cairo_mask_surface(int /*long*/ cr, int /*long*/ surface, double surface_x, double surface_y);

9308

-public static final void cairo_mask_surface(int /*long*/ cr, int /*long*/ surface, double surface_x, double surface_y) {

9309

+public static final native void _cairo_mask_surface(long /*int*/ cr, long /*int*/ surface, double surface_x, double surface_y);

9310

+public static final void cairo_mask_surface(long /*int*/ cr, long /*int*/ surface, double surface_x, double surface_y) {

9311

lock.lock();

9312

try {

9313

_cairo_mask_surface(cr, surface, surface_x, surface_y);

9314

@@ -743,8 +743,8 @@

9315

}

9316

}

9317

/** @param cr cast=(cairo_t *) */

9318

-public static final native void _cairo_move_to(int /*long*/ cr, double x, double y);

9319

-public static final void cairo_move_to(int /*long*/ cr, double x, double y) {

9320

+public static final native void _cairo_move_to(long /*int*/ cr, double x, double y);

9321

+public static final void cairo_move_to(long /*int*/ cr, double x, double y) {

9322

lock.lock();

9323

try {

9324

_cairo_move_to(cr, x, y);

9325

@@ -753,8 +753,8 @@

9326

}

9327

}

9328

/** @param cr cast=(cairo_t *) */

9329

-public static final native void _cairo_new_path(int /*long*/ cr);

9330

-public static final void cairo_new_path(int /*long*/ cr) {

9331

+public static final native void _cairo_new_path(long /*int*/ cr);

9332

+public static final void cairo_new_path(long /*int*/ cr) {

9333

lock.lock();

9334

try {

9335

_cairo_new_path(cr);

9336

@@ -763,8 +763,8 @@

9337

}

9338

}

9339

/** @param cr cast=(cairo_t *) */

9340

-public static final native void _cairo_paint(int /*long*/ cr);

9341

-public static final void cairo_paint(int /*long*/ cr) {

9342

+public static final native void _cairo_paint(long /*int*/ cr);

9343

+public static final void cairo_paint(long /*int*/ cr) {

9344

lock.lock();

9345

try {

9346

_cairo_paint(cr);

9347

@@ -773,8 +773,8 @@

9348

}

9349

}

9350

/** @param cr cast=(cairo_t *) */

9351

-public static final native void _cairo_paint_with_alpha(int /*long*/ cr, double alpha);

9352

-public static final void cairo_paint_with_alpha(int /*long*/ cr, double alpha) {

9353

+public static final native void _cairo_paint_with_alpha(long /*int*/ cr, double alpha);

9354

+public static final void cairo_paint_with_alpha(long /*int*/ cr, double alpha) {

9355

lock.lock();

9356

try {

9357

_cairo_paint_with_alpha(cr, alpha);

9358

@@ -783,8 +783,8 @@

9359

}

9360

}

9361

/** @param path cast=(cairo_path_t *) */

9362

-public static final native void _cairo_path_destroy(int /*long*/ path);

9363

-public static final void cairo_path_destroy(int /*long*/ path) {

9364

+public static final native void _cairo_path_destroy(long /*int*/ path);

9365

+public static final void cairo_path_destroy(long /*int*/ path) {

9366

lock.lock();

9367

try {

9368

_cairo_path_destroy(path);

9369

@@ -793,8 +793,8 @@

9370

}

9371

}

9372

/** @param pattern cast=(cairo_pattern_t *) */

9373

-public static final native void _cairo_pattern_add_color_stop_rgb(int /*long*/ pattern, double offset, double red, double green, double blue);

9374

-public static final void cairo_pattern_add_color_stop_rgb(int /*long*/ pattern, double offset, double red, double green, double blue) {

9375

+public static final native void _cairo_pattern_add_color_stop_rgb(long /*int*/ pattern, double offset, double red, double green, double blue);

9376

+public static final void cairo_pattern_add_color_stop_rgb(long /*int*/ pattern, double offset, double red, double green, double blue) {

9377

lock.lock();

9378

try {

9379

_cairo_pattern_add_color_stop_rgb(pattern, offset, red, green, blue);

9380

@@ -803,8 +803,8 @@

9381

}

9382

}

9383

/** @param pattern cast=(cairo_pattern_t *) */

9384

-public static final native void _cairo_pattern_add_color_stop_rgba(int /*long*/ pattern, double offset, double red, double green, double blue, double alpha);

9385

-public static final void cairo_pattern_add_color_stop_rgba(int /*long*/ pattern, double offset, double red, double green, double blue, double alpha) {

9386

+public static final native void _cairo_pattern_add_color_stop_rgba(long /*int*/ pattern, double offset, double red, double green, double blue, double alpha);

9387

+public static final void cairo_pattern_add_color_stop_rgba(long /*int*/ pattern, double offset, double red, double green, double blue, double alpha) {

9388

lock.lock();

9389

try {

9390

_cairo_pattern_add_color_stop_rgba(pattern, offset, red, green, blue, alpha);

9391

@@ -813,8 +813,8 @@

9392

}

9393

}

9394

/** @param surface cast=(cairo_surface_t *) */

9395

-public static final native int /*long*/ _cairo_pattern_create_for_surface(int /*long*/ surface);

9396

-public static final int /*long*/ cairo_pattern_create_for_surface(int /*long*/ surface) {

9397

+public static final native long /*int*/ _cairo_pattern_create_for_surface(long /*int*/ surface);

9398

+public static final long /*int*/ cairo_pattern_create_for_surface(long /*int*/ surface) {

9399

lock.lock();

9400

try {

9401

return _cairo_pattern_create_for_surface(surface);

9402

@@ -822,8 +822,8 @@

9403

lock.unlock();

9404

}

9405

}

9406

-public static final native int /*long*/ _cairo_pattern_create_linear(double x0, double y0, double x1, double y1);

9407

-public static final int /*long*/ cairo_pattern_create_linear(double x0, double y0, double x1, double y1) {

9408

+public static final native long /*int*/ _cairo_pattern_create_linear(double x0, double y0, double x1, double y1);

9409

+public static final long /*int*/ cairo_pattern_create_linear(double x0, double y0, double x1, double y1) {

9410

lock.lock();

9411

try {

9412

return _cairo_pattern_create_linear(x0, y0, x1, y1);

9413

@@ -831,8 +831,8 @@

9414

lock.unlock();

9415

}

9416

}

9417

-public static final native int /*long*/ _cairo_pattern_create_radial(double cx0, double cy0, double radius0, double cx1, double cy1, double radius1);

9418

-public static final int /*long*/ cairo_pattern_create_radial(double cx0, double cy0, double radius0, double cx1, double cy1, double radius1) {

9419

+public static final native long /*int*/ _cairo_pattern_create_radial(double cx0, double cy0, double radius0, double cx1, double cy1, double radius1);

9420

+public static final long /*int*/ cairo_pattern_create_radial(double cx0, double cy0, double radius0, double cx1, double cy1, double radius1) {

9421

lock.lock();

9422

try {

9423

return _cairo_pattern_create_radial(cx0, cy0, radius0, cx1, cy1, radius1);

9424

@@ -841,8 +841,8 @@

9425

}

9426

}

9427

/** @param pattern cast=(cairo_pattern_t *) */

9428

-public static final native void _cairo_pattern_destroy(int /*long*/ pattern);

9429

-public static final void cairo_pattern_destroy(int /*long*/ pattern) {

9430

+public static final native void _cairo_pattern_destroy(long /*int*/ pattern);

9431

+public static final void cairo_pattern_destroy(long /*int*/ pattern) {

9432

lock.lock();

9433

try {

9434

_cairo_pattern_destroy(pattern);

9435

@@ -851,8 +851,8 @@

9436

}

9437

}

9438

/** @param pattern cast=(cairo_pattern_t *) */

9439

-public static final native int _cairo_pattern_get_extend(int /*long*/ pattern);

9440

-public static final int cairo_pattern_get_extend(int /*long*/ pattern) {

9441

+public static final native int _cairo_pattern_get_extend(long /*int*/ pattern);

9442

+public static final int cairo_pattern_get_extend(long /*int*/ pattern) {

9443

lock.lock();

9444

try {

9445

return _cairo_pattern_get_extend(pattern);

9446

@@ -861,8 +861,8 @@

9447

}

9448

}

9449

/** @param pattern cast=(cairo_pattern_t *) */

9450

-public static final native int _cairo_pattern_get_filter(int /*long*/ pattern);

9451

-public static final int cairo_pattern_get_filter(int /*long*/ pattern) {

9452

+public static final native int _cairo_pattern_get_filter(long /*int*/ pattern);

9453

+public static final int cairo_pattern_get_filter(long /*int*/ pattern) {

9454

lock.lock();

9455

try {

9456

return _cairo_pattern_get_filter(pattern);

9457

@@ -874,8 +874,8 @@

9458

* @param pattern cast=(cairo_pattern_t *)

9459

* @param matrix cast=(cairo_matrix_t *)

9460

*/

9461

-public static final native void _cairo_pattern_get_matrix(int /*long*/ pattern, double[] matrix);

9462

-public static final void cairo_pattern_get_matrix(int /*long*/ pattern, double[] matrix) {

9463

+public static final native void _cairo_pattern_get_matrix(long /*int*/ pattern, double[] matrix);

9464

+public static final void cairo_pattern_get_matrix(long /*int*/ pattern, double[] matrix) {

9465

lock.lock();

9466

try {

9467

_cairo_pattern_get_matrix(pattern, matrix);

9468

@@ -884,8 +884,8 @@

9469

}

9470

}

9471

/** @param pattern cast=(cairo_pattern_t *) */

9472

-public static final native void _cairo_pattern_reference(int /*long*/ pattern);

9473

-public static final void cairo_pattern_reference(int /*long*/ pattern) {

9474

+public static final native void _cairo_pattern_reference(long /*int*/ pattern);

9475

+public static final void cairo_pattern_reference(long /*int*/ pattern) {

9476

lock.lock();

9477

try {

9478

_cairo_pattern_reference(pattern);

9479

@@ -894,8 +894,8 @@

9480

}

9481

}

9482

/** @param pattern cast=(cairo_pattern_t *) */

9483

-public static final native void _cairo_pattern_set_extend(int /*long*/ pattern, int extend);

9484

-public static final void cairo_pattern_set_extend(int /*long*/ pattern, int extend) {

9485

+public static final native void _cairo_pattern_set_extend(long /*int*/ pattern, int extend);

9486

+public static final void cairo_pattern_set_extend(long /*int*/ pattern, int extend) {

9487

lock.lock();

9488

try {

9489

_cairo_pattern_set_extend(pattern, extend);

9490

@@ -904,8 +904,8 @@

9491

}

9492

}

9493

/** @param pattern cast=(cairo_pattern_t *) */

9494

-public static final native void _cairo_pattern_set_filter(int /*long*/ pattern, int filter);

9495

-public static final void cairo_pattern_set_filter(int /*long*/ pattern, int filter) {

9496

+public static final native void _cairo_pattern_set_filter(long /*int*/ pattern, int filter);

9497

+public static final void cairo_pattern_set_filter(long /*int*/ pattern, int filter) {

9498

lock.lock();

9499

try {

9500

_cairo_pattern_set_filter(pattern, filter);

9501

@@ -917,8 +917,8 @@

9502

* @param pattern cast=(cairo_pattern_t *)

9503

* @param matrix cast=(cairo_matrix_t *)

9504

*/

9505

-public static final native void _cairo_pattern_set_matrix(int /*long*/ pattern, double[] matrix);

9506

-public static final void cairo_pattern_set_matrix(int /*long*/ pattern, double[] matrix) {

9507

+public static final native void _cairo_pattern_set_matrix(long /*int*/ pattern, double[] matrix);

9508

+public static final void cairo_pattern_set_matrix(long /*int*/ pattern, double[] matrix) {

9509

lock.lock();

9510

try {

9511

_cairo_pattern_set_matrix(pattern, matrix);

9512

@@ -930,8 +930,8 @@

9513

* @method flags=dynamic

9514

* @param surface cast=(cairo_surface_t *)

9515

*/

9516

-public static final native void _cairo_pdf_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points);

9517

-public static final void cairo_pdf_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points) {

9518

+public static final native void _cairo_pdf_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points);

9519

+public static final void cairo_pdf_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points) {

9520

lock.lock();

9521

try {

9522

_cairo_pdf_surface_set_size(surface, width_in_points, height_in_points);

9523

@@ -943,8 +943,8 @@

9524

* @method flags=dynamic

9525

* @param surface cast=(cairo_surface_t *)

9526

*/

9527

-public static final native void _cairo_ps_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points);

9528

-public static final void cairo_ps_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points) {

9529

+public static final native void _cairo_ps_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points);

9530

+public static final void cairo_ps_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points) {

9531

lock.lock();

9532

try {

9533

_cairo_ps_surface_set_size(surface, width_in_points, height_in_points);

9534

@@ -953,8 +953,8 @@

9535

}

9536

}

9537

/** @param cr cast=(cairo_t *) */

9538

-public static final native void _cairo_rectangle(int /*long*/ cr, double x, double y, double width, double height);

9539

-public static final void cairo_rectangle(int /*long*/ cr, double x, double y, double width, double height) {

9540

+public static final native void _cairo_rectangle(long /*int*/ cr, double x, double y, double width, double height);

9541

+public static final void cairo_rectangle(long /*int*/ cr, double x, double y, double width, double height) {

9542

lock.lock();

9543

try {

9544

_cairo_rectangle(cr, x, y, width, height);

9545

@@ -963,8 +963,8 @@

9546

}

9547

}

9548

/** @param cr cast=(cairo_t *) */

9549

-public static final native int /*long*/ _cairo_reference(int /*long*/ cr);

9550

-public static final int /*long*/ cairo_reference(int /*long*/ cr) {

9551

+public static final native long /*int*/ _cairo_reference(long /*int*/ cr);

9552

+public static final long /*int*/ cairo_reference(long /*int*/ cr) {

9553

lock.lock();

9554

try {

9555

return _cairo_reference(cr);

9556

@@ -973,8 +973,8 @@

9557

}

9558

}

9559

/** @param cr cast=(cairo_t *) */

9560

-public static final native void _cairo_rel_curve_to(int /*long*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3);

9561

-public static final void cairo_rel_curve_to(int /*long*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3) {

9562

+public static final native void _cairo_rel_curve_to(long /*int*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3);

9563

+public static final void cairo_rel_curve_to(long /*int*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3) {

9564

lock.lock();

9565

try {

9566

_cairo_rel_curve_to(cr, dx1, dy1, dx2, dy2, dx3, dy3);

9567

@@ -983,8 +983,8 @@

9568

}

9569

}

9570

/** @param cr cast=(cairo_t *) */

9571

-public static final native void _cairo_rel_line_to(int /*long*/ cr, double dx, double dy);

9572

-public static final void cairo_rel_line_to(int /*long*/ cr, double dx, double dy) {

9573

+public static final native void _cairo_rel_line_to(long /*int*/ cr, double dx, double dy);

9574

+public static final void cairo_rel_line_to(long /*int*/ cr, double dx, double dy) {

9575

lock.lock();

9576

try {

9577

_cairo_rel_line_to(cr, dx, dy);

9578

@@ -993,8 +993,8 @@

9579

}

9580

}

9581

/** @param cr cast=(cairo_t *) */

9582

-public static final native void _cairo_rel_move_to(int /*long*/ cr, double dx, double dy);

9583

-public static final void cairo_rel_move_to(int /*long*/ cr, double dx, double dy) {

9584

+public static final native void _cairo_rel_move_to(long /*int*/ cr, double dx, double dy);

9585

+public static final void cairo_rel_move_to(long /*int*/ cr, double dx, double dy) {

9586

lock.lock();

9587

try {

9588

_cairo_rel_move_to(cr, dx, dy);

9589

@@ -1003,8 +1003,8 @@

9590

}

9591

}

9592

/** @param cr cast=(cairo_t *) */

9593

-public static final native void _cairo_reset_clip(int /*long*/ cr);

9594

-public static final void cairo_reset_clip(int /*long*/ cr) {

9595

+public static final native void _cairo_reset_clip(long /*int*/ cr);

9596

+public static final void cairo_reset_clip(long /*int*/ cr) {

9597

lock.lock();

9598

try {

9599

_cairo_reset_clip(cr);

9600

@@ -1013,8 +1013,8 @@

9601

}

9602

}

9603

/** @param cr cast=(cairo_t *) */

9604

-public static final native void _cairo_restore(int /*long*/ cr);

9605

-public static final void cairo_restore(int /*long*/ cr) {

9606

+public static final native void _cairo_restore(long /*int*/ cr);

9607

+public static final void cairo_restore(long /*int*/ cr) {

9608

lock.lock();

9609

try {

9610

_cairo_restore(cr);

9611

@@ -1023,8 +1023,8 @@

9612

}

9613

}

9614

/** @param cr cast=(cairo_t *) */

9615

-public static final native void _cairo_rotate(int /*long*/ cr, double angle);

9616

-public static final void cairo_rotate(int /*long*/ cr, double angle) {

9617

+public static final native void _cairo_rotate(long /*int*/ cr, double angle);

9618

+public static final void cairo_rotate(long /*int*/ cr, double angle) {

9619

lock.lock();

9620

try {

9621

_cairo_rotate(cr, angle);

9622

@@ -1033,8 +1033,8 @@

9623

}

9624

}

9625

/** @param cr cast=(cairo_t *) */

9626

-public static final native void _cairo_save(int /*long*/ cr);

9627

-public static final void cairo_save(int /*long*/ cr) {

9628

+public static final native void _cairo_save(long /*int*/ cr);

9629

+public static final void cairo_save(long /*int*/ cr) {

9630

lock.lock();

9631

try {

9632

_cairo_save(cr);

9633

@@ -1043,8 +1043,8 @@

9634

}

9635

}

9636

/** @param cr cast=(cairo_t *) */

9637

-public static final native void _cairo_scale(int /*long*/ cr, double sx, double sy);

9638

-public static final void cairo_scale(int /*long*/ cr, double sx, double sy) {

9639

+public static final native void _cairo_scale(long /*int*/ cr, double sx, double sy);

9640

+public static final void cairo_scale(long /*int*/ cr, double sx, double sy) {

9641

lock.lock();

9642

try {

9643

_cairo_scale(cr, sx, sy);

9644

@@ -1056,8 +1056,8 @@

9645

* @param cr cast=(cairo_t *)

9646

* @param family cast=(const char *)

9647

*/

9648

-public static final native void _cairo_select_font_face(int /*long*/ cr, byte[] family, int slant, int weight);

9649

-public static final void cairo_select_font_face(int /*long*/ cr, byte[] family, int slant, int weight) {

9650

+public static final native void _cairo_select_font_face(long /*int*/ cr, byte[] family, int slant, int weight);

9651

+public static final void cairo_select_font_face(long /*int*/ cr, byte[] family, int slant, int weight) {

9652

lock.lock();

9653

try {

9654

_cairo_select_font_face(cr, family, slant, weight);

9655

@@ -1066,8 +1066,8 @@

9656

}

9657

}

9658

/** @param cr cast=(cairo_t *) */

9659

-public static final native void _cairo_set_antialias(int /*long*/ cr, int antialias);

9660

-public static final void cairo_set_antialias(int /*long*/ cr, int antialias) {

9661

+public static final native void _cairo_set_antialias(long /*int*/ cr, int antialias);

9662

+public static final void cairo_set_antialias(long /*int*/ cr, int antialias) {

9663

lock.lock();

9664

try {

9665

_cairo_set_antialias(cr, antialias);

9666

@@ -1076,8 +1076,8 @@

9667

}

9668

}

9669

/** @param cr cast=(cairo_t *) */

9670

-public static final native void _cairo_set_dash(int /*long*/ cr, double[] dashes, int ndash, double offset);

9671

-public static final void cairo_set_dash(int /*long*/ cr, double[] dashes, int ndash, double offset) {

9672

+public static final native void _cairo_set_dash(long /*int*/ cr, double[] dashes, int ndash, double offset);

9673

+public static final void cairo_set_dash(long /*int*/ cr, double[] dashes, int ndash, double offset) {

9674

lock.lock();

9675

try {

9676

_cairo_set_dash(cr, dashes, ndash, offset);

9677

@@ -1086,8 +1086,8 @@

9678

}

9679

}

9680

/** @param cr cast=(cairo_t *) */

9681

-public static final native void _cairo_set_fill_rule(int /*long*/ cr, int fill_rule);

9682

-public static final void cairo_set_fill_rule(int /*long*/ cr, int fill_rule) {

9683

+public static final native void _cairo_set_fill_rule(long /*int*/ cr, int fill_rule);

9684

+public static final void cairo_set_fill_rule(long /*int*/ cr, int fill_rule) {

9685

lock.lock();

9686

try {

9687

_cairo_set_fill_rule(cr, fill_rule);

9688

@@ -1099,8 +1099,8 @@

9689

* @param cr cast=(cairo_t *)

9690

* @param font_face cast=(cairo_font_face_t *)

9691

*/

9692

-public static final native void _cairo_set_font_face(int /*long*/ cr, int /*long*/ font_face);

9693

-public static final void cairo_set_font_face(int /*long*/ cr, int /*long*/ font_face) {

9694

+public static final native void _cairo_set_font_face(long /*int*/ cr, long /*int*/ font_face);

9695

+public static final void cairo_set_font_face(long /*int*/ cr, long /*int*/ font_face) {

9696

lock.lock();

9697

try {

9698

_cairo_set_font_face(cr, font_face);

9699

@@ -1112,8 +1112,8 @@

9700

* @param cr cast=(cairo_t *)

9701

* @param matrix cast=(cairo_matrix_t *)

9702

*/

9703

-public static final native void _cairo_set_font_matrix(int /*long*/ cr, double[] matrix);

9704

-public static final void cairo_set_font_matrix(int /*long*/ cr, double[] matrix) {

9705

+public static final native void _cairo_set_font_matrix(long /*int*/ cr, double[] matrix);

9706

+public static final void cairo_set_font_matrix(long /*int*/ cr, double[] matrix) {

9707

lock.lock();

9708

try {

9709

_cairo_set_font_matrix(cr, matrix);

9710

@@ -1125,8 +1125,8 @@

9711

* @param cr cast=(cairo_t *)

9712

* @param options cast=(cairo_font_options_t *)

9713

*/

9714

-public static final native void _cairo_set_font_options(int /*long*/ cr, int /*long*/ options);

9715

-public static final void cairo_set_font_options(int /*long*/ cr, int /*long*/ options) {

9716

+public static final native void _cairo_set_font_options(long /*int*/ cr, long /*int*/ options);

9717

+public static final void cairo_set_font_options(long /*int*/ cr, long /*int*/ options) {

9718

lock.lock();

9719

try {

9720

_cairo_set_font_options(cr, options);

9721

@@ -1135,8 +1135,8 @@

9722

}

9723

}

9724

/** @param cr cast=(cairo_t *) */

9725

-public static final native void _cairo_set_font_size(int /*long*/ cr, double size);

9726

-public static final void cairo_set_font_size(int /*long*/ cr, double size) {

9727

+public static final native void _cairo_set_font_size(long /*int*/ cr, double size);

9728

+public static final void cairo_set_font_size(long /*int*/ cr, double size) {

9729

lock.lock();

9730

try {

9731

_cairo_set_font_size(cr, size);

9732

@@ -1145,8 +1145,8 @@

9733

}

9734

}

9735

/** @param cr cast=(cairo_t *) */

9736

-public static final native void _cairo_set_line_cap(int /*long*/ cr, int line_cap);

9737

-public static final void cairo_set_line_cap(int /*long*/ cr, int line_cap) {

9738

+public static final native void _cairo_set_line_cap(long /*int*/ cr, int line_cap);

9739

+public static final void cairo_set_line_cap(long /*int*/ cr, int line_cap) {

9740

lock.lock();

9741

try {

9742

_cairo_set_line_cap(cr, line_cap);

9743

@@ -1155,8 +1155,8 @@

9744

}

9745

}

9746

/** @param cr cast=(cairo_t *) */

9747

-public static final native void _cairo_set_line_join(int /*long*/ cr, int line_join);

9748

-public static final void cairo_set_line_join(int /*long*/ cr, int line_join) {

9749

+public static final native void _cairo_set_line_join(long /*int*/ cr, int line_join);

9750

+public static final void cairo_set_line_join(long /*int*/ cr, int line_join) {

9751

lock.lock();

9752

try {

9753

_cairo_set_line_join(cr, line_join);

9754

@@ -1165,8 +1165,8 @@

9755

}

9756

}

9757

/** @param cr cast=(cairo_t *) */

9758

-public static final native void _cairo_set_line_width(int /*long*/ cr, double width);

9759

-public static final void cairo_set_line_width(int /*long*/ cr, double width) {

9760

+public static final native void _cairo_set_line_width(long /*int*/ cr, double width);

9761

+public static final void cairo_set_line_width(long /*int*/ cr, double width) {

9762

lock.lock();

9763

try {

9764

_cairo_set_line_width(cr, width);

9765

@@ -1178,8 +1178,8 @@

9766

* @param cr cast=(cairo_t *)

9767

* @param matrix cast=(cairo_matrix_t *)

9768

*/

9769

-public static final native void _cairo_set_matrix(int /*long*/ cr, double[] matrix);

9770

-public static final void cairo_set_matrix(int /*long*/ cr, double[] matrix) {

9771

+public static final native void _cairo_set_matrix(long /*int*/ cr, double[] matrix);

9772

+public static final void cairo_set_matrix(long /*int*/ cr, double[] matrix) {

9773

lock.lock();

9774

try {

9775

_cairo_set_matrix(cr, matrix);

9776

@@ -1188,8 +1188,8 @@

9777

}

9778

}

9779

/** @param cr cast=(cairo_t *) */

9780

-public static final native void _cairo_set_miter_limit(int /*long*/ cr, double limit);

9781

-public static final void cairo_set_miter_limit(int /*long*/ cr, double limit) {

9782

+public static final native void _cairo_set_miter_limit(long /*int*/ cr, double limit);

9783

+public static final void cairo_set_miter_limit(long /*int*/ cr, double limit) {

9784

lock.lock();

9785

try {

9786

_cairo_set_miter_limit(cr, limit);

9787

@@ -1198,8 +1198,8 @@

9788

}

9789

}

9790

/** @param cr cast=(cairo_t *) */

9791

-public static final native void _cairo_set_operator(int /*long*/ cr, int op);

9792

-public static final void cairo_set_operator(int /*long*/ cr, int op) {

9793

+public static final native void _cairo_set_operator(long /*int*/ cr, int op);

9794

+public static final void cairo_set_operator(long /*int*/ cr, int op) {

9795

lock.lock();

9796

try {

9797

_cairo_set_operator(cr, op);

9798

@@ -1211,8 +1211,8 @@

9799

* @param cr cast=(cairo_t *)

9800

* @param source cast=(cairo_pattern_t *)

9801

*/

9802

-public static final native void _cairo_set_source(int /*long*/ cr, int /*long*/ source);

9803

-public static final void cairo_set_source(int /*long*/ cr, int /*long*/ source) {

9804

+public static final native void _cairo_set_source(long /*int*/ cr, long /*int*/ source);

9805

+public static final void cairo_set_source(long /*int*/ cr, long /*int*/ source) {

9806

lock.lock();

9807

try {

9808

_cairo_set_source(cr, source);

9809

@@ -1221,8 +1221,8 @@

9810

}

9811

}

9812

/** @param cr cast=(cairo_t *) */

9813

-public static final native void _cairo_set_source_rgb(int /*long*/ cr, double red, double green, double blue);

9814

-public static final void cairo_set_source_rgb(int /*long*/ cr, double red, double green, double blue) {

9815

+public static final native void _cairo_set_source_rgb(long /*int*/ cr, double red, double green, double blue);

9816

+public static final void cairo_set_source_rgb(long /*int*/ cr, double red, double green, double blue) {

9817

lock.lock();

9818

try {

9819

_cairo_set_source_rgb(cr, red, green, blue);

9820

@@ -1231,8 +1231,8 @@

9821

}

9822

}

9823

/** @param cr cast=(cairo_t *) */

9824

-public static final native void _cairo_set_source_rgba(int /*long*/ cr, double red, double green, double blue, double alpha);

9825

-public static final void cairo_set_source_rgba(int /*long*/ cr, double red, double green, double blue, double alpha) {

9826

+public static final native void _cairo_set_source_rgba(long /*int*/ cr, double red, double green, double blue, double alpha);

9827

+public static final void cairo_set_source_rgba(long /*int*/ cr, double red, double green, double blue, double alpha) {

9828

lock.lock();

9829

try {

9830

_cairo_set_source_rgba(cr, red, green, blue, alpha);

9831

@@ -1244,8 +1244,8 @@

9832

* @param cr cast=(cairo_t *)

9833

* @param surface cast=(cairo_surface_t *)

9834

*/

9835

-public static final native void _cairo_set_source_surface(int /*long*/ cr, int /*long*/ surface, double x, double y);

9836

-public static final void cairo_set_source_surface(int /*long*/ cr, int /*long*/ surface, double x, double y) {

9837

+public static final native void _cairo_set_source_surface(long /*int*/ cr, long /*int*/ surface, double x, double y);

9838

+public static final void cairo_set_source_surface(long /*int*/ cr, long /*int*/ surface, double x, double y) {

9839

lock.lock();

9840

try {

9841

_cairo_set_source_surface(cr, surface, x, y);

9842

@@ -1254,8 +1254,8 @@

9843

}

9844

}

9845

/** @param cr cast=(cairo_t *) */

9846

-public static final native void _cairo_set_tolerance(int /*long*/ cr, double tolerance);

9847

-public static final void cairo_set_tolerance(int /*long*/ cr, double tolerance) {

9848

+public static final native void _cairo_set_tolerance(long /*int*/ cr, double tolerance);

9849

+public static final void cairo_set_tolerance(long /*int*/ cr, double tolerance) {

9850

lock.lock();

9851

try {

9852

_cairo_set_tolerance(cr, tolerance);

9853

@@ -1267,8 +1267,8 @@

9854

* @param cr cast=(cairo_t *)

9855

* @param glyphs cast=(cairo_glyph_t *)

9856

*/

9857

-public static final native void _cairo_show_glyphs(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs);

9858

-public static final void cairo_show_glyphs(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs) {

9859

+public static final native void _cairo_show_glyphs(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs);

9860

+public static final void cairo_show_glyphs(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs) {

9861

lock.lock();

9862

try {

9863

_cairo_show_glyphs(cr, glyphs, num_glyphs);

9864

@@ -1277,8 +1277,8 @@

9865

}

9866

}

9867

/** @param cr cast=(cairo_t *) */

9868

-public static final native void _cairo_show_page(int /*long*/ cr);

9869

-public static final void cairo_show_page(int /*long*/ cr) {

9870

+public static final native void _cairo_show_page(long /*int*/ cr);

9871

+public static final void cairo_show_page(long /*int*/ cr) {

9872

lock.lock();

9873

try {

9874

_cairo_show_page(cr);

9875

@@ -1290,8 +1290,8 @@

9876

* @param cr cast=(cairo_t *)

9877

* @param utf8 cast=(const char *)

9878

*/

9879

-public static final native void _cairo_show_text(int /*long*/ cr, byte[] utf8);

9880

-public static final void cairo_show_text(int /*long*/ cr, byte[] utf8) {

9881

+public static final native void _cairo_show_text(long /*int*/ cr, byte[] utf8);

9882

+public static final void cairo_show_text(long /*int*/ cr, byte[] utf8) {

9883

lock.lock();

9884

try {

9885

_cairo_show_text(cr, utf8);

9886

@@ -1300,8 +1300,8 @@

9887

}

9888

}

9889

/** @param cr cast=(cairo_t *) */

9890

-public static final native int _cairo_status(int /*long*/ cr);

9891

-public static final int cairo_status(int /*long*/ cr) {

9892

+public static final native int _cairo_status(long /*int*/ cr);

9893

+public static final int cairo_status(long /*int*/ cr) {

9894

lock.lock();

9895

try {

9896

return _cairo_status(cr);

9897

@@ -1309,8 +1309,8 @@

9898

lock.unlock();

9899

}

9900

}

9901

-public static final native int /*long*/ _cairo_status_to_string(int status);

9902

-public static final int /*long*/ cairo_status_to_string(int status) {

9903

+public static final native long /*int*/ _cairo_status_to_string(int status);

9904

+public static final long /*int*/ cairo_status_to_string(int status) {

9905

lock.lock();

9906

try {

9907

return _cairo_status_to_string(status);

9908

@@ -1319,8 +1319,8 @@

9909

}

9910

}

9911

/** @param cr cast=(cairo_t *) */

9912

-public static final native void _cairo_stroke(int /*long*/ cr);

9913

-public static final void cairo_stroke(int /*long*/ cr) {

9914

+public static final native void _cairo_stroke(long /*int*/ cr);

9915

+public static final void cairo_stroke(long /*int*/ cr) {

9916

lock.lock();

9917

try {

9918

_cairo_stroke(cr);

9919

@@ -1329,8 +1329,8 @@

9920

}

9921

}

9922

/** @param cr cast=(cairo_t *) */

9923

-public static final native void _cairo_stroke_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);

9924

-public static final void cairo_stroke_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2) {

9925

+public static final native void _cairo_stroke_extents(long /*int*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);

9926

+public static final void cairo_stroke_extents(long /*int*/ cr, double[] x1, double[] y1, double[] x2, double[] y2) {

9927

lock.lock();

9928

try {

9929

_cairo_stroke_extents(cr, x1, y1, x2, y2);

9930

@@ -1339,8 +1339,8 @@

9931

}

9932

}

9933

/** @param cr cast=(cairo_t *) */

9934

-public static final native void _cairo_stroke_preserve(int /*long*/ cr);

9935

-public static final void cairo_stroke_preserve(int /*long*/ cr) {

9936

+public static final native void _cairo_stroke_preserve(long /*int*/ cr);

9937

+public static final void cairo_stroke_preserve(long /*int*/ cr) {

9938

lock.lock();

9939

try {

9940

_cairo_stroke_preserve(cr);

9941

@@ -1349,8 +1349,8 @@

9942

}

9943

}

9944

/** @param other cast=(cairo_surface_t *) */

9945

-public static final native int /*long*/ _cairo_surface_create_similar(int /*long*/ other, int format, int width, int height);

9946

-public static final int /*long*/ cairo_surface_create_similar(int /*long*/ other, int format, int width, int height) {

9947

+public static final native long /*int*/ _cairo_surface_create_similar(long /*int*/ other, int format, int width, int height);

9948

+public static final long /*int*/ cairo_surface_create_similar(long /*int*/ other, int format, int width, int height) {

9949

lock.lock();

9950

try {

9951

return _cairo_surface_create_similar(other, format, width, height);

9952

@@ -1359,8 +1359,8 @@

9953

}

9954

}

9955

/** @param surface cast=(cairo_surface_t *) */

9956

-public static final native void _cairo_surface_destroy(int /*long*/ surface);

9957

-public static final void cairo_surface_destroy(int /*long*/ surface) {

9958

+public static final native void _cairo_surface_destroy(long /*int*/ surface);

9959

+public static final void cairo_surface_destroy(long /*int*/ surface) {

9960

lock.lock();

9961

try {

9962

_cairo_surface_destroy(surface);

9963

@@ -1369,8 +1369,8 @@

9964

}

9965

}

9966

/** @param surface cast=(cairo_surface_t *) */

9967

-public static final native void _cairo_surface_finish(int /*long*/ surface);

9968

-public static final void cairo_surface_finish(int /*long*/ surface) {

9969

+public static final native void _cairo_surface_finish(long /*int*/ surface);

9970

+public static final void cairo_surface_finish(long /*int*/ surface) {

9971

lock.lock();

9972

try {

9973

_cairo_surface_finish(surface);

9974

@@ -1382,8 +1382,8 @@

9975

* @method flags=dynamic

9976

* @param surface cast=(cairo_surface_t *)

9977

*/

9978

-public static final native int _cairo_surface_get_type(int /*long*/ surface);

9979

-public static final int cairo_surface_get_type(int /*long*/ surface) {

9980

+public static final native int _cairo_surface_get_type(long /*int*/ surface);

9981

+public static final int cairo_surface_get_type(long /*int*/ surface) {

9982

lock.lock();

9983

try {

9984

return _cairo_surface_get_type(surface);

9985

@@ -1395,8 +1395,8 @@

9986

* @param surface cast=(cairo_surface_t *)

9987

* @param key cast=(cairo_user_data_key_t *)

9988

*/

9989

-public static final native int /*long*/ _cairo_surface_get_user_data(int /*long*/ surface, int /*long*/ key);

9990

-public static final int /*long*/ cairo_surface_get_user_data(int /*long*/ surface, int /*long*/ key) {

9991

+public static final native long /*int*/ _cairo_surface_get_user_data(long /*int*/ surface, long /*int*/ key);

9992

+public static final long /*int*/ cairo_surface_get_user_data(long /*int*/ surface, long /*int*/ key) {

9993

lock.lock();

9994

try {

9995

return _cairo_surface_get_user_data(surface, key);

9996

@@ -1405,8 +1405,8 @@

9997

}

9998

}

9999

/** @param surface cast=(cairo_surface_t *) */

10000

-public static final native void _cairo_surface_reference(int /*long*/ surface);

10001

-public static final void cairo_surface_reference(int /*long*/ surface) {

10002

+public static final native void _cairo_surface_reference(long /*int*/ surface);

10003

+public static final void cairo_surface_reference(long /*int*/ surface) {

10004

lock.lock();

10005

try {

10006

_cairo_surface_reference(surface);

10007

@@ -1415,8 +1415,8 @@

10008

}

10009

}

10010

/** @param surface cast=(cairo_surface_t *) */

10011

-public static final native void _cairo_surface_set_device_offset(int /*long*/ surface, double x_offset, double y_offset);

10012

-public static final void cairo_surface_set_device_offset(int /*long*/ surface, double x_offset, double y_offset) {

10013

+public static final native void _cairo_surface_set_device_offset(long /*int*/ surface, double x_offset, double y_offset);

10014

+public static final void cairo_surface_set_device_offset(long /*int*/ surface, double x_offset, double y_offset) {

10015

lock.lock();

10016

try {

10017

_cairo_surface_set_device_offset(surface, x_offset, y_offset);

10018

@@ -1425,8 +1425,8 @@

10019

}

10020

}

10021

/** @method flags=dynamic */

10022

-public static final native void _cairo_surface_set_fallback_resolution(int /*long*/ surface, double x_pixels_per_inch, double y_pixels_per_inch);

10023

-public static final void cairo_surface_set_fallback_resolution(int /*long*/ surface, double x_pixels_per_inch, double y_pixels_per_inch) {

10024

+public static final native void _cairo_surface_set_fallback_resolution(long /*int*/ surface, double x_pixels_per_inch, double y_pixels_per_inch);

10025

+public static final void cairo_surface_set_fallback_resolution(long /*int*/ surface, double x_pixels_per_inch, double y_pixels_per_inch) {

10026

lock.lock();

10027

try {

10028

_cairo_surface_set_fallback_resolution(surface, x_pixels_per_inch, y_pixels_per_inch);

10029

@@ -1440,8 +1440,8 @@

10030

* @param user_data cast=(void *)

10031

* @param destroy cast=(cairo_destroy_func_t)

10032

*/

10033

-public static final native int _cairo_surface_set_user_data(int /*long*/ surface, int /*long*/ key, int /*long*/ user_data, int /*long*/ destroy);

10034

-public static final int cairo_surface_set_user_data(int /*long*/ surface, int /*long*/ key, int /*long*/ user_data, int /*long*/ destroy) {

10035

+public static final native int _cairo_surface_set_user_data(long /*int*/ surface, long /*int*/ key, long /*int*/ user_data, long /*int*/ destroy);

10036

+public static final int cairo_surface_set_user_data(long /*int*/ surface, long /*int*/ key, long /*int*/ user_data, long /*int*/ destroy) {

10037

lock.lock();

10038

try {

10039

return _cairo_surface_set_user_data(surface, key, user_data, destroy);

10040

@@ -1454,8 +1454,8 @@

10041

* @param utf8 cast=(const char *)

10042

* @param extents cast=(cairo_text_extents_t *)

10043

*/

10044

-public static final native void _cairo_text_extents(int /*long*/ cr, byte[] utf8, cairo_text_extents_t extents);

10045

-public static final void cairo_text_extents(int /*long*/ cr, byte[] utf8, cairo_text_extents_t extents) {

10046

+public static final native void _cairo_text_extents(long /*int*/ cr, byte[] utf8, cairo_text_extents_t extents);

10047

+public static final void cairo_text_extents(long /*int*/ cr, byte[] utf8, cairo_text_extents_t extents) {

10048

lock.lock();

10049

try {

10050

_cairo_text_extents(cr, utf8, extents);

10051

@@ -1467,8 +1467,8 @@

10052

* @param cr cast=(cairo_t *)

10053

* @param utf8 cast=(const char *)

10054

*/

10055

-public static final native void _cairo_text_path(int /*long*/ cr, byte[] utf8);

10056

-public static final void cairo_text_path(int /*long*/ cr, byte[] utf8) {

10057

+public static final native void _cairo_text_path(long /*int*/ cr, byte[] utf8);

10058

+public static final void cairo_text_path(long /*int*/ cr, byte[] utf8) {

10059

lock.lock();

10060

try {

10061

_cairo_text_path(cr, utf8);

10062

@@ -1480,8 +1480,8 @@

10063

* @param cr cast=(cairo_t *)

10064

* @param matrix cast=(cairo_matrix_t *)

10065

*/

10066

-public static final native void _cairo_transform(int /*long*/ cr, double[] matrix);

10067

-public static final void cairo_transform(int /*long*/ cr, double[] matrix) {

10068

+public static final native void _cairo_transform(long /*int*/ cr, double[] matrix);

10069

+public static final void cairo_transform(long /*int*/ cr, double[] matrix) {

10070

lock.lock();

10071

try {

10072

_cairo_transform(cr, matrix);

10073

@@ -1490,8 +1490,8 @@

10074

}

10075

}

10076

/** @param cr cast=(cairo_t *) */

10077

-public static final native void _cairo_translate(int /*long*/ cr, double tx, double ty);

10078

-public static final void cairo_translate(int /*long*/ cr, double tx, double ty) {

10079

+public static final native void _cairo_translate(long /*int*/ cr, double tx, double ty);

10080

+public static final void cairo_translate(long /*int*/ cr, double tx, double ty) {

10081

lock.lock();

10082

try {

10083

_cairo_translate(cr, tx, ty);

10084

@@ -1500,8 +1500,8 @@

10085

}

10086

}

10087

/** @param cr cast=(cairo_t *) */

10088

-public static final native void _cairo_user_to_device(int /*long*/ cr, double[] x, double[] y);

10089

-public static final void cairo_user_to_device(int /*long*/ cr, double[] x, double[] y) {

10090

+public static final native void _cairo_user_to_device(long /*int*/ cr, double[] x, double[] y);

10091

+public static final void cairo_user_to_device(long /*int*/ cr, double[] x, double[] y) {

10092

lock.lock();

10093

try {

10094

_cairo_user_to_device(cr, x, y);

10095

@@ -1510,8 +1510,8 @@

10096

}

10097

}

10098

/** @param cr cast=(cairo_t *) */

10099

-public static final native void _cairo_user_to_device_distance(int /*long*/ cr, double[] dx, double[] dy);

10100

-public static final void cairo_user_to_device_distance(int /*long*/ cr, double[] dx, double[] dy) {

10101

+public static final native void _cairo_user_to_device_distance(long /*int*/ cr, double[] dx, double[] dy);

10102

+public static final void cairo_user_to_device_distance(long /*int*/ cr, double[] dx, double[] dy) {

10103

lock.lock();

10104

try {

10105

_cairo_user_to_device_distance(cr, dx, dy);

10106

@@ -1525,8 +1525,8 @@

10107

* @param drawable cast=(Drawable)

10108

* @param visual cast=(Visual *)

10109

*/

10110

-public static final native int /*long*/ _cairo_xlib_surface_create(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ visual, int width, int height);

10111

-public static final int /*long*/ cairo_xlib_surface_create(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ visual, int width, int height) {

10112

+public static final native long /*int*/ _cairo_xlib_surface_create(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ visual, int width, int height);

10113

+public static final long /*int*/ cairo_xlib_surface_create(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ visual, int width, int height) {

10114

lock.lock();

10115

try {

10116

return _cairo_xlib_surface_create(dpy, drawable, visual, width, height);

10117

@@ -1539,8 +1539,8 @@

10118

* @param pixmap cast=(Pixmap)

10119

* @param screen cast=(Screen *)

10120

*/

10121

-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);

10122

-public static final int /*long*/ cairo_xlib_surface_create_for_bitmap(int /*long*/ dpy, int /*long*/ pixmap, int /*long*/ screen, int width, int height) {

10123

+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);

10124

+public static final long /*int*/ cairo_xlib_surface_create_for_bitmap(long /*int*/ dpy, long /*int*/ pixmap, long /*int*/ screen, int width, int height) {

10125

lock.lock();

10126

try {

10127

return _cairo_xlib_surface_create_for_bitmap(dpy, pixmap, screen, width, height);

10128

@@ -1549,8 +1549,8 @@

10129

}

10130

}

10131

/** @param surface cast=(cairo_surface_t *) */

10132

-public static final native void _cairo_xlib_surface_set_size(int /*long*/ surface, int width, int height);

10133

-public static final void cairo_xlib_surface_set_size(int /*long*/ surface, int width, int height) {

10134

+public static final native void _cairo_xlib_surface_set_size(long /*int*/ surface, int width, int height);

10135

+public static final void cairo_xlib_surface_set_size(long /*int*/ surface, int width, int height) {

10136

lock.lock();

10137

try {

10138

_cairo_xlib_surface_set_size(surface, width, height);

10139

@@ -1563,18 +1563,18 @@

10140

* @param src cast=(const void *)

10141

* @param size cast=(size_t)

10142

*/

10143

-public static final native void memmove(cairo_path_t dest, int /*long*/ src, int /*long*/ size);

10144

+public static final native void memmove(cairo_path_t dest, long /*int*/ src, long /*int*/ size);

10145

/**

10146

* @param dest cast=(void *)

10147

* @param src cast=(const void *)

10148

* @param size cast=(size_t)

10149

*/

10150

-public static final native void memmove(cairo_path_data_t dest, int /*long*/ src, int /*long*/ size);

10151

+public static final native void memmove(cairo_path_data_t dest, long /*int*/ src, long /*int*/ size);

10152

/**

10153

* @param dest cast=(void *)

10154

* @param src cast=(const void *)

10155

* @param size cast=(size_t)

10156

*/

10157

-public static final native void memmove(double[] dest, int /*long*/ src, int /*long*/ size);

10158

+public static final native void memmove(double[] dest, long /*int*/ src, long /*int*/ size);

10159

10160

}

10161

diff -urN x86/org/eclipse/swt/internal/cairo/cairo_path_t.java x86_64/org/eclipse/swt/internal/cairo/cairo_path_t.java

10162

--- x86/org/eclipse/swt/internal/cairo/cairo_path_t.java 2009-05-29 17:30:14.000000000 -0400

10163

+++ x86_64/org/eclipse/swt/internal/cairo/cairo_path_t.java 2009-09-17 08:48:22.000000000 -0400

10164

@@ -24,7 +24,7 @@

10165

public class cairo_path_t {

10166

public int status;

10167

/** @field cast=(cairo_path_data_t *) */

10168

- public int /*long*/ data;

10169

+ public long /*int*/ data;

10170

public int num_data;

10171

public static final int sizeof = Cairo.cairo_path_t_sizeof();

10172

}

10173

diff -urN x86/org/eclipse/swt/internal/Callback.java x86_64/org/eclipse/swt/internal/Callback.java

10174

--- x86/org/eclipse/swt/internal/Callback.java 2007-05-31 18:04:10.000000000 -0400

10175

+++ x86_64/org/eclipse/swt/internal/Callback.java 2009-09-17 08:48:24.000000000 -0400

10176

@@ -28,7 +28,7 @@

10177

Object object;

10178

String method, signature;

10179

int argCount;

10180

- int /*long*/ address, errorResult;

10181

+ long /*int*/ address, errorResult;

10182

boolean isStatic, isArrayBased;

10183

10184

static final String PTR_SIGNATURE = C.PTR_SIZEOF == 4 ? "I" : "J"; //$NON-NLS-1$ //$NON-NLS-2$

10185

@@ -88,7 +88,7 @@

10186

* @param isArrayBased <code>true</code> if the arguments should be passed in an array and false otherwise

10187

* @param errorResult the return value if the java code throws an exception

10188

*/

10189

-public Callback (Object object, String method, int argCount, boolean isArrayBased, int /*long*/ errorResult) {

10190

+public Callback (Object object, String method, int argCount, boolean isArrayBased, long /*int*/ errorResult) {

10191

10192

/* Set the callback fields */

10193

this.object = object;

10194

@@ -131,7 +131,7 @@

10195

* @param isArrayBased whether the callback's method is array based

10196

* @param errorResult the callback's error result

10197

*/

10198

-static native synchronized int /*long*/ bind (Callback callback, Object object, String method, String signature, int argCount, boolean isStatic, boolean isArrayBased, int /*long*/ errorResult);

10199

+static native synchronized long /*int*/ bind (Callback callback, Object object, String method, String signature, int argCount, boolean isStatic, boolean isArrayBased, long /*int*/ errorResult);

10200

10201

/**

10202

* Releases the native level resources associated with the callback,

10203

@@ -152,7 +152,7 @@

10204

*

10205

* @return the callback address

10206

*/

10207

-public int /*long*/ getAddress () {

10208

+public long /*int*/ getAddress () {

10209

return address;

10210

}

10211

10212

diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/internal/cde/CDE.java

10213

--- x86/org/eclipse/swt/internal/cde/CDE.java 2009-05-29 17:30:26.000000000 -0400

10214

+++ x86_64/org/eclipse/swt/internal/cde/CDE.java 2009-09-17 08:48:24.000000000 -0400

10215

@@ -33,8 +33,8 @@

10216

* @param appName cast=(char *)

10217

* @param appClass cast=(char *)

10218

*/

10219

-public static final native boolean _DtAppInitialize(int /*long*/ appContext, int /*long*/ display, int /*long*/ topWiget, byte[] appName, byte[] appClass);

10220

-public static final boolean DtAppInitialize(int /*long*/ appContext, int /*long*/ display, int /*long*/ topWiget, byte[] appName, byte[] appClass) {

10221

+public static final native boolean _DtAppInitialize(long /*int*/ appContext, long /*int*/ display, long /*int*/ topWiget, byte[] appName, byte[] appClass);

10222

+public static final boolean DtAppInitialize(long /*int*/ appContext, long /*int*/ display, long /*int*/ topWiget, byte[] appName, byte[] appClass) {

10223

lock.lock();

10224

try {

10225

return _DtAppInitialize(appContext, display, topWiget, appName, appClass);

10226

@@ -51,8 +51,8 @@

10227

lock.unlock();

10228

}

10229

}

10230

-public static final native int /*long*/ _DtDtsDataTypeNames();

10231

-public static final int /*long*/ DtDtsDataTypeNames() {

10232

+public static final native long /*int*/ _DtDtsDataTypeNames();

10233

+public static final long /*int*/ DtDtsDataTypeNames() {

10234

lock.lock();

10235

try {

10236

return _DtDtsDataTypeNames();

10237

@@ -61,8 +61,8 @@

10238

}

10239

}

10240

/** @param fileName cast=(char *) */

10241

-public static final native int /*long*/ _DtDtsFileToDataType(byte[] fileName);

10242

-public static final int /*long*/ DtDtsFileToDataType(byte[] fileName) {

10243

+public static final native long /*int*/ _DtDtsFileToDataType(byte[] fileName);

10244

+public static final long /*int*/ DtDtsFileToDataType(byte[] fileName) {

10245

lock.lock();

10246

try {

10247

return _DtDtsFileToDataType(fileName);

10248

@@ -85,8 +85,8 @@

10249

* @param attrName cast=(char *)

10250

* @param optName cast=(char *)

10251

*/

10252

-public static final native int /*long*/ _DtDtsDataTypeToAttributeValue(byte[] dataType, byte[] attrName, byte[] optName);

10253

-public static final int /*long*/ DtDtsDataTypeToAttributeValue(byte[] dataType, byte[] attrName, byte[] optName) {

10254

+public static final native long /*int*/ _DtDtsDataTypeToAttributeValue(byte[] dataType, byte[] attrName, byte[] optName);

10255

+public static final long /*int*/ DtDtsDataTypeToAttributeValue(byte[] dataType, byte[] attrName, byte[] optName) {

10256

lock.lock();

10257

try {

10258

return _DtDtsDataTypeToAttributeValue(dataType, attrName, optName);

10259

@@ -95,8 +95,8 @@

10260

}

10261

}

10262

/** @param dataType cast=(char *) */

10263

-public static final native void _DtDtsFreeDataType(int /*long*/ dataType);

10264

-public static final void DtDtsFreeDataType(int /*long*/ dataType) {

10265

+public static final native void _DtDtsFreeDataType(long /*int*/ dataType);

10266

+public static final void DtDtsFreeDataType(long /*int*/ dataType) {

10267

lock.lock();

10268

try {

10269

_DtDtsFreeDataType(dataType);

10270

@@ -105,8 +105,8 @@

10271

}

10272

}

10273

/** @param dataTypeList cast=(char **) */

10274

-public static final native void _DtDtsFreeDataTypeNames(int /*long*/ dataTypeList);

10275

-public static final void DtDtsFreeDataTypeNames(int /*long*/ dataTypeList) {

10276

+public static final native void _DtDtsFreeDataTypeNames(long /*int*/ dataTypeList);

10277

+public static final void DtDtsFreeDataTypeNames(long /*int*/ dataTypeList) {

10278

lock.lock();

10279

try {

10280

_DtDtsFreeDataTypeNames(dataTypeList);

10281

@@ -115,8 +115,8 @@

10282

}

10283

}

10284

/** @param attrValue cast=(char *) */

10285

-public static final native void _DtDtsFreeAttributeValue(int /*long*/ attrValue);

10286

-public static final void DtDtsFreeAttributeValue(int /*long*/ attrValue) {

10287

+public static final native void _DtDtsFreeAttributeValue(long /*int*/ attrValue);

10288

+public static final void DtDtsFreeAttributeValue(long /*int*/ attrValue) {

10289

lock.lock();

10290

try {

10291

_DtDtsFreeAttributeValue(attrValue);

10292

@@ -133,8 +133,8 @@

10293

* @param callback cast=(DtActionCallbackProc)

10294

* @param clientData cast=(XtPointer)

10295

*/

10296

-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);

10297

-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) {

10298

+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);

10299

+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) {

10300

lock.lock();

10301

try {

10302

return _DtActionInvoke(topWidget, action, args, argCount, termOpts, execHost, contextDir, useIndicator, callback, clientData);

10303

@@ -143,8 +143,8 @@

10304

}

10305

}

10306

/** @method flags=const */

10307

-public static final native int /*long*/ _topLevelShellWidgetClass();

10308

-public static final int /*long*/ topLevelShellWidgetClass() {

10309

+public static final native long /*int*/ _topLevelShellWidgetClass();

10310

+public static final long /*int*/ topLevelShellWidgetClass() {

10311

lock.lock();

10312

try {

10313

return _topLevelShellWidgetClass();

10314

@@ -159,8 +159,8 @@

10315

* @param display cast=(Display *)

10316

* @param argList cast=(ArgList)

10317

*/

10318

-public static final native int /*long*/ _XtAppCreateShell(byte[] appName, byte[] appClass, int /*long*/ widgetClass, int /*long*/ display, int /*long*/ [] argList, int argCount);

10319

-public static final int /*long*/ XtAppCreateShell(byte[] appName, byte[] appClass, int /*long*/ widgetClass, int /*long*/ display, int /*long*/ [] argList, int argCount) {

10320

+public static final native long /*int*/ _XtAppCreateShell(byte[] appName, byte[] appClass, long /*int*/ widgetClass, long /*int*/ display, long /*int*/ [] argList, int argCount);

10321

+public static final long /*int*/ XtAppCreateShell(byte[] appName, byte[] appClass, long /*int*/ widgetClass, long /*int*/ display, long /*int*/ [] argList, int argCount) {

10322

lock.lock();

10323

try {

10324

return _XtAppCreateShell(appName, appClass, widgetClass, display, argList, argCount);

10325

@@ -168,8 +168,8 @@

10326

lock.unlock();

10327

}

10328

}

10329

-public static final native int /*long*/ _XtCreateApplicationContext();

10330

-public static final int /*long*/ XtCreateApplicationContext() {

10331

+public static final native long /*int*/ _XtCreateApplicationContext();

10332

+public static final long /*int*/ XtCreateApplicationContext() {

10333

lock.lock();

10334

try {

10335

return _XtCreateApplicationContext();

10336

@@ -187,8 +187,8 @@

10337

* @param argc cast=(int *)

10338

* @param argv cast=(String *)

10339

*/

10340

-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);

10341

-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) {

10342

+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);

10343

+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) {

10344

lock.lock();

10345

try {

10346

_XtDisplayInitialize(appContext, display, appName, appClass, options, num_options, argc, argv);

10347

@@ -197,8 +197,8 @@

10348

}

10349

}

10350

/** @param widget cast=(Widget) */

10351

-public static final native void _XtRealizeWidget(int /*long*/ widget);

10352

-public static final void XtRealizeWidget(int /*long*/ widget) {

10353

+public static final native void _XtRealizeWidget(long /*int*/ widget);

10354

+public static final void XtRealizeWidget(long /*int*/ widget) {

10355

lock.lock();

10356

try {

10357

_XtRealizeWidget(widget);

10358

@@ -207,8 +207,8 @@

10359

}

10360

}

10361

/** @param widget cast=(Widget) */

10362

-public static final native void _XtResizeWidget(int /*long*/ widget, int width, int height, int borderWidth);

10363

-public static final void XtResizeWidget(int /*long*/ widget, int width, int height, int borderWidth) {

10364

+public static final native void _XtResizeWidget(long /*int*/ widget, int width, int height, int borderWidth);

10365

+public static final void XtResizeWidget(long /*int*/ widget, int width, int height, int borderWidth) {

10366

lock.lock();

10367

try {

10368

_XtResizeWidget(widget, width, height, borderWidth);

10369

@@ -217,8 +217,8 @@

10370

}

10371

}

10372

/** @param widget cast=(Widget) */

10373

-public static final native void _XtSetMappedWhenManaged(int /*long*/ widget, boolean flag);

10374

-public static final void XtSetMappedWhenManaged(int /*long*/ widget, boolean flag) {

10375

+public static final native void _XtSetMappedWhenManaged(long /*int*/ widget, boolean flag);

10376

+public static final void XtSetMappedWhenManaged(long /*int*/ widget, boolean flag) {

10377

lock.lock();

10378

try {

10379

_XtSetMappedWhenManaged(widget, flag);

10380

diff -urN x86/org/eclipse/swt/internal/cde/DtActionArg.java x86_64/org/eclipse/swt/internal/cde/DtActionArg.java

10381

--- x86/org/eclipse/swt/internal/cde/DtActionArg.java 2009-05-29 17:30:26.000000000 -0400

10382

+++ x86_64/org/eclipse/swt/internal/cde/DtActionArg.java 2009-09-17 08:48:24.000000000 -0400

10383

@@ -14,6 +14,6 @@

10384

public class DtActionArg {

10385

public int argClass;

10386

/** @field accessor=u.file.name,cast=(char *) */

10387

- public int /*long*/ name;

10388

+ public long /*int*/ name;

10389

public static final int sizeof = CDE.DtActionArg_sizeof();

10390

}

10391

diff -urN x86/org/eclipse/swt/internal/C.java x86_64/org/eclipse/swt/internal/C.java

10392

--- x86/org/eclipse/swt/internal/C.java 2009-05-29 17:30:14.000000000 -0400

10393

+++ x86_64/org/eclipse/swt/internal/C.java 2009-09-17 08:48:24.000000000 -0400

10394

@@ -24,118 +24,118 @@

10395

public static final int PTR_SIZEOF = PTR_sizeof ();

10396

10397

/** @param ptr cast=(void *) */

10398

-public static final native void free (int /*long*/ ptr);

10399

+public static final native void free (long /*int*/ ptr);

10400

/** @param env cast=(const char *) */

10401

-public static final native int /*long*/ getenv (byte[] env);

10402

-public static final native int /*long*/ malloc (int /*long*/ size);

10403

+public static final native long /*int*/ getenv (byte[] env);

10404

+public static final native long /*int*/ malloc (long /*int*/ size);

10405

/**

10406

* @param dest cast=(void *)

10407

* @param src cast=(const void *),flags=no_out critical

10408

* @param size cast=(size_t)

10409

*/

10410

-public static final native void memmove (int /*long*/ dest, byte[] src, int /*long*/ size);

10411

+public static final native void memmove (long /*int*/ dest, byte[] src, long /*int*/ size);

10412

/**

10413

* @param dest cast=(void *)

10414

* @param src cast=(const void *),flags=no_out critical

10415

* @param size cast=(size_t)

10416

*/

10417

-public static final native void memmove (int /*long*/ dest, char[] src, int /*long*/ size);

10418

+public static final native void memmove (long /*int*/ dest, char[] src, long /*int*/ size);

10419

/**

10420

* @param dest cast=(void *)

10421

* @param src cast=(const void *),flags=no_out critical

10422

* @param size cast=(size_t)

10423

*/

10424

-public static final native void memmove (int /*long*/ dest, double[] src, int /*long*/ size);

10425

+public static final native void memmove (long /*int*/ dest, double[] src, long /*int*/ size);

10426

/**

10427

* @param dest cast=(void *)

10428

* @param src cast=(const void *),flags=no_out critical

10429

* @param size cast=(size_t)

10430

*/

10431

-public static final native void memmove (int /*long*/ dest, float[] src, int /*long*/ size);

10432

+public static final native void memmove (long /*int*/ dest, float[] src, long /*int*/ size);

10433

/**

10434

* @param dest cast=(void *)

10435

* @param src cast=(const void *),flags=no_out critical

10436

* @param size cast=(size_t)

10437

*/

10438

-public static final native void memmove (int /*long*/ dest, int[] src, int /*long*/ size);

10439

+public static final native void memmove (long /*int*/ dest, int[] src, long /*int*/ size);

10440

/**

10441

* @param dest cast=(void *)

10442

* @param src cast=(const void *),flags=no_out critical

10443

* @param size cast=(size_t)

10444

*/

10445

-public static final native void memmove (int /*long*/ dest, long[] src, int /*long*/ size);

10446

+public static final native void memmove (long /*int*/ dest, long[] src, long /*int*/ size);

10447

/**

10448

* @param dest cast=(void *)

10449

* @param src cast=(const void *),flags=no_out critical

10450

* @param size cast=(size_t)

10451

*/

10452

-public static final native void memmove (int /*long*/ dest, short[] src, int /*long*/ size);

10453

+public static final native void memmove (long /*int*/ dest, short[] src, long /*int*/ size);

10454

/**

10455

* @param dest cast=(void *),flags=no_in critical

10456

* @param src cast=(const void *),flags=no_out critical

10457

* @param size cast=(size_t)

10458

*/

10459

-public static final native void memmove (byte[] dest, char[] src, int /*long*/ size);

10460

+public static final native void memmove (byte[] dest, char[] src, long /*int*/ size);

10461

/**

10462

* @param dest cast=(void *),flags=no_in critical

10463

* @param src cast=(const void *)

10464

* @param size cast=(size_t)

10465

*/

10466

-public static final native void memmove (byte[] dest, int /*long*/ src, int /*long*/ size);

10467

+public static final native void memmove (byte[] dest, long /*int*/ src, long /*int*/ size);

10468

/**

10469

* @param dest cast=(void *)

10470

* @param src cast=(const void *)

10471

* @param size cast=(size_t)

10472

*/

10473

-public static final native void memmove (int /*long*/ dest, int /*long*/ src, int /*long*/ size);

10474

+public static final native void memmove (long /*int*/ dest, long /*int*/ src, long /*int*/ size);

10475

/**

10476

* @param dest cast=(void *),flags=no_in critical

10477

* @param src cast=(const void *)

10478

* @param size cast=(size_t)

10479

*/

10480

-public static final native void memmove (char[] dest, int /*long*/ src, int /*long*/ size);

10481

+public static final native void memmove (char[] dest, long /*int*/ src, long /*int*/ size);

10482

/**

10483

* @param dest cast=(void *),flags=no_in critical

10484

* @param src cast=(const void *)

10485

* @param size cast=(size_t)

10486

*/

10487

-public static final native void memmove (double[] dest, int /*long*/ src, int /*long*/ size);

10488

+public static final native void memmove (double[] dest, long /*int*/ src, long /*int*/ size);

10489

/**

10490

* @param dest cast=(void *),flags=no_in critical

10491

* @param src cast=(const void *)

10492

* @param size cast=(size_t)

10493

*/

10494

-public static final native void memmove (float[] dest, int /*long*/ src, int /*long*/ size);

10495

+public static final native void memmove (float[] dest, long /*int*/ src, long /*int*/ size);

10496

/**

10497

* @param dest cast=(void *),flags=no_in critical

10498

* @param src cast=(const void *)

10499

* @param size cast=(size_t)

10500

*/

10501

-public static final native void memmove (int[] dest, byte[] src, int /*long*/ size);

10502

+public static final native void memmove (int[] dest, byte[] src, long /*int*/ size);

10503

/**

10504

* @param dest cast=(void *),flags=no_in critical

10505

* @param src cast=(const void *)

10506

* @param size cast=(size_t)

10507

*/

10508

-public static final native void memmove (short[] dest, int /*long*/ src, int /*long*/ size);

10509

+public static final native void memmove (short[] dest, long /*int*/ src, long /*int*/ size);

10510

/**

10511

* @param dest cast=(void *),flags=no_in critical

10512

* @param src cast=(const void *)

10513

* @param size cast=(size_t)

10514

*/

10515

-public static final native void memmove (int[] dest, int /*long*/ src, int /*long*/ size);

10516

+public static final native void memmove (int[] dest, long /*int*/ src, long /*int*/ size);

10517

/**

10518

* @param dest cast=(void *),flags=no_in critical

10519

* @param src cast=(const void *)

10520

* @param size cast=(size_t)

10521

*/

10522

-public static final native void memmove (long[] dest, int /*long*/ src, int /*long*/ size);

10523

+public static final native void memmove (long[] dest, long /*int*/ src, long /*int*/ size);

10524

/**

10525

* @param buffer cast=(void *),flags=critical

10526

* @param num cast=(size_t)

10527

*/

10528

-public static final native int /*long*/ memset (int /*long*/ buffer, int c, int /*long*/ num);

10529

+public static final native long /*int*/ memset (long /*int*/ buffer, int c, long /*int*/ num);

10530

public static final native int PTR_sizeof ();

10531

/** @param s cast=(char *) */

10532

-public static final native int strlen (int /*long*/ s);

10533

+public static final native int strlen (long /*int*/ s);

10534

}

10535

diff -urN x86/org/eclipse/swt/internal/Converter.java x86_64/org/eclipse/swt/internal/Converter.java

10536

--- x86/org/eclipse/swt/internal/Converter.java 2009-05-29 17:30:22.000000000 -0400

10537

+++ x86_64/org/eclipse/swt/internal/Converter.java 2009-09-17 08:48:24.000000000 -0400

10538

@@ -37,8 +37,8 @@

10539

}

10540

10541

public static char [] mbcsToWcs (String codePage, byte [] buffer) {

10542

- int /*long*/ [] items_written = new int /*long*/ [1];

10543

- int /*long*/ ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null);

10544

+ long /*int*/ [] items_written = new long /*int*/ [1];

10545

+ long /*int*/ ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null);

10546

if (ptr == 0) return EmptyCharArray;

10547

int length = (int)/*64*/items_written [0];

10548

char [] chars = new char [length];

10549

@@ -55,12 +55,12 @@

10550

}

10551

10552

public static byte [] wcsToMbcs (String codePage, char [] buffer, boolean terminate) {

10553

- int /*long*/ [] items_read = new int /*long*/ [1], items_written = new int /*long*/ [1];

10554

+ long /*int*/ [] items_read = new long /*int*/ [1], items_written = new long /*int*/ [1];

10555

/*

10556

* Note that g_utf16_to_utf8() stops converting

10557

* when it finds the first NULL.

10558

*/

10559

- int /*long*/ ptr = OS.g_utf16_to_utf8 (buffer, buffer.length, items_read, items_written, null);

10560

+ long /*int*/ ptr = OS.g_utf16_to_utf8 (buffer, buffer.length, items_read, items_written, null);

10561

if (ptr == 0) return terminate ? NullByteArray : EmptyByteArray;

10562

int written = (int)/*64*/items_written [0];

10563

byte [] bytes = new byte [written + (terminate ? 1 : 0)];

10564

diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/internal/gnome/GNOME.java

10565

--- x86/org/eclipse/swt/internal/gnome/GNOME.java 2009-05-29 17:30:16.000000000 -0400

10566

+++ x86_64/org/eclipse/swt/internal/gnome/GNOME.java 2009-09-17 08:48:24.000000000 -0400

10567

@@ -36,8 +36,8 @@

10568

/** Natives */

10569

10570

/** @param mem cast=(gpointer) */

10571

-public static final native void _g_free(int /*long*/ mem);

10572

-public static final void g_free(int /*long*/ mem) {

10573

+public static final native void _g_free(long /*int*/ mem);

10574

+public static final void g_free(long /*int*/ mem) {

10575

lock.lock();

10576

try {

10577

_g_free(mem);

10578

@@ -49,8 +49,8 @@

10579

* @param list cast=(GList *)

10580

* @param data cast=(gpointer)

10581

*/

10582

-public static final native int /*long*/ _g_list_append(int /*long*/ list, int /*long*/ data);

10583

-public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ data) {

10584

+public static final native long /*int*/ _g_list_append(long /*int*/ list, long /*int*/ data);

10585

+public static final long /*int*/ g_list_append(long /*int*/ list, long /*int*/ data) {

10586

lock.lock();

10587

try {

10588

return _g_list_append(list, data);

10589

@@ -59,8 +59,8 @@

10590

}

10591

}

10592

/** @param list cast=(GList *) */

10593

-public static final native void _g_list_free(int /*long*/ list);

10594

-public static final void g_list_free(int /*long*/ list) {

10595

+public static final native void _g_list_free(long /*int*/ list);

10596

+public static final void g_list_free(long /*int*/ list) {

10597

lock.lock();

10598

try {

10599

_g_list_free(list);

10600

@@ -68,8 +68,8 @@

10601

lock.unlock();

10602

}

10603

}

10604

-public static final native int /*long*/ _g_list_next(int /*long*/ list);

10605

-public static final int /*long*/ g_list_next(int /*long*/ list) {

10606

+public static final native long /*int*/ _g_list_next(long /*int*/ list);

10607

+public static final long /*int*/ g_list_next(long /*int*/ list) {

10608

lock.lock();

10609

try {

10610

return _g_list_next(list);

10611

@@ -78,8 +78,8 @@

10612

}

10613

}

10614

/** @param object cast=(gpointer) */

10615

-public static final native void _g_object_unref(int /*long*/ object);

10616

-public static final void g_object_unref(int /*long*/ object) {

10617

+public static final native void _g_object_unref(long /*int*/ object);

10618

+public static final void g_object_unref(long /*int*/ object) {

10619

lock.lock();

10620

try {

10621

_g_object_unref(object);

10622

@@ -97,8 +97,8 @@

10623

* @param flags cast=(GnomeIconLookupFlags)

10624

* @param result cast=(GnomeIconLookupResultFlags *)

10625

*/

10626

-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);

10627

-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) {

10628

+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);

10629

+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) {

10630

lock.lock();

10631

try {

10632

return _gnome_icon_lookup(icon_theme, thumbnail_factory, file_uri, custom_icon, file_info, mime_type, flags, result);

10633

@@ -111,8 +111,8 @@

10634

* @param icon_name cast=(const char *)

10635

* @param icon_data cast=(const GnomeIconData **)

10636

*/

10637

-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);

10638

-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) {

10639

+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);

10640

+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) {

10641

lock.lock();

10642

try {

10643

return _gnome_icon_theme_lookup_icon(theme, icon_name, size, icon_data, base_size);

10644

@@ -120,8 +120,8 @@

10645

lock.unlock();

10646

}

10647

}

10648

-public static final native int /*long*/ _gnome_icon_theme_new();

10649

-public static final int /*long*/ gnome_icon_theme_new() {

10650

+public static final native long /*int*/ _gnome_icon_theme_new();

10651

+public static final long /*int*/ gnome_icon_theme_new() {

10652

lock.lock();

10653

try {

10654

return _gnome_icon_theme_new();

10655

@@ -129,8 +129,8 @@

10656

lock.unlock();

10657

}

10658

}

10659

-public static final native int /*long*/ _gnome_vfs_get_registered_mime_types();

10660

-public static final int /*long*/ gnome_vfs_get_registered_mime_types() {

10661

+public static final native long /*int*/ _gnome_vfs_get_registered_mime_types();

10662

+public static final long /*int*/ gnome_vfs_get_registered_mime_types() {

10663

lock.lock();

10664

try {

10665

return _gnome_vfs_get_registered_mime_types();

10666

@@ -148,8 +148,8 @@

10667

}

10668

}

10669

/** @param uri cast=(const char *) */

10670

-public static final native int /*long*/ _gnome_vfs_make_uri_from_input(byte[] uri);

10671

-public static final int /*long*/ gnome_vfs_make_uri_from_input(byte[] uri) {

10672

+public static final native long /*int*/ _gnome_vfs_make_uri_from_input(byte[] uri);

10673

+public static final long /*int*/ gnome_vfs_make_uri_from_input(byte[] uri) {

10674

lock.lock();

10675

try {

10676

return _gnome_vfs_make_uri_from_input(uri);

10677

@@ -161,8 +161,8 @@

10678

* @method flags=dynamic

10679

* @param uri cast=(const char *)

10680

*/

10681

-public static final native int /*long*/ _gnome_vfs_make_uri_from_input_with_dirs(byte[] uri, int dirs);

10682

-public static final int /*long*/ gnome_vfs_make_uri_from_input_with_dirs(byte[] uri, int dirs) {

10683

+public static final native long /*int*/ _gnome_vfs_make_uri_from_input_with_dirs(byte[] uri, int dirs);

10684

+public static final long /*int*/ gnome_vfs_make_uri_from_input_with_dirs(byte[] uri, int dirs) {

10685

lock.lock();

10686

try {

10687

return _gnome_vfs_make_uri_from_input_with_dirs(uri, dirs);

10688

@@ -171,8 +171,8 @@

10689

}

10690

}

10691

/** @param application cast=(GnomeVFSMimeApplication *) */

10692

-public static final native void _gnome_vfs_mime_application_free(int /*long*/ application);

10693

-public static final void gnome_vfs_mime_application_free(int /*long*/ application) {

10694

+public static final native void _gnome_vfs_mime_application_free(long /*int*/ application);

10695

+public static final void gnome_vfs_mime_application_free(long /*int*/ application) {

10696

lock.lock();

10697

try {

10698

_gnome_vfs_mime_application_free(application);

10699

@@ -185,8 +185,8 @@

10700

* @param application cast=(GnomeVFSMimeApplication *)

10701

* @param uris cast=(GList *)

10702

*/

10703

-public static final native int _gnome_vfs_mime_application_launch(int /*long*/ application, int /*long*/ uris);

10704

-public static final int gnome_vfs_mime_application_launch(int /*long*/ application, int /*long*/ uris) {

10705

+public static final native int _gnome_vfs_mime_application_launch(long /*int*/ application, long /*int*/ uris);

10706

+public static final int gnome_vfs_mime_application_launch(long /*int*/ application, long /*int*/ uris) {

10707

lock.lock();

10708

try {

10709

return _gnome_vfs_mime_application_launch(application, uris);

10710

@@ -195,8 +195,8 @@

10711

}

10712

}

10713

/** @param list cast=(GList *) */

10714

-public static final native void _gnome_vfs_mime_extensions_list_free(int /*long*/ list);

10715

-public static final void gnome_vfs_mime_extensions_list_free(int /*long*/ list) {

10716

+public static final native void _gnome_vfs_mime_extensions_list_free(long /*int*/ list);

10717

+public static final void gnome_vfs_mime_extensions_list_free(long /*int*/ list) {

10718

lock.lock();

10719

try {

10720

_gnome_vfs_mime_extensions_list_free(list);

10721

@@ -205,8 +205,8 @@

10722

}

10723

}

10724

/** @param mimeType cast=(const char *) */

10725

-public static final native int /*long*/ _gnome_vfs_mime_get_default_application(byte[] mimeType);

10726

-public static final int /*long*/ gnome_vfs_mime_get_default_application(byte[] mimeType) {

10727

+public static final native long /*int*/ _gnome_vfs_mime_get_default_application(byte[] mimeType);

10728

+public static final long /*int*/ gnome_vfs_mime_get_default_application(byte[] mimeType) {

10729

lock.lock();

10730

try {

10731

return _gnome_vfs_mime_get_default_application(mimeType);

10732

@@ -215,8 +215,8 @@

10733

}

10734

}

10735

/** @param mime_type cast=(const char *) */

10736

-public static final native int /*long*/ _gnome_vfs_mime_get_extensions_list(int /*long*/ mime_type);

10737

-public static final int /*long*/ gnome_vfs_mime_get_extensions_list(int /*long*/ mime_type) {

10738

+public static final native long /*int*/ _gnome_vfs_mime_get_extensions_list(long /*int*/ mime_type);

10739

+public static final long /*int*/ gnome_vfs_mime_get_extensions_list(long /*int*/ mime_type) {

10740

lock.lock();

10741

try {

10742

return _gnome_vfs_mime_get_extensions_list(mime_type);

10743

@@ -225,8 +225,8 @@

10744

}

10745

}

10746

/** @param list cast=(GList *) */

10747

-public static final native void _gnome_vfs_mime_registered_mime_type_list_free(int /*long*/ list);

10748

-public static final void gnome_vfs_mime_registered_mime_type_list_free(int /*long*/ list) {

10749

+public static final native void _gnome_vfs_mime_registered_mime_type_list_free(long /*int*/ list);

10750

+public static final void gnome_vfs_mime_registered_mime_type_list_free(long /*int*/ list) {

10751

lock.lock();

10752

try {

10753

_gnome_vfs_mime_registered_mime_type_list_free(list);

10754

@@ -235,8 +235,8 @@

10755

}

10756

}

10757

/** @param file cast=(const char *) */

10758

-public static final native int /*long*/ _gnome_vfs_mime_type_from_name(byte[] file);

10759

-public static final int /*long*/ gnome_vfs_mime_type_from_name(byte[] file) {

10760

+public static final native long /*int*/ _gnome_vfs_mime_type_from_name(byte[] file);

10761

+public static final long /*int*/ gnome_vfs_mime_type_from_name(byte[] file) {

10762

lock.lock();

10763

try {

10764

return _gnome_vfs_mime_type_from_name(file);

10765

@@ -248,8 +248,8 @@

10766

* @method flags=dynamic

10767

* @param url cast=(const char *)

10768

*/

10769

-public static final native int _gnome_vfs_url_show(int /*long*/ url);

10770

-public static final int gnome_vfs_url_show(int /*long*/ url) {

10771

+public static final native int _gnome_vfs_url_show(long /*int*/ url);

10772

+public static final int gnome_vfs_url_show(long /*int*/ url) {

10773

lock.lock();

10774

try {

10775

return _gnome_vfs_url_show(url);

10776

@@ -262,5 +262,5 @@

10777

* @param src cast=(const void *)

10778

* @param count cast=(size_t)

10779

*/

10780

-public static final native void memmove (GnomeVFSMimeApplication dest, int /*long*/ src, int /*long*/ count);

10781

+public static final native void memmove (GnomeVFSMimeApplication dest, long /*int*/ src, long /*int*/ count);

10782

}

10783

diff -urN x86/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java x86_64/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java

10784

--- x86/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java 2009-05-29 17:30:16.000000000 -0400

10785

+++ x86_64/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java 2009-09-17 08:48:24.000000000 -0400

10786

@@ -17,17 +17,17 @@

10787

10788

public class GnomeVFSMimeApplication {

10789

/** @field cast=(char *) */

10790

- public int /*long*/ id;

10791

+ public long /*int*/ id;

10792

/** @field cast=(char *) */

10793

- public int /*long*/ name;

10794

+ public long /*int*/ name;

10795

/** @field cast=(char *) */

10796

- public int /*long*/ command;

10797

+ public long /*int*/ command;

10798

/** @field cast=(gboolean) */

10799

public boolean can_open_multiple_files;

10800

/** @field cast=(GnomeVFSMimeApplicationArgumentType) */

10801

public int expects_uris;

10802

/** @field cast=(GList *) */

10803

- public int /*long*/ supported_uri_schemes;

10804

+ public long /*int*/ supported_uri_schemes;

10805

/** @field cast=(gboolean) */

10806

public boolean requires_terminal;

10807

public static final int sizeof = GNOME.GnomeVFSMimeApplication_sizeof();

10808

diff -urN x86/org/eclipse/swt/internal/gtk/GdkDragContext.java x86_64/org/eclipse/swt/internal/gtk/GdkDragContext.java

10809

--- x86/org/eclipse/swt/internal/gtk/GdkDragContext.java 2009-05-29 17:30:08.000000000 -0400

10810

+++ x86_64/org/eclipse/swt/internal/gtk/GdkDragContext.java 2009-09-17 08:48:24.000000000 -0400

10811

@@ -21,11 +21,11 @@

10812

/** @field cast=(gboolean) */

10813

public boolean is_source;

10814

/** @field cast=(GdkWindow *) */

10815

- public int /*long*/ source_window;

10816

+ public long /*int*/ source_window;

10817

/** @field cast=(GdkWindow *) */

10818

- public int /*long*/ dest_window;

10819

+ public long /*int*/ dest_window;

10820

/** @field cast=(GList *) */

10821

- public int /*long*/ targets;

10822

+ public long /*int*/ targets;

10823

/** @field cast=(GdkDragAction) */

10824

public int actions;

10825

/** @field cast=(GdkDragAction) */

10826

diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventAny.java x86_64/org/eclipse/swt/internal/gtk/GdkEventAny.java

10827

--- x86/org/eclipse/swt/internal/gtk/GdkEventAny.java 2009-05-29 17:30:08.000000000 -0400

10828

+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventAny.java 2009-09-17 08:48:24.000000000 -0400

10829

@@ -17,7 +17,7 @@

10830

10831

public class GdkEventAny extends GdkEvent {

10832

/** @field cast=(GdkWindow *) */

10833

- public int /*long*/ window;

10834

+ public long /*int*/ window;

10835

/** @field cast=(gint8) */

10836

public byte send_event;

10837

public static final int sizeof = OS.GdkEventAny_sizeof();

10838

diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventButton.java x86_64/org/eclipse/swt/internal/gtk/GdkEventButton.java

10839

--- x86/org/eclipse/swt/internal/gtk/GdkEventButton.java 2009-05-29 17:30:08.000000000 -0400

10840

+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventButton.java 2009-09-17 08:48:24.000000000 -0400

10841

@@ -17,7 +17,7 @@

10842

10843

public class GdkEventButton extends GdkEvent {

10844

/** @field cast=(GdkWindow *) */

10845

- public int /*long*/ window;

10846

+ public long /*int*/ window;

10847

/** @field cast=(gint8) */

10848

public byte send_event;

10849

/** @field cast=(guint32) */

10850

@@ -27,13 +27,13 @@

10851

/** @field cast=(gdouble) */

10852

public double y;

10853

/** @field cast=(gdouble *) */

10854

- public int /*long*/ axes;

10855

+ public long /*int*/ axes;

10856

/** @field cast=(guint) */

10857

public int state;

10858

/** @field cast=(guint) */

10859

public int button;

10860

/** @field cast=(GdkDevice *) */

10861

- public int /*long*/ device;

10862

+ public long /*int*/ device;

10863

/** @field cast=(gdouble) */

10864

public double x_root;

10865

/** @field cast=(gdouble) */

10866

diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventCrossing.java x86_64/org/eclipse/swt/internal/gtk/GdkEventCrossing.java

10867

--- x86/org/eclipse/swt/internal/gtk/GdkEventCrossing.java 2009-05-29 17:30:08.000000000 -0400

10868

+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventCrossing.java 2009-09-17 08:48:24.000000000 -0400

10869

@@ -17,11 +17,11 @@

10870

10871

public class GdkEventCrossing extends GdkEvent {

10872

/** @field cast=(GdkWindow *) */

10873

- public int /*long*/ window;

10874

+ public long /*int*/ window;

10875

/** @field cast=(gint8) */

10876

public byte send_event;

10877

/** @field cast=(GdkWindow *) */

10878

- public int /*long*/ subwindow;

10879

+ public long /*int*/ subwindow;

10880

public int time;

10881

public double x;

10882

public double y;

10883

diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventExpose.java x86_64/org/eclipse/swt/internal/gtk/GdkEventExpose.java

10884

--- x86/org/eclipse/swt/internal/gtk/GdkEventExpose.java 2009-05-29 17:30:08.000000000 -0400

10885

+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventExpose.java 2009-09-17 08:48:24.000000000 -0400

10886

@@ -17,7 +17,7 @@

10887

10888

public class GdkEventExpose extends GdkEvent {

10889

/** @field cast=(GdkWindow *) */

10890

- public int /*long*/ window;

10891

+ public long /*int*/ window;

10892

/** @field cast=(gint8) */

10893

public byte send_event;

10894

/** @field accessor=area.x */

10895

@@ -29,7 +29,7 @@

10896

/** @field accessor=area.height */

10897

public int area_height;

10898

/** @field cast=(GdkRegion *) */

10899

- public int /*long*/ region;

10900

+ public long /*int*/ region;

10901

/** @field cast=(gint) */

10902

public int count;

10903

public static final int sizeof = OS.GdkEventExpose_sizeof();

10904

diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventFocus.java x86_64/org/eclipse/swt/internal/gtk/GdkEventFocus.java

10905

--- x86/org/eclipse/swt/internal/gtk/GdkEventFocus.java 2009-05-29 17:30:08.000000000 -0400

10906

+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventFocus.java 2009-09-17 08:48:24.000000000 -0400

10907

@@ -17,7 +17,7 @@

10908

10909

public class GdkEventFocus extends GdkEvent {

10910

/** @field cast=(GdkWindow *) */

10911

- public int /*long*/ window;

10912

+ public long /*int*/ window;

10913

/** @field cast=(gint8) */

10914

public byte send_event;

10915

/** @field cast=(gint16) */

10916

diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventKey.java x86_64/org/eclipse/swt/internal/gtk/GdkEventKey.java

10917

--- x86/org/eclipse/swt/internal/gtk/GdkEventKey.java 2009-05-29 17:30:08.000000000 -0400

10918

+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventKey.java 2009-09-17 08:48:24.000000000 -0400

10919

@@ -17,7 +17,7 @@

10920

10921

public class GdkEventKey extends GdkEvent {

10922

/** @field cast=(GdkWindow *) */

10923

- public int /*long*/ window;

10924

+ public long /*int*/ window;

10925

/** @field cast=(gint8) */

10926

public byte send_event;

10927

/** @field cast=(guint32) */

10928

@@ -29,7 +29,7 @@

10929

/** @field cast=(gint) */

10930

public int length;

10931

/** @field cast=(gchar *) */

10932

- public int /*long*/ string;

10933

+ public long /*int*/ string;

10934

/** @field cast=(guint16) */

10935

public short hardware_keycode;

10936

/** @field cast=(guint8) */

10937

diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventMotion.java x86_64/org/eclipse/swt/internal/gtk/GdkEventMotion.java

10938

--- x86/org/eclipse/swt/internal/gtk/GdkEventMotion.java 2009-05-29 17:30:08.000000000 -0400

10939

+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventMotion.java 2009-09-17 08:48:24.000000000 -0400

10940

@@ -17,7 +17,7 @@

10941

10942

public class GdkEventMotion extends GdkEvent {

10943

/** @field cast=(GdkWindow *) */

10944

- public int /*long*/ window;

10945

+ public long /*int*/ window;

10946

/** @field cast=(gint8) */

10947

public byte send_event;

10948

/** @field cast=(guint32) */

10949

@@ -27,13 +27,13 @@

10950

/** @field cast=(gdouble) */

10951

public double y;

10952

/** @field cast=(gdouble *) */

10953

- public int /*long*/ axes;

10954

+ public long /*int*/ axes;

10955

/** @field cast=(guint) */

10956

public int state;

10957

/** @field cast=(gint16) */

10958

public short is_hint;

10959

/** @field cast=(GdkDevice *) */

10960

- public int /*long*/ device;

10961

+ public long /*int*/ device;

10962

/** @field cast=(gdouble) */

10963

public double x_root;

10964

/** @field cast=(gdouble) */

10965

diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventScroll.java x86_64/org/eclipse/swt/internal/gtk/GdkEventScroll.java

10966

--- x86/org/eclipse/swt/internal/gtk/GdkEventScroll.java 2009-05-29 17:30:08.000000000 -0400

10967

+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventScroll.java 2009-09-17 08:48:24.000000000 -0400

10968

@@ -17,7 +17,7 @@

10969

10970

public class GdkEventScroll extends GdkEvent {

10971

/** @field cast=(GdkWindow *) */

10972

- public int /*long*/ window;

10973

+ public long /*int*/ window;

10974

/** @field cast=(gint8) */

10975

public byte send_event;

10976

/** @field cast=(guint32) */

10977

@@ -31,7 +31,7 @@

10978

/** @field cast=(GdkScrollDirection) */

10979

public int direction;

10980

/** @field cast=(GdkDevice *) */

10981

- public int /*long*/ device;

10982

+ public long /*int*/ device;

10983

/** @field cast=(gdouble) */

10984

public double x_root;

10985

/** @field cast=(gdouble) */

10986

diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventVisibility.java x86_64/org/eclipse/swt/internal/gtk/GdkEventVisibility.java

10987

--- x86/org/eclipse/swt/internal/gtk/GdkEventVisibility.java 2009-05-29 17:30:08.000000000 -0400

10988

+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventVisibility.java 2009-09-17 08:48:24.000000000 -0400

10989

@@ -17,7 +17,7 @@

10990

10991

public class GdkEventVisibility extends GdkEvent {

10992

/** @field cast=(GdkWindow *) */

10993

- public int /*long*/ window;

10994

+ public long /*int*/ window;

10995

/** @field cast=(gint8) */

10996

public byte send_event;

10997

/** @field cast=(GdkVisibilityState) */

10998

diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventWindowState.java x86_64/org/eclipse/swt/internal/gtk/GdkEventWindowState.java

10999

--- x86/org/eclipse/swt/internal/gtk/GdkEventWindowState.java 2009-05-29 17:30:08.000000000 -0400

11000

+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventWindowState.java 2009-09-17 08:48:24.000000000 -0400

11001

@@ -17,7 +17,7 @@

11002

11003

public class GdkEventWindowState extends GdkEvent {

11004

/** @field cast=(GdkWindow *) */

11005

- public int /*long*/ window;

11006

+ public long /*int*/ window;

11007

public byte send_event;

11008

public int changed_mask;

11009

public int new_window_state;

11010

diff -urN x86/org/eclipse/swt/internal/gtk/GdkGCValues.java x86_64/org/eclipse/swt/internal/gtk/GdkGCValues.java

11011

--- x86/org/eclipse/swt/internal/gtk/GdkGCValues.java 2009-05-29 17:30:08.000000000 -0400

11012

+++ x86_64/org/eclipse/swt/internal/gtk/GdkGCValues.java 2009-09-17 08:48:24.000000000 -0400

11013

@@ -33,17 +33,17 @@

11014

/** @field accessor=background.blue,cast=(guint16) */

11015

public short background_blue;

11016

/** @field cast=(GdkFont *) */

11017

- public int /*long*/ font;

11018

+ public long /*int*/ font;

11019

/** @field cast=(GdkFunction) */

11020

- public int /*long*/ function;

11021

+ public long /*int*/ function;

11022

/** @field cast=(GdkFill) */

11023

public int fill;

11024

/** @field cast=(GdkPixmap *) */

11025

- public int /*long*/ tile;

11026

+ public long /*int*/ tile;

11027

/** @field cast=(GdkPixmap *) */

11028

- public int /*long*/ stipple;

11029

+ public long /*int*/ stipple;

11030

/** @field cast=(GdkPixmap *) */

11031

- public int /*long*/ clip_mask;

11032

+ public long /*int*/ clip_mask;

11033

/** @field cast=(GdkSubwindowMode) */

11034

public int subwindow_mode;

11035

/** @field cast=(gint) */

11036

diff -urN x86/org/eclipse/swt/internal/gtk/GdkImage.java x86_64/org/eclipse/swt/internal/gtk/GdkImage.java

11037

--- x86/org/eclipse/swt/internal/gtk/GdkImage.java 2009-05-29 17:30:08.000000000 -0400

11038

+++ x86_64/org/eclipse/swt/internal/gtk/GdkImage.java 2009-09-17 08:48:24.000000000 -0400

11039

@@ -19,7 +19,7 @@

11040

/** @field cast=(GdkImageType) */

11041

public int type;

11042

/** @field cast=(GdkVisual *) */

11043

- public int /*long*/ visual;

11044

+ public long /*int*/ visual;

11045

/** @field cast=(GdkByteOrder) */

11046

public int byte_order;

11047

/** @field cast=(gint) */

11048

@@ -35,9 +35,9 @@

11049

/** @field cast=(guint16) */

11050

public short bits_per_pixel;

11051

/** @field cast=(gpointer) */

11052

- public int /*long*/ mem;

11053

+ public long /*int*/ mem;

11054

/** @field cast=(GdkColormap *) */

11055

- public int /*long*/ colormap;

11056

+ public long /*int*/ colormap;

11057

/** @field cast=(gpointer) */

11058

- public int /*long*/ windowing_data;

11059

+ public long /*int*/ windowing_data;

11060

}

11061

diff -urN x86/org/eclipse/swt/internal/gtk/GdkWindowAttr.java x86_64/org/eclipse/swt/internal/gtk/GdkWindowAttr.java

11062

--- x86/org/eclipse/swt/internal/gtk/GdkWindowAttr.java 2009-05-29 17:30:08.000000000 -0400

11063

+++ x86_64/org/eclipse/swt/internal/gtk/GdkWindowAttr.java 2009-09-17 08:48:24.000000000 -0400

11064

@@ -17,23 +17,23 @@

11065

11066

public class GdkWindowAttr {

11067

/** @field cast=(gchar *) */

11068

- public int /*long*/ title;

11069

+ public long /*int*/ title;

11070

public int event_mask;

11071

public int x, y;

11072

public int width;

11073

public int height;

11074

public int wclass;

11075

/** @field cast=(GdkVisual *) */

11076

- public int /*long*/ visual;

11077

+ public long /*int*/ visual;

11078

/** @field cast=(GdkColormap *) */

11079

- public int /*long*/ colormap;

11080

+ public long /*int*/ colormap;

11081

public int window_type;

11082

/** @field cast=(GdkCursor *) */

11083

- public int /*long*/ cursor;

11084

+ public long /*int*/ cursor;

11085

/** @field cast=(gchar *) */

11086

- public int /*long*/ wmclass_name;

11087

+ public long /*int*/ wmclass_name;

11088

/** @field cast=(gchar *) */

11089

- public int /*long*/ wmclass_class;

11090

+ public long /*int*/ wmclass_class;

11091

public boolean override_redirect;

11092

public static final int sizeof = OS.GdkWindowAttr_sizeof();

11093

}

11094

diff -urN x86/org/eclipse/swt/internal/gtk/GInterfaceInfo.java x86_64/org/eclipse/swt/internal/gtk/GInterfaceInfo.java

11095

--- x86/org/eclipse/swt/internal/gtk/GInterfaceInfo.java 2009-05-29 17:30:08.000000000 -0400

11096

+++ x86_64/org/eclipse/swt/internal/gtk/GInterfaceInfo.java 2009-09-17 08:48:24.000000000 -0400

11097

@@ -17,10 +17,10 @@

11098

11099

public class GInterfaceInfo {

11100

/** @field cast=(GInterfaceInitFunc) */

11101

- public int /*long*/ interface_init;

11102

+ public long /*int*/ interface_init;

11103

/** @field cast=(GInterfaceFinalizeFunc) */

11104

- public int /*long*/ interface_finalize;

11105

+ public long /*int*/ interface_finalize;

11106

/** @field cast=(gpointer) */

11107

- public int /*long*/ interface_data;

11108

+ public long /*int*/ interface_data;

11109

public static final int sizeof = OS.GInterfaceInfo_sizeof();

11110

}

11111

diff -urN x86/org/eclipse/swt/internal/gtk/GObjectClass.java x86_64/org/eclipse/swt/internal/gtk/GObjectClass.java

11112

--- x86/org/eclipse/swt/internal/gtk/GObjectClass.java 2009-05-29 17:30:08.000000000 -0400

11113

+++ x86_64/org/eclipse/swt/internal/gtk/GObjectClass.java 2009-09-17 08:48:24.000000000 -0400

11114

@@ -17,17 +17,17 @@

11115

11116

public class GObjectClass {

11117

/** @field cast=(GObject *(*)()) */

11118

- public int /*long*/ constructor;

11119

+ public long /*int*/ constructor;

11120

/** @field cast=(void (*)()) */

11121

- public int /*long*/ set_property;

11122

+ public long /*int*/ set_property;

11123

/** @field cast=(void (*)()) */

11124

- public int /*long*/ get_property;

11125

+ public long /*int*/ get_property;

11126

/** @field cast=(void (*)()) */

11127

- public int /*long*/ dispose;

11128

+ public long /*int*/ dispose;

11129

/** @field cast=(void (*)()) */

11130

- public int /*long*/ finalize;

11131

+ public long /*int*/ finalize;

11132

/** @field cast=(void (*)()) */

11133

- public int /*long*/ dispatch_properties_changed;

11134

+ public long /*int*/ dispatch_properties_changed;

11135

/** @field cast=(void (*)()) */

11136

- public int /*long*/ notify;

11137

+ public long /*int*/ notify;

11138

}

11139

diff -urN x86/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java x86_64/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java

11140

--- x86/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java 2009-05-29 17:30:08.000000000 -0400

11141

+++ x86_64/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java 2009-09-17 08:48:24.000000000 -0400

11142

@@ -17,7 +17,7 @@

11143

11144

public class GtkCellRendererClass {

11145

/** @field cast=(void(*)()) */

11146

- public int /*long*/ render;

11147

+ public long /*int*/ render;

11148

/** @field cast=(void(*)()) */

11149

- public int /*long*/ get_size;

11150

+ public long /*int*/ get_size;

11151

}

11152

diff -urN x86/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java x86_64/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java

11153

--- x86/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java 2009-05-29 17:30:08.000000000 -0400

11154

+++ x86_64/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java 2009-09-17 08:48:24.000000000 -0400

11155

@@ -17,11 +17,11 @@

11156

11157

public class GtkColorSelectionDialog {

11158

/** @field cast=(GtkWidget *) */

11159

- public int /*long*/ colorsel;

11160

+ public long /*int*/ colorsel;

11161

/** @field cast=(GtkWidget *) */

11162

- public int /*long*/ ok_button;

11163

+ public long /*int*/ ok_button;

11164

/** @field cast=(GtkWidget *) */

11165

- public int /*long*/ cancel_button;

11166

+ public long /*int*/ cancel_button;

11167

/** @field cast=(GtkWidget *) */

11168

- public int /*long*/ help_button;

11169

+ public long /*int*/ help_button;

11170

}

11171

diff -urN x86/org/eclipse/swt/internal/gtk/GtkCombo.java x86_64/org/eclipse/swt/internal/gtk/GtkCombo.java

11172

--- x86/org/eclipse/swt/internal/gtk/GtkCombo.java 2009-05-29 17:30:08.000000000 -0400

11173

+++ x86_64/org/eclipse/swt/internal/gtk/GtkCombo.java 2009-09-17 08:48:24.000000000 -0400

11174

@@ -17,7 +17,7 @@

11175

11176

public class GtkCombo {

11177

/** @field cast=(GtkWidget *) */

11178

- public int /*long*/ entry;

11179

+ public long /*int*/ entry;

11180

/** @field cast=(GtkWidget *) */

11181

- public int /*long*/ list;

11182

+ public long /*int*/ list;

11183

}

11184

diff -urN x86/org/eclipse/swt/internal/gtk/GtkFileSelection.java x86_64/org/eclipse/swt/internal/gtk/GtkFileSelection.java

11185

--- x86/org/eclipse/swt/internal/gtk/GtkFileSelection.java 2009-05-29 17:30:08.000000000 -0400

11186

+++ x86_64/org/eclipse/swt/internal/gtk/GtkFileSelection.java 2009-09-17 08:48:24.000000000 -0400

11187

@@ -17,43 +17,43 @@

11188

11189

public class GtkFileSelection {

11190

/** @field cast=(GtkWidget *) */

11191

- public int /*long*/ dir_list;

11192

+ public long /*int*/ dir_list;

11193

/** @field cast=(GtkWidget *) */

11194

- public int /*long*/ file_list;

11195

+ public long /*int*/ file_list;

11196

/** @field cast=(GtkWidget *) */

11197

- public int /*long*/ selection_entry;

11198

+ public long /*int*/ selection_entry;

11199

/** @field cast=(GtkWidget *) */

11200

- public int /*long*/ selection_text;

11201

+ public long /*int*/ selection_text;

11202

/** @field cast=(GtkWidget *) */

11203

- public int /*long*/ main_vbox;

11204

+ public long /*int*/ main_vbox;

11205

/** @field cast=(GtkWidget *) */

11206

- public int /*long*/ ok_button;

11207

+ public long /*int*/ ok_button;

11208

/** @field cast=(GtkWidget *) */

11209

- public int /*long*/ cancel_button;

11210

+ public long /*int*/ cancel_button;

11211

/** @field cast=(GtkWidget *) */

11212

- public int /*long*/ help_button;

11213

+ public long /*int*/ help_button;

11214

/** @field cast=(GtkWidget *) */

11215

- public int /*long*/ history_pulldown;

11216

+ public long /*int*/ history_pulldown;

11217

/** @field cast=(GtkWidget *) */

11218

- public int /*long*/ history_menu;

11219

+ public long /*int*/ history_menu;

11220

/** @field cast=(GList *) */

11221

- public int /*long*/ history_list;

11222

+ public long /*int*/ history_list;

11223

/** @field cast=(GtkWidget *) */

11224

- public int /*long*/ fileop_dialog;

11225

+ public long /*int*/ fileop_dialog;

11226

/** @field cast=(GtkWidget *) */

11227

- public int /*long*/ fileop_entry;

11228

+ public long /*int*/ fileop_entry;

11229

/** @field cast=(gchar *) */

11230

- public int /*long*/ fileop_file;

11231

+ public long /*int*/ fileop_file;

11232

/** @field cast=(gpointer) */

11233

- public int /*long*/ cmpl_state; // gpointer

11234

+ public long /*int*/ cmpl_state; // gpointer

11235

/** @field cast=(GtkWidget *) */

11236

- public int /*long*/ fileop_c_dir;

11237

+ public long /*int*/ fileop_c_dir;

11238

/** @field cast=(GtkWidget *) */

11239

- public int /*long*/ fileop_del_file;

11240

+ public long /*int*/ fileop_del_file;

11241

/** @field cast=(GtkWidget *) */

11242

- public int /*long*/ fileop_ren_file;

11243

+ public long /*int*/ fileop_ren_file;

11244

/** @field cast=(GtkWidget *) */

11245

- public int /*long*/ button_area;

11246

+ public long /*int*/ button_area;

11247

/** @field cast=(GtkWidget *) */

11248

- public int /*long*/ action_area;

11249

+ public long /*int*/ action_area;

11250

}

11251

diff -urN x86/org/eclipse/swt/internal/gtk/GtkFixed.java x86_64/org/eclipse/swt/internal/gtk/GtkFixed.java

11252

--- x86/org/eclipse/swt/internal/gtk/GtkFixed.java 2009-05-29 17:30:10.000000000 -0400

11253

+++ x86_64/org/eclipse/swt/internal/gtk/GtkFixed.java 2009-09-17 08:48:24.000000000 -0400

11254

@@ -17,5 +17,5 @@

11255

11256

public class GtkFixed {

11257

/** @field cast=(GList *) */

11258

- public int /*long*/ children;

11259

+ public long /*int*/ children;

11260

}

11261

diff -urN x86/org/eclipse/swt/internal/gtk/GtkSelectionData.java x86_64/org/eclipse/swt/internal/gtk/GtkSelectionData.java

11262

--- x86/org/eclipse/swt/internal/gtk/GtkSelectionData.java 2009-05-29 17:30:08.000000000 -0400

11263

+++ x86_64/org/eclipse/swt/internal/gtk/GtkSelectionData.java 2009-09-17 08:48:24.000000000 -0400

11264

@@ -17,15 +17,15 @@

11265

11266

public class GtkSelectionData {

11267

/** @field cast=(GdkAtom) */

11268

- public int /*long*/ selection;

11269

+ public long /*int*/ selection;

11270

/** @field cast=(GdkAtom) */

11271

- public int /*long*/ target;

11272

+ public long /*int*/ target;

11273

/** @field cast=(GdkAtom) */

11274

- public int /*long*/ type;

11275

+ public long /*int*/ type;

11276

/** @field cast=(gint) */

11277

public int format;

11278

/** @field cast=(guchar *) */

11279

- public int /*long*/ data;

11280

+ public long /*int*/ data;

11281

/** @field cast=(gint) */

11282

public int length;

11283

public static final int sizeof = OS.GtkSelectionData_sizeof();

11284

diff -urN x86/org/eclipse/swt/internal/gtk/GtkTargetEntry.java x86_64/org/eclipse/swt/internal/gtk/GtkTargetEntry.java

11285

--- x86/org/eclipse/swt/internal/gtk/GtkTargetEntry.java 2009-05-29 17:30:08.000000000 -0400

11286

+++ x86_64/org/eclipse/swt/internal/gtk/GtkTargetEntry.java 2009-09-17 08:48:24.000000000 -0400

11287

@@ -17,7 +17,7 @@

11288

11289

public class GtkTargetEntry {

11290

/** @field cast=(gchar *) */

11291

- public int /*long*/ target;

11292

+ public long /*int*/ target;

11293

/** @field cast=(guint) */

11294

public int flags;

11295

/** @field cast=(guint) */

11296

diff -urN x86/org/eclipse/swt/internal/gtk/GtkTargetPair.java x86_64/org/eclipse/swt/internal/gtk/GtkTargetPair.java

11297

--- x86/org/eclipse/swt/internal/gtk/GtkTargetPair.java 2009-05-29 17:30:10.000000000 -0400

11298

+++ x86_64/org/eclipse/swt/internal/gtk/GtkTargetPair.java 2009-09-17 08:48:24.000000000 -0400

11299

@@ -17,7 +17,7 @@

11300

11301

public class GtkTargetPair {

11302

/** @field cast=(GdkAtom) */

11303

- public int /*long*/ target;

11304

+ public long /*int*/ target;

11305

/** @field cast=(guint) */

11306

public int flags;

11307

/** @field cast=(guint) */

11308

diff -urN x86/org/eclipse/swt/internal/gtk/GtkWidgetClass.java x86_64/org/eclipse/swt/internal/gtk/GtkWidgetClass.java

11309

--- x86/org/eclipse/swt/internal/gtk/GtkWidgetClass.java 2009-05-29 17:30:08.000000000 -0400

11310

+++ x86_64/org/eclipse/swt/internal/gtk/GtkWidgetClass.java 2009-09-17 08:48:24.000000000 -0400

11311

@@ -19,127 +19,127 @@

11312

public int activate_signal;

11313

public int set_scroll_adjustments_signal;

11314

/** @field cast=(void(*)()) */

11315

- public int /*long*/ dispatch_child_properties_changed;

11316

+ public long /*int*/ dispatch_child_properties_changed;

11317

/** @field cast=(void(*)()) */

11318

- public int /*long*/ show;

11319

+ public long /*int*/ show;

11320

/** @field cast=(void(*)()) */

11321

- public int /*long*/ show_all;

11322

+ public long /*int*/ show_all;

11323

/** @field cast=(void(*)()) */

11324

- public int /*long*/ hide;

11325

+ public long /*int*/ hide;

11326

/** @field cast=(void(*)()) */

11327

- public int /*long*/ hide_all;

11328

+ public long /*int*/ hide_all;

11329

/** @field cast=(void(*)()) */

11330

- public int /*long*/ map;

11331

+ public long /*int*/ map;

11332

/** @field cast=(void(*)()) */

11333

- public int /*long*/ unmap;

11334

+ public long /*int*/ unmap;

11335

/** @field cast=(void(*)()) */

11336

- public int /*long*/ realize;

11337

+ public long /*int*/ realize;

11338

/** @field cast=(void(*)()) */

11339

- public int /*long*/ unrealize;

11340

+ public long /*int*/ unrealize;

11341

/** @field cast=(void(*)()) */

11342

- public int /*long*/ size_request;

11343

+ public long /*int*/ size_request;

11344

/** @field cast=(void(*)()) */

11345

- public int /*long*/ size_allocate;

11346

+ public long /*int*/ size_allocate;

11347

/** @field cast=(void(*)()) */

11348

- public int /*long*/ state_changed;

11349

+ public long /*int*/ state_changed;

11350

/** @field cast=(void(*)()) */

11351

- public int /*long*/ parent_set;

11352

+ public long /*int*/ parent_set;

11353

/** @field cast=(void(*)()) */

11354

- public int /*long*/ hierarchy_changed;

11355

+ public long /*int*/ hierarchy_changed;

11356

/** @field cast=(void(*)()) */

11357

- public int /*long*/ style_set;

11358

+ public long /*int*/ style_set;

11359

/** @field cast=(void(*)()) */

11360

- public int /*long*/ direction_changed;

11361

+ public long /*int*/ direction_changed;

11362

/** @field cast=(void(*)()) */

11363

- public int /*long*/ grab_notify;

11364

+ public long /*int*/ grab_notify;

11365

/** @field cast=(void(*)()) */

11366

- public int /*long*/ child_notify;

11367

+ public long /*int*/ child_notify;

11368

/** @field cast=(gboolean(*)()) */

11369

- public int /*long*/ mnemonic_activate;

11370

+ public long /*int*/ mnemonic_activate;

11371

/** @field cast=(void(*)()) */

11372

- public int /*long*/ grab_focus;

11373

+ public long /*int*/ grab_focus;

11374

/** @field cast=(gboolean(*)()) */

11375

- public int /*long*/ focus;

11376

+ public long /*int*/ focus;

11377

/** @field cast=(gboolean(*)()) */

11378

- public int /*long*/ event;

11379

+ public long /*int*/ event;

11380

/** @field cast=(gboolean(*)()) */

11381

- public int /*long*/ button_press_event;

11382

+ public long /*int*/ button_press_event;

11383

/** @field cast=(gboolean(*)()) */

11384

- public int /*long*/ button_release_event;

11385

+ public long /*int*/ button_release_event;

11386

/** @field cast=(gboolean(*)()) */

11387

- public int /*long*/ scroll_event;

11388

+ public long /*int*/ scroll_event;

11389

/** @field cast=(gboolean(*)()) */

11390

- public int /*long*/ motion_notify_event;

11391

+ public long /*int*/ motion_notify_event;

11392

/** @field cast=(gboolean(*)()) */

11393

- public int /*long*/ delete_event;

11394

+ public long /*int*/ delete_event;

11395

/** @field cast=(gboolean(*)()) */

11396

- public int /*long*/ destroy_event;

11397

+ public long /*int*/ destroy_event;

11398

/** @field cast=(gboolean(*)()) */

11399

- public int /*long*/ expose_event;

11400

+ public long /*int*/ expose_event;

11401

/** @field cast=(gboolean(*)()) */

11402

- public int /*long*/ key_press_event;

11403

+ public long /*int*/ key_press_event;

11404

/** @field cast=(gboolean(*)()) */

11405

- public int /*long*/ key_release_event;

11406

+ public long /*int*/ key_release_event;

11407

/** @field cast=(gboolean(*)()) */

11408

- public int /*long*/ enter_notify_event;

11409

+ public long /*int*/ enter_notify_event;

11410

/** @field cast=(gboolean(*)()) */

11411

- public int /*long*/ leave_notify_event;

11412

+ public long /*int*/ leave_notify_event;

11413

/** @field cast=(gboolean(*)()) */

11414

- public int /*long*/ configure_event;

11415

+ public long /*int*/ configure_event;

11416

/** @field cast=(gboolean(*)()) */

11417

- public int /*long*/ focus_in_event;

11418

+ public long /*int*/ focus_in_event;

11419

/** @field cast=(gboolean(*)()) */

11420

- public int /*long*/ focus_out_event;

11421

+ public long /*int*/ focus_out_event;

11422

/** @field cast=(gboolean(*)()) */

11423

- public int /*long*/ map_event;

11424

+ public long /*int*/ map_event;

11425

/** @field cast=(gboolean(*)()) */

11426

- public int /*long*/ unmap_event;

11427

+ public long /*int*/ unmap_event;

11428

/** @field cast=(gboolean(*)()) */

11429

- public int /*long*/ property_notify_event;

11430

+ public long /*int*/ property_notify_event;

11431

/** @field cast=(gboolean(*)()) */

11432

- public int /*long*/ selection_clear_event;

11433

+ public long /*int*/ selection_clear_event;

11434

/** @field cast=(gboolean(*)()) */

11435

- public int /*long*/ selection_request_event;

11436

+ public long /*int*/ selection_request_event;

11437

/** @field cast=(gboolean(*)()) */

11438

- public int /*long*/ selection_notify_event;

11439

+ public long /*int*/ selection_notify_event;

11440

/** @field cast=(gboolean(*)()) */

11441

- public int /*long*/ proximity_in_event;

11442

+ public long /*int*/ proximity_in_event;

11443

/** @field cast=(gboolean(*)()) */

11444

- public int /*long*/ proximity_out_event;

11445

+ public long /*int*/ proximity_out_event;

11446

/** @field cast=(gboolean(*)()) */

11447

- public int /*long*/ visibility_notify_event;

11448

+ public long /*int*/ visibility_notify_event;

11449

/** @field cast=(gboolean(*)()) */

11450

- public int /*long*/ client_event;

11451

+ public long /*int*/ client_event;

11452

/** @field cast=(gboolean(*)()) */

11453

- public int /*long*/ no_expose_event;

11454

+ public long /*int*/ no_expose_event;

11455

/** @field cast=(gboolean(*)()) */

11456

- public int /*long*/ window_state_event;

11457

+ public long /*int*/ window_state_event;

11458

/** @field cast=(void(*)()) */

11459

- public int /*long*/ selection_get;

11460

+ public long /*int*/ selection_get;

11461

/** @field cast=(void(*)()) */

11462

- public int /*long*/ selection_received;

11463

+ public long /*int*/ selection_received;

11464

/** @field cast=(void(*)()) */

11465

- public int /*long*/ drag_begin;

11466

+ public long /*int*/ drag_begin;

11467

/** @field cast=(void(*)()) */

11468

- public int /*long*/ drag_end;

11469

+ public long /*int*/ drag_end;

11470

/** @field cast=(void(*)()) */

11471

- public int /*long*/ drag_data_get;

11472

+ public long /*int*/ drag_data_get;

11473

/** @field cast=(void(*)()) */

11474

- public int /*long*/ drag_data_delete;

11475

+ public long /*int*/ drag_data_delete;

11476

/** @field cast=(void(*)()) */

11477

- public int /*long*/ drag_leave;

11478

+ public long /*int*/ drag_leave;

11479

/** @field cast=(gboolean(*)()) */

11480

- public int /*long*/ drag_motion;

11481

+ public long /*int*/ drag_motion;

11482

/** @field cast=(gboolean(*)()) */

11483

- public int /*long*/ drag_drop;

11484

+ public long /*int*/ drag_drop;

11485

/** @field cast=(void(*)()) */

11486

- public int /*long*/ drag_data_received;

11487

+ public long /*int*/ drag_data_received;

11488

/** @field cast=(gboolean(*)()) */

11489

- public int /*long*/ popup_menu;

11490

+ public long /*int*/ popup_menu;

11491

/** @field cast=(gboolean(*)()) */

11492

- public int /*long*/ show_help;

11493

+ public long /*int*/ show_help;

11494

/** @field cast=(AtkObject*(*)()) */

11495

- public int /*long*/ get_accessible;

11496

+ public long /*int*/ get_accessible;

11497

/** @field cast=(void(*)()) */

11498

- public int /*long*/ screen_changed;

11499

+ public long /*int*/ screen_changed;

11500

}

11501

diff -urN x86/org/eclipse/swt/internal/gtk/GTypeInfo.java x86_64/org/eclipse/swt/internal/gtk/GTypeInfo.java

11502

--- x86/org/eclipse/swt/internal/gtk/GTypeInfo.java 2009-05-29 17:30:08.000000000 -0400

11503

+++ x86_64/org/eclipse/swt/internal/gtk/GTypeInfo.java 2009-09-17 08:48:24.000000000 -0400

11504

@@ -19,22 +19,22 @@

11505

/** @field cast=(guint16) */

11506

public short class_size;

11507

/** @field cast=(GBaseInitFunc) */

11508

- public int /*long*/ base_init;

11509

+ public long /*int*/ base_init;

11510

/** @field cast=(GBaseFinalizeFunc) */

11511

- public int /*long*/ base_finalize;

11512

+ public long /*int*/ base_finalize;

11513

/** @field cast=(GClassInitFunc) */

11514

- public int /*long*/ class_init;

11515

+ public long /*int*/ class_init;

11516

/** @field cast=(GClassFinalizeFunc) */

11517

- public int /*long*/ class_finalize;

11518

+ public long /*int*/ class_finalize;

11519

/** @field cast=(gconstpointer) */

11520

- public int /*long*/ class_data;

11521

+ public long /*int*/ class_data;

11522

/** @field cast=(guint16) */

11523

public short instance_size;

11524

/** @field cast=(guint16) */

11525

public short n_preallocs;

11526

/** @field cast=(GInstanceInitFunc) */

11527

- public int /*long*/ instance_init;

11528

+ public long /*int*/ instance_init;

11529

/** @field cast=(GTypeValueTable *) */

11530

- public int /*long*/ value_table;

11531

+ public long /*int*/ value_table;

11532

public static final int sizeof = OS.GTypeInfo_sizeof();

11533

}

11534

diff -urN x86/org/eclipse/swt/internal/gtk/GTypeQuery.java x86_64/org/eclipse/swt/internal/gtk/GTypeQuery.java

11535

--- x86/org/eclipse/swt/internal/gtk/GTypeQuery.java 2009-05-29 17:30:08.000000000 -0400

11536

+++ x86_64/org/eclipse/swt/internal/gtk/GTypeQuery.java 2009-09-17 08:48:24.000000000 -0400

11537

@@ -19,7 +19,7 @@

11538

/** @field cast=(GType) */

11539

public int type;

11540

/** @field cast=(const gchar *) */

11541

- public int /*long*/ type_name;

11542

+ public long /*int*/ type_name;

11543

/** @field cast=(guint) */

11544

public int class_size;

11545

/** @field cast=(guint) */

11546

diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/internal/gtk/OS.java

11547

--- x86/org/eclipse/swt/internal/gtk/OS.java 2009-08-20 15:16:38.000000000 -0400

11548

+++ x86_64/org/eclipse/swt/internal/gtk/OS.java 2009-09-17 08:48:24.000000000 -0400

11549

@@ -591,77 +591,77 @@

11550

public static final native int XFocusChangeEvent_sizeof();

11551

public static final native int XVisibilityEvent_sizeof();

11552

public static final native int XWindowChanges_sizeof();

11553

-public static final native int /*long*/ localeconv_decimal_point();

11554

+public static final native long /*int*/ localeconv_decimal_point();

11555

/**

11556

* @param path cast=(const char *)

11557

* @param realPath cast=(char *)

11558

*/

11559

-public static final native int /*long*/ realpath(byte[] path, byte[] realPath);

11560

+public static final native long /*int*/ realpath(byte[] path, byte[] realPath);

11561

11562

/** Object private fields accessors */

11563

11564

11565

/** @param object_class cast=(GObjectClass *) */

11566

-public static final native int /*long*/ G_OBJECT_CLASS_CONSTRUCTOR(int /*long*/ object_class);

11567

+public static final native long /*int*/ G_OBJECT_CLASS_CONSTRUCTOR(long /*int*/ object_class);

11568

/**

11569

* @param object_class cast=(GObjectClass *)

11570

* @paramOFF constructor cast=(GObject* (*) (GType, guint, GObjectConstructParam *))

11571

*/

11572

-public static final native void G_OBJECT_CLASS_SET_CONSTRUCTOR(int /*long*/ object_class, int /*long*/ constructor);

11573

+public static final native void G_OBJECT_CLASS_SET_CONSTRUCTOR(long /*int*/ object_class, long /*int*/ constructor);

11574

/** @param widget cast=(GtkWidget *) */

11575

-public static final native int GTK_WIDGET_HEIGHT(int /*long*/ widget);

11576

+public static final native int GTK_WIDGET_HEIGHT(long /*int*/ widget);

11577

/** @param widget cast=(GtkWidget *) */

11578

-public static final native int GTK_WIDGET_WIDTH(int /*long*/ widget);

11579

+public static final native int GTK_WIDGET_WIDTH(long /*int*/ widget);

11580

/** @param widget cast=(GtkWidget *) */

11581

-public static final native int /*long*/ GTK_WIDGET_WINDOW(int /*long*/ widget);

11582

+public static final native long /*int*/ GTK_WIDGET_WINDOW(long /*int*/ widget);

11583

/** @param widget cast=(GtkWidget *) */

11584

-public static final native int GTK_WIDGET_X(int /*long*/ widget);

11585

+public static final native int GTK_WIDGET_X(long /*int*/ widget);

11586

/** @param widget cast=(GtkWidget *) */

11587

-public static final native int GTK_WIDGET_Y(int /*long*/ widget);

11588

+public static final native int GTK_WIDGET_Y(long /*int*/ widget);

11589

/** @param widget cast=(GtkScrolledWindow *) */

11590

-public static final native int /*long*/ GTK_SCROLLED_WINDOW_HSCROLLBAR(int /*long*/ widget);

11591

+public static final native long /*int*/ GTK_SCROLLED_WINDOW_HSCROLLBAR(long /*int*/ widget);

11592

/** @param widget cast=(GtkScrolledWindow *) */

11593

-public static final native int /*long*/ GTK_SCROLLED_WINDOW_VSCROLLBAR(int /*long*/ widget);

11594

+public static final native long /*int*/ GTK_SCROLLED_WINDOW_VSCROLLBAR(long /*int*/ widget);

11595

/** @param widget cast=(GtkScrolledWindow *) */

11596

-public static final native int GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(int /*long*/ widget);

11597

+public static final native int GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(long /*int*/ widget);

11598

/**

11599

* @param acce_label cast=(GtkAccelLabel *)

11600

* @param string cast=(gchar *)

11601

*/

11602

-public static final native void GTK_ACCEL_LABEL_SET_ACCEL_STRING(int /*long*/ acce_label, int /*long*/ string);

11603

+public static final native void GTK_ACCEL_LABEL_SET_ACCEL_STRING(long /*int*/ acce_label, long /*int*/ string);

11604

/** @param acce_label cast=(GtkAccelLabel *) */

11605

-public static final native int /*long*/ GTK_ACCEL_LABEL_GET_ACCEL_STRING(int /*long*/ acce_label);

11606

+public static final native long /*int*/ GTK_ACCEL_LABEL_GET_ACCEL_STRING(long /*int*/ acce_label);

11607

/** @param widget cast=(GtkEntry *) */

11608

-public static final native int /*long*/ GTK_ENTRY_IM_CONTEXT(int /*long*/ widget);

11609

+public static final native long /*int*/ GTK_ENTRY_IM_CONTEXT(long /*int*/ widget);

11610

/** @param widget cast=(GtkTextView *) */

11611

-public static final native int /*long*/ GTK_TEXTVIEW_IM_CONTEXT(int /*long*/ widget);

11612

+public static final native long /*int*/ GTK_TEXTVIEW_IM_CONTEXT(long /*int*/ widget);

11613

/** @param widget cast=(GtkTooltips *) */

11614

-public static final native int /*long*/ GTK_TOOLTIPS_TIP_WINDOW(int /*long*/ widget);

11615

+public static final native long /*int*/ GTK_TOOLTIPS_TIP_WINDOW(long /*int*/ widget);

11616

/**

11617

* @param widget cast=(GtkTooltips *)

11618

* @param data cast=(GtkTooltipsData *)

11619

*/

11620

-public static final native void GTK_TOOLTIPS_SET_ACTIVE(int /*long*/ widget, int /*long*/ data);

11621

+public static final native void GTK_TOOLTIPS_SET_ACTIVE(long /*int*/ widget, long /*int*/ data);

11622

/** @param widget cast=(GtkWidget *) */

11623

-public static final native void GTK_WIDGET_SET_HEIGHT(int /*long*/ widget, int height);

11624

+public static final native void GTK_WIDGET_SET_HEIGHT(long /*int*/ widget, int height);

11625

/** @param widget cast=(GtkWidget *) */

11626

-public static final native void GTK_WIDGET_SET_WIDTH(int /*long*/ widget, int width);

11627

+public static final native void GTK_WIDGET_SET_WIDTH(long /*int*/ widget, int width);

11628

/** @param widget cast=(GtkWidget *) */

11629

-public static final native void GTK_WIDGET_SET_X(int /*long*/ widget, int x);

11630

+public static final native void GTK_WIDGET_SET_X(long /*int*/ widget, int x);

11631

/** @param widget cast=(GtkWidget *) */

11632

-public static final native void GTK_WIDGET_SET_Y(int /*long*/ widget, int y);

11633

+public static final native void GTK_WIDGET_SET_Y(long /*int*/ widget, int y);

11634

/** @param widget cast=(GtkWidget *) */

11635

-public static final native int GTK_WIDGET_REQUISITION_WIDTH(int /*long*/ widget);

11636

+public static final native int GTK_WIDGET_REQUISITION_WIDTH(long /*int*/ widget);

11637

/** @param widget cast=(GtkWidget *) */

11638

-public static final native int GTK_WIDGET_REQUISITION_HEIGHT(int /*long*/ widget);

11639

+public static final native int GTK_WIDGET_REQUISITION_HEIGHT(long /*int*/ widget);

11640

/** @param event cast=(GdkEvent *) */

11641

-public static final native int GDK_EVENT_TYPE(int /*long*/ event);

11642

+public static final native int GDK_EVENT_TYPE(long /*int*/ event);

11643

/** @param event cast=(GdkEventAny *) */

11644

-public static final native int /*long*/ GDK_EVENT_WINDOW(int /*long*/ event);

11645

+public static final native long /*int*/ GDK_EVENT_WINDOW(long /*int*/ event);

11646

/** @param xevent cast=(XEvent *) */

11647

-public static final native int X_EVENT_TYPE(int /*long*/ xevent);

11648

+public static final native int X_EVENT_TYPE(long /*int*/ xevent);

11649

/** @param xevent cast=(XAnyEvent *) */

11650

-public static final native int /*long*/ X_EVENT_WINDOW(int /*long*/ xevent);

11651

+public static final native long /*int*/ X_EVENT_WINDOW(long /*int*/ xevent);

11652

11653

/** X11 Native methods and constants */

11654

public static final int Above = 0;

11655

@@ -679,7 +679,7 @@

11656

public static final int GraphicsExpose = 13;

11657

public static final int NoExpose = 14;

11658

public static final int ExposureMask = 1 << 15;

11659

-public static final int /*long*/ NoEventMask = 0;

11660

+public static final long /*int*/ NoEventMask = 0;

11661

public static final int NotifyNormal = 0;

11662

public static final int NotifyGrab = 1;

11663

public static final int NotifyHint = 1;

11664

@@ -695,8 +695,8 @@

11665

public static final int VisibilityFullyObscured = 2;

11666

public static final int VisibilityNotify = 15;

11667

public static final int SYSTEM_TRAY_REQUEST_DOCK = 0;

11668

-public static final native int _Call(int /*long*/ proc, int /*long*/ arg1, int /*long*/ arg2);

11669

-public static final int Call(int /*long*/ proc, int /*long*/ arg1, int /*long*/ arg2) {

11670

+public static final native int _Call(long /*int*/ proc, long /*int*/ arg1, long /*int*/ arg2);

11671

+public static final int Call(long /*int*/ proc, long /*int*/ arg1, long /*int*/ arg2) {

11672

lock.lock();

11673

try {

11674

return _Call(proc, arg1, arg2);

11675

@@ -704,8 +704,8 @@

11676

lock.unlock();

11677

}

11678

}

11679

-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);

11680

-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) {

11681

+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);

11682

+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) {

11683

lock.lock();

11684

try {

11685

return _call(function, arg0, arg1, arg2, arg3, arg4, arg5, arg6);

11686

@@ -716,8 +716,8 @@

11687

/** @method flags=no_gen */

11688

public static final native boolean GDK_WINDOWING_X11();

11689

/** @param pixmap cast=(GdkPixmap *) */

11690

-public static final native int /*long*/ _GDK_PIXMAP_XID(int /*long*/ pixmap);

11691

-public static final int /*long*/ GDK_PIXMAP_XID(int /*long*/ pixmap) {

11692

+public static final native long /*int*/ _GDK_PIXMAP_XID(long /*int*/ pixmap);

11693

+public static final long /*int*/ GDK_PIXMAP_XID(long /*int*/ pixmap) {

11694

lock.lock();

11695

try {

11696

return _GDK_PIXMAP_XID(pixmap);

11697

@@ -730,8 +730,8 @@

11698

* @param event_mask cast=(long)

11699

* @param event_return cast=(XEvent *)

11700

*/

11701

-public static final native boolean _XCheckMaskEvent(int /*long*/ display, int /*long*/ event_mask, int /*long*/ event_return);

11702

-public static final boolean XCheckMaskEvent(int /*long*/ display, int /*long*/ event_mask, int /*long*/ event_return) {

11703

+public static final native boolean _XCheckMaskEvent(long /*int*/ display, long /*int*/ event_mask, long /*int*/ event_return);

11704

+public static final boolean XCheckMaskEvent(long /*int*/ display, long /*int*/ event_mask, long /*int*/ event_return) {

11705

lock.lock();

11706

try {

11707

return _XCheckMaskEvent(display, event_mask, event_return);

11708

@@ -745,8 +745,8 @@

11709

* @param event_mask cast=(long)

11710

* @param event_return cast=(XEvent *)

11711

*/

11712

-public static final native boolean _XCheckWindowEvent(int /*long*/ display, int /*long*/ window, int /*long*/ event_mask, int /*long*/ event_return);

11713

-public static final boolean XCheckWindowEvent(int /*long*/ display, int /*long*/ window, int /*long*/ event_mask, int /*long*/ event_return) {

11714

+public static final native boolean _XCheckWindowEvent(long /*int*/ display, long /*int*/ window, long /*int*/ event_mask, long /*int*/ event_return);

11715

+public static final boolean XCheckWindowEvent(long /*int*/ display, long /*int*/ window, long /*int*/ event_mask, long /*int*/ event_return) {

11716

lock.lock();

11717

try {

11718

return _XCheckWindowEvent(display, window, event_mask, event_return);

11719

@@ -760,8 +760,8 @@

11720

* @param predicate cast=(Bool (*)())

11721

* @param arg cast=(XPointer)

11722

*/

11723

-public static final native boolean _XCheckIfEvent(int /*long*/ display, int /*long*/ event_return, int /*long*/ predicate, int /*long*/ arg);

11724

-public static final boolean XCheckIfEvent(int /*long*/ display, int /*long*/ event_return, int /*long*/ predicate, int /*long*/ arg) {

11725

+public static final native boolean _XCheckIfEvent(long /*int*/ display, long /*int*/ event_return, long /*int*/ predicate, long /*int*/ arg);

11726

+public static final boolean XCheckIfEvent(long /*int*/ display, long /*int*/ event_return, long /*int*/ predicate, long /*int*/ arg) {

11727

lock.lock();

11728

try {

11729

return _XCheckIfEvent(display, event_return, predicate, arg);

11730

@@ -770,8 +770,8 @@

11731

}

11732

}

11733

/** @param display cast=(Display *) */

11734

-public static final native int _XDefaultScreen(int /*long*/ display);

11735

-public static final int XDefaultScreen(int /*long*/ display) {

11736

+public static final native int _XDefaultScreen(long /*int*/ display);

11737

+public static final int XDefaultScreen(long /*int*/ display) {

11738

lock.lock();

11739

try {

11740

return _XDefaultScreen(display);

11741

@@ -780,8 +780,8 @@

11742

}

11743

}

11744

/** @param display cast=(Display *) */

11745

-public static final native int /*long*/ _XDefaultRootWindow(int /*long*/ display);

11746

-public static final int /*long*/ XDefaultRootWindow(int /*long*/ display) {

11747

+public static final native long /*int*/ _XDefaultRootWindow(long /*int*/ display);

11748

+public static final long /*int*/ XDefaultRootWindow(long /*int*/ display) {

11749

lock.lock();

11750

try {

11751

return _XDefaultRootWindow(display);

11752

@@ -790,8 +790,8 @@

11753

}

11754

}

11755

/** @param display cast=(Display *) */

11756

-public static final native void _XFlush(int /*long*/ display);

11757

-public static final void XFlush(int /*long*/ display) {

11758

+public static final native void _XFlush(long /*int*/ display);

11759

+public static final void XFlush(long /*int*/ display) {

11760

lock.lock();

11761

try {

11762

_XFlush(display);

11763

@@ -800,8 +800,8 @@

11764

}

11765

}

11766

/** @param address cast=(void *) */

11767

-public static final native void _XFree(int /*long*/ address);

11768

-public static final void XFree(int /*long*/ address) {

11769

+public static final native void _XFree(long /*int*/ address);

11770

+public static final void XFree(long /*int*/ address) {

11771

lock.lock();

11772

try {

11773

_XFree(address);

11774

@@ -813,8 +813,8 @@

11775

* @param display cast=(Display *)

11776

* @param selection cast=(Atom)

11777

*/

11778

-public static final native int /*long*/ _XGetSelectionOwner(int /*long*/ display, int /*long*/ selection);

11779

-public static final int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*long*/ selection) {

11780

+public static final native long /*int*/ _XGetSelectionOwner(long /*int*/ display, long /*int*/ selection);

11781

+public static final long /*int*/ XGetSelectionOwner(long /*int*/ display, long /*int*/ selection) {

11782

lock.lock();

11783

try {

11784

return _XGetSelectionOwner(display, selection);

11785

@@ -827,8 +827,8 @@

11786

* @param name cast=(char *)

11787

* @param ifExists cast=(Bool)

11788

*/

11789

-public static final native int /*long*/ _XInternAtom(int /*long*/ display, byte[] name, boolean ifExists);

11790

-public static final int /*long*/ XInternAtom(int /*long*/ display, byte[] name, boolean ifExists) {

11791

+public static final native long /*int*/ _XInternAtom(long /*int*/ display, byte[] name, boolean ifExists);

11792

+public static final long /*int*/ XInternAtom(long /*int*/ display, byte[] name, boolean ifExists) {

11793

lock.lock();

11794

try {

11795

return _XInternAtom(display, name, ifExists);

11796

@@ -847,8 +847,8 @@

11797

* @param win_y_return cast=(int *)

11798

* @param mask_return cast=(unsigned int *)

11799

*/

11800

-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);

11801

-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) {

11802

+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);

11803

+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) {

11804

lock.lock();

11805

try {

11806

return _XQueryPointer(display, w, root_return, child_return, root_x_return, root_y_return, win_x_return, win_y_return, mask_return);

11807

@@ -864,8 +864,8 @@

11808

* @param children_return cast=(Window **)

11809

* @param nchildren_return cast=(unsigned int *)

11810

*/

11811

-public static final native int _XQueryTree(int /*long*/ display, int /*long*/ w, int /*long*/[] root_return, int /*long*/[] parent_return, int /*long*/[] children_return, int[] nchildren_return);

11812

-public static final int XQueryTree(int /*long*/ display, int /*long*/ w, int /*long*/[] root_return, int /*long*/[] parent_return, int /*long*/[] children_return, int[] nchildren_return) {

11813

+public static final native int _XQueryTree(long /*int*/ display, long /*int*/ w, long /*int*/[] root_return, long /*int*/[] parent_return, long /*int*/[] children_return, int[] nchildren_return);

11814

+public static final int XQueryTree(long /*int*/ display, long /*int*/ w, long /*int*/[] root_return, long /*int*/[] parent_return, long /*int*/[] children_return, int[] nchildren_return) {

11815

lock.lock();

11816

try {

11817

return _XQueryTree(display, w, root_return, parent_return, children_return, nchildren_return);

11818

@@ -877,8 +877,8 @@

11819

* @param display cast=(Display *)

11820

* @param keysym cast=(KeySym)

11821

*/

11822

-public static final native int _XKeysymToKeycode(int /*long*/ display, int /*long*/ keysym);

11823

-public static final int XKeysymToKeycode(int /*long*/ display, int /*long*/ keysym) {

11824

+public static final native int _XKeysymToKeycode(long /*int*/ display, long /*int*/ keysym);

11825

+public static final int XKeysymToKeycode(long /*int*/ display, long /*int*/ keysym) {

11826

lock.lock();

11827

try {

11828

return _XKeysymToKeycode(display, keysym);

11829

@@ -891,8 +891,8 @@

11830

* @param window cast=(Window)

11831

* @param num_prop_return cast=(int *)

11832

*/

11833

-public static final native int /*long*/ _XListProperties(int /*long*/ display, int /*long*/ window, int[] num_prop_return);

11834

-public static final int /*long*/ XListProperties(int /*long*/ display, int /*long*/ window, int[] num_prop_return) {

11835

+public static final native long /*int*/ _XListProperties(long /*int*/ display, long /*int*/ window, int[] num_prop_return);

11836

+public static final long /*int*/ XListProperties(long /*int*/ display, long /*int*/ window, int[] num_prop_return) {

11837

lock.lock();

11838

try {

11839

return _XListProperties(display, window, num_prop_return);

11840

@@ -905,8 +905,8 @@

11841

* @param window cast=(Window)

11842

* @param values flags=no_out

11843

*/

11844

-public static final native int _XReconfigureWMWindow(int /*long*/ display, int /*long*/ window, int screen, int valueMask, XWindowChanges values);

11845

-public static final int XReconfigureWMWindow(int /*long*/ display, int /*long*/ window, int screen, int valueMask, XWindowChanges values) {

11846

+public static final native int _XReconfigureWMWindow(long /*int*/ display, long /*int*/ window, int screen, int valueMask, XWindowChanges values);

11847

+public static final int XReconfigureWMWindow(long /*int*/ display, long /*int*/ window, int screen, int valueMask, XWindowChanges values) {

11848

lock.lock();

11849

try {

11850

return _XReconfigureWMWindow(display, window, screen, valueMask, values);

11851

@@ -919,8 +919,8 @@

11852

* @param w cast=(Window)

11853

* @param event_send cast=(XEvent *)

11854

*/

11855

-public static final native int _XSendEvent(int /*long*/ display, int /*long*/ w, boolean propogate, int /*long*/ event_mask, int /*long*/ event_send);

11856

-public static final int XSendEvent(int /*long*/ display, int /*long*/ w, boolean propogate, int /*long*/ event_mask, int /*long*/ event_send) {

11857

+public static final native int _XSendEvent(long /*int*/ display, long /*int*/ w, boolean propogate, long /*int*/ event_mask, long /*int*/ event_send);

11858

+public static final int XSendEvent(long /*int*/ display, long /*int*/ w, boolean propogate, long /*int*/ event_mask, long /*int*/ event_send) {

11859

lock.lock();

11860

try {

11861

return _XSendEvent(display, w, propogate, event_mask, event_send);

11862

@@ -929,8 +929,8 @@

11863

}

11864

}

11865

/** @param handler cast=(XIOErrorHandler) */

11866

-public static final native int /*long*/ _XSetIOErrorHandler(int /*long*/ handler);

11867

-public static final int /*long*/ XSetIOErrorHandler(int /*long*/ handler) {

11868

+public static final native long /*int*/ _XSetIOErrorHandler(long /*int*/ handler);

11869

+public static final long /*int*/ XSetIOErrorHandler(long /*int*/ handler) {

11870

lock.lock();

11871

try {

11872

return _XSetIOErrorHandler(handler);

11873

@@ -939,8 +939,8 @@

11874

}

11875

}

11876

/** @param handler cast=(XErrorHandler) */

11877

-public static final native int /*long*/ _XSetErrorHandler(int /*long*/ handler);

11878

-public static final int /*long*/ XSetErrorHandler(int /*long*/ handler) {

11879

+public static final native long /*int*/ _XSetErrorHandler(long /*int*/ handler);

11880

+public static final long /*int*/ XSetErrorHandler(long /*int*/ handler) {

11881

lock.lock();

11882

try {

11883

return _XSetErrorHandler(handler);

11884

@@ -952,8 +952,8 @@

11885

* @param display cast=(Display *)

11886

* @param window cast=(Window)

11887

*/

11888

-public static final native int _XSetInputFocus(int /*long*/ display, int /*long*/ window, int revert, int time);

11889

-public static final int XSetInputFocus(int /*long*/ display, int /*long*/ window, int revert, int time) {

11890

+public static final native int _XSetInputFocus(long /*int*/ display, long /*int*/ window, int revert, int time);

11891

+public static final int XSetInputFocus(long /*int*/ display, long /*int*/ window, int revert, int time) {

11892

lock.lock();

11893

try {

11894

return _XSetInputFocus(display, window, revert, time);

11895

@@ -966,8 +966,8 @@

11896

* @param w cast=(Window)

11897

* @param prop_window cast=(Window)

11898

*/

11899

-public static final native int _XSetTransientForHint(int /*long*/ display, int /*long*/ w, int /*long*/ prop_window);

11900

-public static final int XSetTransientForHint(int /*long*/ display, int /*long*/ w, int /*long*/ prop_window) {

11901

+public static final native int _XSetTransientForHint(long /*int*/ display, long /*int*/ w, long /*int*/ prop_window);

11902

+public static final int XSetTransientForHint(long /*int*/ display, long /*int*/ w, long /*int*/ prop_window) {

11903

lock.lock();

11904

try {

11905

return _XSetTransientForHint(display, w, prop_window);

11906

@@ -976,8 +976,8 @@

11907

}

11908

}

11909

/** @param display cast=(Display *) */

11910

-public static final native int /*long*/ _XSynchronize(int /*long*/ display, boolean onoff);

11911

-public static final int /*long*/ XSynchronize(int /*long*/ display, boolean onoff) {

11912

+public static final native long /*int*/ _XSynchronize(long /*int*/ display, boolean onoff);

11913

+public static final long /*int*/ XSynchronize(long /*int*/ display, boolean onoff) {

11914

lock.lock();

11915

try {

11916

return _XSynchronize(display, onoff);

11917

@@ -990,8 +990,8 @@

11918

* @param is_press cast=(Bool)

11919

* @param delay cast=(unsigned long)

11920

*/

11921

-public static final native void _XTestFakeButtonEvent(int /*long*/ display, int button, boolean is_press, int /*long*/ delay);

11922

-public static final void XTestFakeButtonEvent(int /*long*/ display, int button, boolean is_press, int /*long*/ delay) {

11923

+public static final native void _XTestFakeButtonEvent(long /*int*/ display, int button, boolean is_press, long /*int*/ delay);

11924

+public static final void XTestFakeButtonEvent(long /*int*/ display, int button, boolean is_press, long /*int*/ delay) {

11925

lock.lock();

11926

try {

11927

_XTestFakeButtonEvent(display, button, is_press, delay);

11928

@@ -1004,8 +1004,8 @@

11929

* @param is_press cast=(Bool)

11930

* @param delay cast=(unsigned long)

11931

*/

11932

-public static final native void _XTestFakeKeyEvent(int /*long*/ display, int keycode, boolean is_press, int /*long*/ delay);

11933

-public static final void XTestFakeKeyEvent(int /*long*/ display, int keycode, boolean is_press, int /*long*/ delay) {

11934

+public static final native void _XTestFakeKeyEvent(long /*int*/ display, int keycode, boolean is_press, long /*int*/ delay);

11935

+public static final void XTestFakeKeyEvent(long /*int*/ display, int keycode, boolean is_press, long /*int*/ delay) {

11936

lock.lock();

11937

try {

11938

_XTestFakeKeyEvent(display, keycode, is_press, delay);

11939

@@ -1017,8 +1017,8 @@

11940

* @param display cast=(Display *)

11941

* @param delay cast=(unsigned long)

11942

*/

11943

-public static final native void _XTestFakeMotionEvent(int /*long*/ display, int screen_number, int x, int y, int /*long*/ delay);

11944

-public static final void XTestFakeMotionEvent(int /*long*/ display, int screen_number, int x, int y, int /*long*/ delay) {

11945

+public static final native void _XTestFakeMotionEvent(long /*int*/ display, int screen_number, int x, int y, long /*int*/ delay);

11946

+public static final void XTestFakeMotionEvent(long /*int*/ display, int screen_number, int x, int y, long /*int*/ delay) {

11947

lock.lock();

11948

try {

11949

_XTestFakeMotionEvent(display, screen_number, x, y, delay);

11950

@@ -1031,8 +1031,8 @@

11951

* @param sourceWindow cast=(Window)

11952

* @param destWindow cast=(Window)

11953

*/

11954

-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);

11955

-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) {

11956

+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);

11957

+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) {

11958

lock.lock();

11959

try {

11960

return _XWarpPointer(display, sourceWindow, destWindow, sourceX, sourceY, sourceWidth, sourceHeight, destX, destY);

11961

@@ -1041,8 +1041,8 @@

11962

}

11963

}

11964

/** @param atom cast=(GdkAtom) */

11965

-public static final native int /*long*/ _gdk_x11_atom_to_xatom(int /*long*/ atom);

11966

-public static final int /*long*/ gdk_x11_atom_to_xatom(int /*long*/ atom) {

11967

+public static final native long /*int*/ _gdk_x11_atom_to_xatom(long /*int*/ atom);

11968

+public static final long /*int*/ gdk_x11_atom_to_xatom(long /*int*/ atom) {

11969

lock.lock();

11970

try {

11971

return _gdk_x11_atom_to_xatom(atom);

11972

@@ -1051,8 +1051,8 @@

11973

}

11974

}

11975

/** @param colormap cast=(GdkColormap *) */

11976

-public static final native int /*long*/ _gdk_x11_colormap_get_xcolormap(int /*long*/ colormap);

11977

-public static final int /*long*/ gdk_x11_colormap_get_xcolormap(int /*long*/ colormap) {

11978

+public static final native long /*int*/ _gdk_x11_colormap_get_xcolormap(long /*int*/ colormap);

11979

+public static final long /*int*/ gdk_x11_colormap_get_xcolormap(long /*int*/ colormap) {

11980

lock.lock();

11981

try {

11982

return _gdk_x11_colormap_get_xcolormap(colormap);

11983

@@ -1061,8 +1061,8 @@

11984

}

11985

}

11986

/** @param drawable cast=(GdkDrawable *) */

11987

-public static final native int /*long*/ _gdk_x11_drawable_get_xdisplay(int /*long*/ drawable);

11988

-public static final int /*long*/ gdk_x11_drawable_get_xdisplay(int /*long*/ drawable) {

11989

+public static final native long /*int*/ _gdk_x11_drawable_get_xdisplay(long /*int*/ drawable);

11990

+public static final long /*int*/ gdk_x11_drawable_get_xdisplay(long /*int*/ drawable) {

11991

lock.lock();

11992

try {

11993

return _gdk_x11_drawable_get_xdisplay(drawable);

11994

@@ -1071,8 +1071,8 @@

11995

}

11996

}

11997

/** @param drawable cast=(GdkDrawable *) */

11998

-public static final native int /*long*/ _gdk_x11_drawable_get_xid(int /*long*/ drawable);

11999

-public static final int /*long*/ gdk_x11_drawable_get_xid(int /*long*/ drawable) {

12000

+public static final native long /*int*/ _gdk_x11_drawable_get_xid(long /*int*/ drawable);

12001

+public static final long /*int*/ gdk_x11_drawable_get_xid(long /*int*/ drawable) {

12002

lock.lock();

12003

try {

12004

return _gdk_x11_drawable_get_xid(drawable);

12005

@@ -1085,8 +1085,8 @@

12006

* @param screen cast=(GdkScreen *)

12007

* @param xvisualid cast=(VisualID)

12008

*/

12009

-public static final native int /*long*/ _gdk_x11_screen_lookup_visual(int /*long*/ screen, int xvisualid);

12010

-public static final int /*long*/ gdk_x11_screen_lookup_visual(int /*long*/ screen, int xvisualid) {

12011

+public static final native long /*int*/ _gdk_x11_screen_lookup_visual(long /*int*/ screen, int xvisualid);

12012

+public static final long /*int*/ gdk_x11_screen_lookup_visual(long /*int*/ screen, int xvisualid) {

12013

lock.lock();

12014

try {

12015

return _gdk_x11_screen_lookup_visual(screen, xvisualid);

12016

@@ -1098,8 +1098,8 @@

12017

* @method flags=dynamic

12018

* @param screen cast=(GdkScreen *)

12019

*/

12020

-public static final native int /*long*/ _gdk_x11_screen_get_window_manager_name(int /*long*/ screen);

12021

-public static final int /*long*/ gdk_x11_screen_get_window_manager_name(int /*long*/ screen) {

12022

+public static final native long /*int*/ _gdk_x11_screen_get_window_manager_name(long /*int*/ screen);

12023

+public static final long /*int*/ gdk_x11_screen_get_window_manager_name(long /*int*/ screen) {

12024

lock.lock();

12025

try {

12026

return _gdk_x11_screen_get_window_manager_name(screen);

12027

@@ -1108,8 +1108,8 @@

12028

}

12029

}

12030

/** @param visual cast=(GdkVisual *) */

12031

-public static final native int /*long*/ _gdk_x11_visual_get_xvisual(int /*long*/ visual);

12032

-public static final int /*long*/ gdk_x11_visual_get_xvisual(int /*long*/ visual) {

12033

+public static final native long /*int*/ _gdk_x11_visual_get_xvisual(long /*int*/ visual);

12034

+public static final long /*int*/ gdk_x11_visual_get_xvisual(long /*int*/ visual) {

12035

lock.lock();

12036

try {

12037

return _gdk_x11_visual_get_xvisual(visual);

12038

@@ -1117,8 +1117,8 @@

12039

lock.unlock();

12040

}

12041

}

12042

-public static final native int /*long*/ _gdk_pixmap_foreign_new(int /*long*/ anid);

12043

-public static final int /*long*/ gdk_pixmap_foreign_new(int /*long*/ anid) {

12044

+public static final native long /*int*/ _gdk_pixmap_foreign_new(long /*int*/ anid);

12045

+public static final long /*int*/ gdk_pixmap_foreign_new(long /*int*/ anid) {

12046

lock.lock();

12047

try {

12048

return _gdk_pixmap_foreign_new(anid);

12049

@@ -1126,8 +1126,8 @@

12050

lock.unlock();

12051

}

12052

}

12053

-public static final native int /*long*/ _gdk_window_lookup(int /*long*/ xid);

12054

-public static final int /*long*/ gdk_window_lookup(int /*long*/ xid) {

12055

+public static final native long /*int*/ _gdk_window_lookup(long /*int*/ xid);

12056

+public static final long /*int*/ gdk_window_lookup(long /*int*/ xid) {

12057

lock.lock();

12058

try {

12059

return _gdk_window_lookup(xid);

12060

@@ -1140,8 +1140,8 @@

12061

* @param function cast=(GdkFilterFunc)

12062

* @param data cast=(gpointer)

12063

*/

12064

-public static final native void _gdk_window_add_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data);

12065

-public static final void gdk_window_add_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data) {

12066

+public static final native void _gdk_window_add_filter(long /*int*/ window, long /*int*/ function, long /*int*/ data);

12067

+public static final void gdk_window_add_filter(long /*int*/ window, long /*int*/ function, long /*int*/ data) {

12068

lock.lock();

12069

try {

12070

_gdk_window_add_filter(window, function, data);

12071

@@ -1154,8 +1154,8 @@

12072

* @param function cast=(GdkFilterFunc)

12073

* @param data cast=(gpointer)

12074

*/

12075

-public static final native void _gdk_window_remove_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data);

12076

-public static final void gdk_window_remove_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data) {

12077

+public static final native void _gdk_window_remove_filter(long /*int*/ window, long /*int*/ function, long /*int*/ data);

12078

+public static final void gdk_window_remove_filter(long /*int*/ window, long /*int*/ function, long /*int*/ data) {

12079

lock.lock();

12080

try {

12081

_gdk_window_remove_filter(window, function, data);

12082

@@ -1168,61 +1168,61 @@

12083

* @param src cast=(const void *),flags=no_out

12084

* @param size cast=(size_t)

12085

*/

12086

-public static final native void memmove(int /*long*/ dest, XButtonEvent src, int /*long*/ size);

12087

+public static final native void memmove(long /*int*/ dest, XButtonEvent src, long /*int*/ size);

12088

/**

12089

* @param dest cast=(void *)

12090

* @param src cast=(const void *),flags=no_out

12091

* @param size cast=(size_t)

12092

*/

12093

-public static final native void memmove(int /*long*/ dest, XClientMessageEvent src, int /*long*/ size);

12094

+public static final native void memmove(long /*int*/ dest, XClientMessageEvent src, long /*int*/ size);

12095

/**

12096

* @param dest cast=(void *)

12097

* @param src cast=(const void *),flags=no_out

12098

* @param size cast=(size_t)

12099

*/

12100

-public static final native void memmove(int /*long*/ dest, XCrossingEvent src, int /*long*/ size);

12101

+public static final native void memmove(long /*int*/ dest, XCrossingEvent src, long /*int*/ size);

12102

/**

12103

* @param dest cast=(void *)

12104

* @param src cast=(const void *),flags=no_out

12105

* @param size cast=(size_t)

12106

*/

12107

-public static final native void memmove(int /*long*/ dest, XExposeEvent src, int /*long*/ size);

12108

+public static final native void memmove(long /*int*/ dest, XExposeEvent src, long /*int*/ size);

12109

/**

12110

* @param dest cast=(void *)

12111

* @param src cast=(const void *),flags=no_out

12112

* @param size cast=(size_t)

12113

*/

12114

-public static final native void memmove(int /*long*/ dest, XFocusChangeEvent src, int /*long*/ size);

12115

+public static final native void memmove(long /*int*/ dest, XFocusChangeEvent src, long /*int*/ size);

12116

/**

12117

* @param dest cast=(void *),flags=no_in

12118

* @param src cast=(const void *)

12119

* @param size cast=(size_t)

12120

*/

12121

-public static final native void memmove(XButtonEvent dest, int /*long*/ src, int /*long*/ size);

12122

+public static final native void memmove(XButtonEvent dest, long /*int*/ src, long /*int*/ size);

12123

/**

12124

* @param dest cast=(void *),flags=no_in

12125

* @param src cast=(const void *)

12126

* @param size cast=(size_t)

12127

*/

12128

-public static final native void memmove(XCrossingEvent dest, int /*long*/ src, int /*long*/ size);

12129

+public static final native void memmove(XCrossingEvent dest, long /*int*/ src, long /*int*/ size);

12130

/**

12131

* @param dest cast=(void *),flags=no_in

12132

* @param src cast=(const void *)

12133

* @param size cast=(size_t)

12134

*/

12135

-public static final native void memmove(XExposeEvent dest, int /*long*/ src, int /*long*/ size);

12136

+public static final native void memmove(XExposeEvent dest, long /*int*/ src, long /*int*/ size);

12137

/**

12138

* @param dest cast=(void *),flags=no_in

12139

* @param src cast=(const void *)

12140

* @param size cast=(size_t)

12141

*/

12142

-public static final native void memmove(XFocusChangeEvent dest, int /*long*/ src, int /*long*/ size);

12143

+public static final native void memmove(XFocusChangeEvent dest, long /*int*/ src, long /*int*/ size);

12144

/**

12145

* @param dest cast=(void *),flags=no_in

12146

* @param src cast=(const void *)

12147

* @param size cast=(size_t)

12148

*/

12149

-public static final native void memmove(XVisibilityEvent dest, int /*long*/ src, int /*long*/ size);

12150

+public static final native void memmove(XVisibilityEvent dest, long /*int*/ src, long /*int*/ size);

12151

12152

/** X render natives and constants */

12153

public static final int PictStandardARGB32 = 0;

12154

@@ -1235,8 +1235,8 @@

12155

12156

public static final native int XRenderPictureAttributes_sizeof();

12157

/** @method flags=dynamic */

12158

-public static final native boolean _XRenderQueryExtension(int /*long*/ display, int[] event_basep, int[] error_basep);

12159

-public static final boolean XRenderQueryExtension(int /*long*/ display, int[] event_basep, int[] error_basep) {

12160

+public static final native boolean _XRenderQueryExtension(long /*int*/ display, int[] event_basep, int[] error_basep);

12161

+public static final boolean XRenderQueryExtension(long /*int*/ display, int[] event_basep, int[] error_basep) {

12162

lock.lock();

12163

try {

12164

return _XRenderQueryExtension(display, event_basep, error_basep);

12165

@@ -1245,8 +1245,8 @@

12166

}

12167

}

12168

/** @method flags=dynamic */

12169

-public static final native int _XRenderQueryVersion(int /*long*/ display, int[] major_versionp, int[] minor_versionp);

12170

-public static final int XRenderQueryVersion(int /*long*/ display, int[] major_versionp, int[] minor_versionp) {

12171

+public static final native int _XRenderQueryVersion(long /*int*/ display, int[] major_versionp, int[] minor_versionp);

12172

+public static final int XRenderQueryVersion(long /*int*/ display, int[] major_versionp, int[] minor_versionp) {

12173

lock.lock();

12174

try {

12175

return _XRenderQueryVersion(display, major_versionp, minor_versionp);

12176

@@ -1258,8 +1258,8 @@

12177

* @method flags=dynamic

12178

* @param attributes flags=no_out

12179

*/

12180

-public static final native int /*long*/ _XRenderCreatePicture(int /*long*/ display, int /*long*/ drawable, int /*long*/ format, int /*long*/ valuemask, XRenderPictureAttributes attributes);

12181

-public static final int /*long*/ XRenderCreatePicture(int /*long*/ display, int /*long*/ drawable, int /*long*/ format, int /*long*/ valuemask, XRenderPictureAttributes attributes) {

12182

+public static final native long /*int*/ _XRenderCreatePicture(long /*int*/ display, long /*int*/ drawable, long /*int*/ format, long /*int*/ valuemask, XRenderPictureAttributes attributes);

12183

+public static final long /*int*/ XRenderCreatePicture(long /*int*/ display, long /*int*/ drawable, long /*int*/ format, long /*int*/ valuemask, XRenderPictureAttributes attributes) {

12184

lock.lock();

12185

try {

12186

return _XRenderCreatePicture(display, drawable, format, valuemask, attributes);

12187

@@ -1268,8 +1268,8 @@

12188

}

12189

}

12190

/** @method flags=dynamic */

12191

-public static final native void _XRenderSetPictureClipRectangles(int /*long*/ display, int /*long*/ picture, int xOrigin, int yOrigin, short[] rects, int count);

12192

-public static final void XRenderSetPictureClipRectangles(int /*long*/ display, int /*long*/ picture, int xOrigin, int yOrigin, short[] rects, int count) {

12193

+public static final native void _XRenderSetPictureClipRectangles(long /*int*/ display, long /*int*/ picture, int xOrigin, int yOrigin, short[] rects, int count);

12194

+public static final void XRenderSetPictureClipRectangles(long /*int*/ display, long /*int*/ picture, int xOrigin, int yOrigin, short[] rects, int count) {

12195

lock.lock();

12196

try {

12197

_XRenderSetPictureClipRectangles(display, picture, xOrigin, yOrigin, rects, count);

12198

@@ -1278,8 +1278,8 @@

12199

}

12200

}

12201

/** @method flags=dynamic */

12202

-public static final native void _XRenderSetPictureTransform(int /*long*/ display, int /*long*/ picture, int[] transform);

12203

-public static final void XRenderSetPictureTransform(int /*long*/ display, int /*long*/ picture, int[] transform) {

12204

+public static final native void _XRenderSetPictureTransform(long /*int*/ display, long /*int*/ picture, int[] transform);

12205

+public static final void XRenderSetPictureTransform(long /*int*/ display, long /*int*/ picture, int[] transform) {

12206

lock.lock();

12207

try {

12208

_XRenderSetPictureTransform(display, picture, transform);

12209

@@ -1288,8 +1288,8 @@

12210

}

12211

}

12212

/** @method flags=dynamic */

12213

-public static final native void _XRenderFreePicture(int /*long*/ display, int /*long*/ picture);

12214

-public static final void XRenderFreePicture(int /*long*/ display, int /*long*/ picture) {

12215

+public static final native void _XRenderFreePicture(long /*int*/ display, long /*int*/ picture);

12216

+public static final void XRenderFreePicture(long /*int*/ display, long /*int*/ picture) {

12217

lock.lock();

12218

try {

12219

_XRenderFreePicture(display, picture);

12220

@@ -1298,8 +1298,8 @@

12221

}

12222

}

12223

/** @method flags=dynamic */

12224

-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);

12225

-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) {

12226

+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);

12227

+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) {

12228

lock.lock();

12229

try {

12230

_XRenderComposite(display, op, src, mask, dst, src_x, src_y, mask_x, mask_y, dst_x, dst_y, width, height);

12231

@@ -1308,8 +1308,8 @@

12232

}

12233

}

12234

/** @method flags=dynamic */

12235

-public static final native int /*long*/ _XRenderFindStandardFormat(int /*long*/ display, int format);

12236

-public static final int /*long*/ XRenderFindStandardFormat(int /*long*/ display, int format) {

12237

+public static final native long /*int*/ _XRenderFindStandardFormat(long /*int*/ display, int format);

12238

+public static final long /*int*/ XRenderFindStandardFormat(long /*int*/ display, int format) {

12239

lock.lock();

12240

try {

12241

return _XRenderFindStandardFormat(display, format);

12242

@@ -1318,8 +1318,8 @@

12243

}

12244

}

12245

/** @method flags=dynamic */

12246

-public static final native int /*long*/ _XRenderFindVisualFormat(int /*long*/ display, int /*long*/ visual);

12247

-public static final int /*long*/ XRenderFindVisualFormat(int /*long*/ display, int /*long*/ visual) {

12248

+public static final native long /*int*/ _XRenderFindVisualFormat(long /*int*/ display, long /*int*/ visual);

12249

+public static final long /*int*/ XRenderFindVisualFormat(long /*int*/ display, long /*int*/ visual) {

12250

lock.lock();

12251

try {

12252

return _XRenderFindVisualFormat(display, visual);

12253

@@ -1329,10 +1329,10 @@

12254

}

12255

12256

/** Natives */

12257

-public static final native int Call (int /*long*/ func, int /*long*/ arg0, int arg1, int arg2);

12258

-public static final native long Call (int /*long*/ func, int /*long*/ arg0, int arg1, long arg2);

12259

-public static final native int /*long*/ _GDK_DISPLAY();

12260

-public static final int /*long*/ GDK_DISPLAY() {

12261

+public static final native int Call (long /*int*/ func, long /*int*/ arg0, int arg1, int arg2);

12262

+public static final native long Call (long /*int*/ func, long /*int*/ arg0, int arg1, long arg2);

12263

+public static final native long /*int*/ _GDK_DISPLAY();

12264

+public static final long /*int*/ GDK_DISPLAY() {

12265

lock.lock();

12266

try {

12267

return _GDK_DISPLAY();

12268

@@ -1340,8 +1340,8 @@

12269

lock.unlock();

12270

}

12271

}

12272

-public static final native int /*long*/ _GDK_ROOT_PARENT();

12273

-public static final int /*long*/ GDK_ROOT_PARENT() {

12274

+public static final native long /*int*/ _GDK_ROOT_PARENT();

12275

+public static final long /*int*/ GDK_ROOT_PARENT() {

12276

lock.lock();

12277

try {

12278

return _GDK_ROOT_PARENT();

12279

@@ -1350,8 +1350,8 @@

12280

}

12281

}

12282

/** @method flags=const */

12283

-public static final native int /*long*/ _GDK_TYPE_COLOR();

12284

-public static final int /*long*/ GDK_TYPE_COLOR() {

12285

+public static final native long /*int*/ _GDK_TYPE_COLOR();

12286

+public static final long /*int*/ GDK_TYPE_COLOR() {

12287

lock.lock();

12288

try {

12289

return _GDK_TYPE_COLOR();

12290

@@ -1360,8 +1360,8 @@

12291

}

12292

}

12293

/** @method flags=const */

12294

-public static final native int /*long*/ _GDK_TYPE_PIXBUF();

12295

-public static final int /*long*/ GDK_TYPE_PIXBUF() {

12296

+public static final native long /*int*/ _GDK_TYPE_PIXBUF();

12297

+public static final long /*int*/ GDK_TYPE_PIXBUF() {

12298

lock.lock();

12299

try {

12300

return _GDK_TYPE_PIXBUF();

12301

@@ -1369,8 +1369,8 @@

12302

lock.unlock();

12303

}

12304

}

12305

-public static final native boolean _GTK_IS_BUTTON(int /*long*/ obj);

12306

-public static final boolean GTK_IS_BUTTON(int /*long*/ obj) {

12307

+public static final native boolean _GTK_IS_BUTTON(long /*int*/ obj);

12308

+public static final boolean GTK_IS_BUTTON(long /*int*/ obj) {

12309

lock.lock();

12310

try {

12311

return _GTK_IS_BUTTON(obj);

12312

@@ -1378,8 +1378,8 @@

12313

lock.unlock();

12314

}

12315

}

12316

-public static final native boolean _GTK_IS_WINDOW(int /*long*/ obj);

12317

-public static final boolean GTK_IS_WINDOW(int /*long*/ obj) {

12318

+public static final native boolean _GTK_IS_WINDOW(long /*int*/ obj);

12319

+public static final boolean GTK_IS_WINDOW(long /*int*/ obj) {

12320

lock.lock();

12321

try {

12322

return _GTK_IS_WINDOW(obj);

12323

@@ -1387,8 +1387,8 @@

12324

lock.unlock();

12325

}

12326

}

12327

-public static final native boolean _GTK_IS_CELL_RENDERER_PIXBUF(int /*long*/ obj);

12328

-public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(int /*long*/ obj) {

12329

+public static final native boolean _GTK_IS_CELL_RENDERER_PIXBUF(long /*int*/ obj);

12330

+public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(long /*int*/ obj) {

12331

lock.lock();

12332

try {

12333

return _GTK_IS_CELL_RENDERER_PIXBUF(obj);

12334

@@ -1396,8 +1396,8 @@

12335

lock.unlock();

12336

}

12337

}

12338

-public static final native boolean _GTK_IS_CELL_RENDERER_TEXT(int /*long*/ obj);

12339

-public static final boolean GTK_IS_CELL_RENDERER_TEXT(int /*long*/ obj) {

12340

+public static final native boolean _GTK_IS_CELL_RENDERER_TEXT(long /*int*/ obj);

12341

+public static final boolean GTK_IS_CELL_RENDERER_TEXT(long /*int*/ obj) {

12342

lock.lock();

12343

try {

12344

return _GTK_IS_CELL_RENDERER_TEXT(obj);

12345

@@ -1405,8 +1405,8 @@

12346

lock.unlock();

12347

}

12348

}

12349

-public static final native boolean _GTK_IS_CELL_RENDERER_TOGGLE(int /*long*/ obj);

12350

-public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(int /*long*/ obj) {

12351

+public static final native boolean _GTK_IS_CELL_RENDERER_TOGGLE(long /*int*/ obj);

12352

+public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(long /*int*/ obj) {

12353

lock.lock();

12354

try {

12355

return _GTK_IS_CELL_RENDERER_TOGGLE(obj);

12356

@@ -1414,8 +1414,8 @@

12357

lock.unlock();

12358

}

12359

}

12360

-public static final native boolean _GTK_IS_CONTAINER(int /*long*/ obj);

12361

-public static final boolean GTK_IS_CONTAINER(int /*long*/ obj) {

12362

+public static final native boolean _GTK_IS_CONTAINER(long /*int*/ obj);

12363

+public static final boolean GTK_IS_CONTAINER(long /*int*/ obj) {

12364

lock.lock();

12365

try {

12366

return _GTK_IS_CONTAINER(obj);

12367

@@ -1423,8 +1423,8 @@

12368

lock.unlock();

12369

}

12370

}

12371

-public static final native boolean _GTK_IS_IMAGE_MENU_ITEM(int /*long*/ obj);

12372

-public static final boolean GTK_IS_IMAGE_MENU_ITEM(int /*long*/ obj) {

12373

+public static final native boolean _GTK_IS_IMAGE_MENU_ITEM(long /*int*/ obj);

12374

+public static final boolean GTK_IS_IMAGE_MENU_ITEM(long /*int*/ obj) {

12375

lock.lock();

12376

try {

12377

return _GTK_IS_IMAGE_MENU_ITEM(obj);

12378

@@ -1432,8 +1432,8 @@

12379

lock.unlock();

12380

}

12381

}

12382

-public static final native boolean _GTK_IS_MENU_ITEM(int /*long*/ obj);

12383

-public static final boolean GTK_IS_MENU_ITEM(int /*long*/ obj) {

12384

+public static final native boolean _GTK_IS_MENU_ITEM(long /*int*/ obj);

12385

+public static final boolean GTK_IS_MENU_ITEM(long /*int*/ obj) {

12386

lock.lock();

12387

try {

12388

return _GTK_IS_MENU_ITEM(obj);

12389

@@ -1441,8 +1441,8 @@

12390

lock.unlock();

12391

}

12392

}

12393

-public static final native boolean _GTK_IS_PLUG(int /*long*/ obj);

12394

-public static final boolean GTK_IS_PLUG(int /*long*/ obj) {

12395

+public static final native boolean _GTK_IS_PLUG(long /*int*/ obj);

12396

+public static final boolean GTK_IS_PLUG(long /*int*/ obj) {

12397

lock.lock();

12398

try {

12399

return _GTK_IS_PLUG(obj);

12400

@@ -1450,8 +1450,8 @@

12401

lock.unlock();

12402

}

12403

}

12404

-public static final native boolean _GTK_IS_SOCKET(int /*long*/ obj);

12405

-public static final boolean GTK_IS_SOCKET(int /*long*/ obj) {

12406

+public static final native boolean _GTK_IS_SOCKET(long /*int*/ obj);

12407

+public static final boolean GTK_IS_SOCKET(long /*int*/ obj) {

12408

lock.lock();

12409

try {

12410

return _GTK_IS_SOCKET(obj);

12411

@@ -1460,8 +1460,8 @@

12412

}

12413

}

12414

/** @method flags=const */

12415

-public static final native int /*long*/ _GTK_STOCK_CANCEL();

12416

-public static final int /*long*/ GTK_STOCK_CANCEL() {

12417

+public static final native long /*int*/ _GTK_STOCK_CANCEL();

12418

+public static final long /*int*/ GTK_STOCK_CANCEL() {

12419

lock.lock();

12420

try {

12421

return _GTK_STOCK_CANCEL();

12422

@@ -1470,8 +1470,8 @@

12423

}

12424

}

12425

/** @method flags=const */

12426

-public static final native int /*long*/ _GTK_STOCK_OK();

12427

-public static final int /*long*/ GTK_STOCK_OK() {

12428

+public static final native long /*int*/ _GTK_STOCK_OK();

12429

+public static final long /*int*/ GTK_STOCK_OK() {

12430

lock.lock();

12431

try {

12432

return _GTK_STOCK_OK();

12433

@@ -1480,8 +1480,8 @@

12434

}

12435

}

12436

/** @method flags=const */

12437

-public static final native int /*long*/ _GTK_TYPE_CELL_RENDERER_TEXT();

12438

-public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TEXT() {

12439

+public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_TEXT();

12440

+public static final long /*int*/ GTK_TYPE_CELL_RENDERER_TEXT() {

12441

lock.lock();

12442

try {

12443

return _GTK_TYPE_CELL_RENDERER_TEXT();

12444

@@ -1490,8 +1490,8 @@

12445

}

12446

}

12447

/** @method flags=const */

12448

-public static final native int /*long*/ _GTK_TYPE_CELL_RENDERER_PIXBUF();

12449

-public static final int /*long*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {

12450

+public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_PIXBUF();

12451

+public static final long /*int*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {

12452

lock.lock();

12453

try {

12454

return _GTK_TYPE_CELL_RENDERER_PIXBUF();

12455

@@ -1500,8 +1500,8 @@

12456

}

12457

}

12458

/** @method flags=const */

12459

-public static final native int /*long*/ _GTK_TYPE_CELL_RENDERER_TOGGLE();

12460

-public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {

12461

+public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_TOGGLE();

12462

+public static final long /*int*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {

12463

lock.lock();

12464

try {

12465

return _GTK_TYPE_CELL_RENDERER_TOGGLE();

12466

@@ -1510,8 +1510,8 @@

12467

}

12468

}

12469

/** @method flags=const */

12470

-public static final native int /*long*/ _GTK_TYPE_FIXED();

12471

-public static final int /*long*/ GTK_TYPE_FIXED() {

12472

+public static final native long /*int*/ _GTK_TYPE_FIXED();

12473

+public static final long /*int*/ GTK_TYPE_FIXED() {

12474

lock.lock();

12475

try {

12476

return _GTK_TYPE_FIXED();

12477

@@ -1520,8 +1520,8 @@

12478

}

12479

}

12480

/** @method flags=const */

12481

-public static final native int /*long*/ _GTK_TYPE_MENU();

12482

-public static final int /*long*/ GTK_TYPE_MENU() {

12483

+public static final native long /*int*/ _GTK_TYPE_MENU();

12484

+public static final long /*int*/ GTK_TYPE_MENU() {

12485

lock.lock();

12486

try {

12487

return _GTK_TYPE_MENU();

12488

@@ -1530,8 +1530,8 @@

12489

}

12490

}

12491

/** @method flags=const */

12492

-public static final native int /*long*/ _GTK_TYPE_WIDGET();

12493

-public static final int /*long*/ GTK_TYPE_WIDGET() {

12494

+public static final native long /*int*/ _GTK_TYPE_WIDGET();

12495

+public static final long /*int*/ GTK_TYPE_WIDGET() {

12496

lock.lock();

12497

try {

12498

return _GTK_TYPE_WIDGET();

12499

@@ -1539,8 +1539,8 @@

12500

lock.unlock();

12501

}

12502

}

12503

-public static final native int _GTK_WIDGET_FLAGS(int /*long*/ wid);

12504

-public static final int GTK_WIDGET_FLAGS(int /*long*/ wid) {

12505

+public static final native int _GTK_WIDGET_FLAGS(long /*int*/ wid);

12506

+public static final int GTK_WIDGET_FLAGS(long /*int*/ wid) {

12507

lock.lock();

12508

try {

12509

return _GTK_WIDGET_FLAGS(wid);

12510

@@ -1548,8 +1548,8 @@

12511

lock.unlock();

12512

}

12513

}

12514

-public static final native int _GTK_WIDGET_STATE(int /*long*/ wid);

12515

-public static final int GTK_WIDGET_STATE(int /*long*/ wid) {

12516

+public static final native int _GTK_WIDGET_STATE(long /*int*/ wid);

12517

+public static final int GTK_WIDGET_STATE(long /*int*/ wid) {

12518

lock.lock();

12519

try {

12520

return _GTK_WIDGET_STATE(wid);

12521

@@ -1557,8 +1557,8 @@

12522

lock.unlock();

12523

}

12524

}

12525

-public static final native boolean _GTK_WIDGET_HAS_DEFAULT(int /*long*/ wid);

12526

-public static final boolean GTK_WIDGET_HAS_DEFAULT(int /*long*/ wid) {

12527

+public static final native boolean _GTK_WIDGET_HAS_DEFAULT(long /*int*/ wid);

12528

+public static final boolean GTK_WIDGET_HAS_DEFAULT(long /*int*/ wid) {

12529

lock.lock();

12530

try {

12531

return _GTK_WIDGET_HAS_DEFAULT(wid);

12532

@@ -1566,8 +1566,8 @@

12533

lock.unlock();

12534

}

12535

}

12536

-public static final native boolean _GTK_WIDGET_HAS_FOCUS(int /*long*/ wid);

12537

-public static final boolean GTK_WIDGET_HAS_FOCUS(int /*long*/ wid) {

12538

+public static final native boolean _GTK_WIDGET_HAS_FOCUS(long /*int*/ wid);

12539

+public static final boolean GTK_WIDGET_HAS_FOCUS(long /*int*/ wid) {

12540

lock.lock();

12541

try {

12542

return _GTK_WIDGET_HAS_FOCUS(wid);

12543

@@ -1575,8 +1575,8 @@

12544

lock.unlock();

12545

}

12546

}

12547

-public static final native boolean _GTK_WIDGET_IS_SENSITIVE(int /*long*/ wid);

12548

-public static final boolean GTK_WIDGET_IS_SENSITIVE(int /*long*/ wid) {

12549

+public static final native boolean _GTK_WIDGET_IS_SENSITIVE(long /*int*/ wid);

12550

+public static final boolean GTK_WIDGET_IS_SENSITIVE(long /*int*/ wid) {

12551

lock.lock();

12552

try {

12553

return _GTK_WIDGET_IS_SENSITIVE(wid);

12554

@@ -1584,8 +1584,8 @@

12555

lock.unlock();

12556

}

12557

}

12558

-public static final native boolean _GTK_WIDGET_MAPPED(int /*long*/ wid);

12559

-public static final boolean GTK_WIDGET_MAPPED(int /*long*/ wid) {

12560

+public static final native boolean _GTK_WIDGET_MAPPED(long /*int*/ wid);

12561

+public static final boolean GTK_WIDGET_MAPPED(long /*int*/ wid) {

12562

lock.lock();

12563

try {

12564

return _GTK_WIDGET_MAPPED(wid);

12565

@@ -1593,8 +1593,8 @@

12566

lock.unlock();

12567

}

12568

}

12569

-public static final native boolean _GTK_WIDGET_SENSITIVE(int /*long*/ wid);

12570

-public static final boolean GTK_WIDGET_SENSITIVE(int /*long*/ wid) {

12571

+public static final native boolean _GTK_WIDGET_SENSITIVE(long /*int*/ wid);

12572

+public static final boolean GTK_WIDGET_SENSITIVE(long /*int*/ wid) {

12573

lock.lock();

12574

try {

12575

return _GTK_WIDGET_SENSITIVE(wid);

12576

@@ -1602,8 +1602,8 @@

12577

lock.unlock();

12578

}

12579

}

12580

-public static final native void _GTK_WIDGET_SET_FLAGS(int /*long*/ wid, int flag);

12581

-public static final void GTK_WIDGET_SET_FLAGS(int /*long*/ wid, int flag) {

12582

+public static final native void _GTK_WIDGET_SET_FLAGS(long /*int*/ wid, int flag);

12583

+public static final void GTK_WIDGET_SET_FLAGS(long /*int*/ wid, int flag) {

12584

lock.lock();

12585

try {

12586

_GTK_WIDGET_SET_FLAGS(wid, flag);

12587

@@ -1611,8 +1611,8 @@

12588

lock.unlock();

12589

}

12590

}

12591

-public static final native void _GTK_WIDGET_UNSET_FLAGS(int /*long*/ wid, int flag);

12592

-public static final void GTK_WIDGET_UNSET_FLAGS(int /*long*/ wid, int flag) {

12593

+public static final native void _GTK_WIDGET_UNSET_FLAGS(long /*int*/ wid, int flag);

12594

+public static final void GTK_WIDGET_UNSET_FLAGS(long /*int*/ wid, int flag) {

12595

lock.lock();

12596

try {

12597

_GTK_WIDGET_UNSET_FLAGS(wid, flag);

12598

@@ -1620,8 +1620,8 @@

12599

lock.unlock();

12600

}

12601

}

12602

-public static final native boolean _GTK_WIDGET_VISIBLE(int /*long*/ wid);

12603

-public static final boolean GTK_WIDGET_VISIBLE(int /*long*/ wid) {

12604

+public static final native boolean _GTK_WIDGET_VISIBLE(long /*int*/ wid);

12605

+public static final boolean GTK_WIDGET_VISIBLE(long /*int*/ wid) {

12606

lock.lock();

12607

try {

12608

return _GTK_WIDGET_VISIBLE(wid);

12609

@@ -1629,8 +1629,8 @@

12610

lock.unlock();

12611

}

12612

}

12613

-public static final native int /*long*/ _G_OBJECT_CLASS (int /*long*/ klass);

12614

-public static final int /*long*/ G_OBJECT_CLASS (int /*long*/ klass) {

12615

+public static final native long /*int*/ _G_OBJECT_CLASS (long /*int*/ klass);

12616

+public static final long /*int*/ G_OBJECT_CLASS (long /*int*/ klass) {

12617

lock.lock();

12618

try {

12619

return _G_OBJECT_CLASS(klass);

12620

@@ -1638,8 +1638,8 @@

12621

lock.unlock();

12622

}

12623

}

12624

-public static final native int /*long*/ _G_OBJECT_GET_CLASS (int /*long*/ object);

12625

-public static final int /*long*/ G_OBJECT_GET_CLASS (int /*long*/ object) {

12626

+public static final native long /*int*/ _G_OBJECT_GET_CLASS (long /*int*/ object);

12627

+public static final long /*int*/ G_OBJECT_GET_CLASS (long /*int*/ object) {

12628

lock.lock();

12629

try {

12630

return _G_OBJECT_GET_CLASS(object);

12631

@@ -1647,8 +1647,8 @@

12632

lock.unlock();

12633

}

12634

}

12635

-public static final native int /*long*/ _G_OBJECT_TYPE_NAME (int /*long*/ object);

12636

-public static final int /*long*/ G_OBJECT_TYPE_NAME (int /*long*/ object) {

12637

+public static final native long /*int*/ _G_OBJECT_TYPE_NAME (long /*int*/ object);

12638

+public static final long /*int*/ G_OBJECT_TYPE_NAME (long /*int*/ object) {

12639

lock.lock();

12640

try {

12641

return _G_OBJECT_TYPE_NAME(object);

12642

@@ -1657,8 +1657,8 @@

12643

}

12644

}

12645

/** @method flags=const */

12646

-public static final native int /*long*/ _G_TYPE_BOOLEAN();

12647

-public static final int /*long*/ G_TYPE_BOOLEAN() {

12648

+public static final native long /*int*/ _G_TYPE_BOOLEAN();

12649

+public static final long /*int*/ G_TYPE_BOOLEAN() {

12650

lock.lock();

12651

try {

12652

return _G_TYPE_BOOLEAN();

12653

@@ -1667,8 +1667,8 @@

12654

}

12655

}

12656

/** @method flags=const */

12657

-public static final native int /*long*/ _G_TYPE_INT();

12658

-public static final int /*long*/ G_TYPE_INT() {

12659

+public static final native long /*int*/ _G_TYPE_INT();

12660

+public static final long /*int*/ G_TYPE_INT() {

12661

lock.lock();

12662

try {

12663

return _G_TYPE_INT();

12664

@@ -1676,8 +1676,8 @@

12665

lock.unlock();

12666

}

12667

}

12668

-public static final native int /*long*/ _G_OBJECT_TYPE (int /*long*/ instance);

12669

-public static final int /*long*/ G_OBJECT_TYPE (int /*long*/ instance) {

12670

+public static final native long /*int*/ _G_OBJECT_TYPE (long /*int*/ instance);

12671

+public static final long /*int*/ G_OBJECT_TYPE (long /*int*/ instance) {

12672

lock.lock();

12673

try {

12674

return _G_OBJECT_TYPE(instance);

12675

@@ -1686,8 +1686,8 @@

12676

}

12677

}

12678

/** @method flags=const */

12679

-public static final native int /*long*/ _G_TYPE_STRING();

12680

-public static final int /*long*/ G_TYPE_STRING() {

12681

+public static final native long /*int*/ _G_TYPE_STRING();

12682

+public static final long /*int*/ G_TYPE_STRING() {

12683

lock.lock();

12684

try {

12685

return _G_TYPE_STRING();

12686

@@ -1705,8 +1705,8 @@

12687

}

12688

}

12689

/** @method flags=const */

12690

-public static final native int /*long*/ _PANGO_TYPE_FONT_DESCRIPTION();

12691

-public static final int /*long*/ PANGO_TYPE_FONT_DESCRIPTION() {

12692

+public static final native long /*int*/ _PANGO_TYPE_FONT_DESCRIPTION();

12693

+public static final long /*int*/ PANGO_TYPE_FONT_DESCRIPTION() {

12694

lock.lock();

12695

try {

12696

return _PANGO_TYPE_FONT_DESCRIPTION();

12697

@@ -1715,8 +1715,8 @@

12698

}

12699

}

12700

/** @method flags=const */

12701

-public static final native int /*long*/ _PANGO_TYPE_LAYOUT();

12702

-public static final int /*long*/ PANGO_TYPE_LAYOUT() {

12703

+public static final native long /*int*/ _PANGO_TYPE_LAYOUT();

12704

+public static final long /*int*/ PANGO_TYPE_LAYOUT() {

12705

lock.lock();

12706

try {

12707

return _PANGO_TYPE_LAYOUT();

12708

@@ -1725,8 +1725,8 @@

12709

}

12710

}

12711

/** @param handle cast=(void *) */

12712

-public static final native int _dlclose(int /*long*/ handle);

12713

-public static final int dlclose(int /*long*/ handle) {

12714

+public static final native int _dlclose(long /*int*/ handle);

12715

+public static final int dlclose(long /*int*/ handle) {

12716

lock.lock();

12717

try {

12718

return _dlclose(handle);

12719

@@ -1735,8 +1735,8 @@

12720

}

12721

}

12722

/** @param filename cast=(const char *) */

12723

-public static final native int /*long*/ _dlopen(byte[] filename, int flag);

12724

-public static final int /*long*/ dlopen(byte[] filename, int flag) {

12725

+public static final native long /*int*/ _dlopen(byte[] filename, int flag);

12726

+public static final long /*int*/ dlopen(byte[] filename, int flag) {

12727

lock.lock();

12728

try {

12729

return _dlopen(filename, flag);

12730

@@ -1748,8 +1748,8 @@

12731

* @param handle cast=(void *)

12732

* @param symbol cast=(const char *)

12733

*/

12734

-public static final native int /*long*/ _dlsym(int /*long*/ handle, byte[] symbol);

12735

-public static final int /*long*/ dlsym(int /*long*/ handle, byte[] symbol) {

12736

+public static final native long /*int*/ _dlsym(long /*int*/ handle, byte[] symbol);

12737

+public static final long /*int*/ dlsym(long /*int*/ handle, byte[] symbol) {

12738

lock.lock();

12739

try {

12740

return _dlsym(handle, symbol);

12741

@@ -1764,8 +1764,8 @@

12742

* @param hook_data cast=(gpointer)

12743

* @param data_destroy cast=(GDestroyNotify)

12744

*/

12745

-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);

12746

-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) {

12747

+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);

12748

+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) {

12749

lock.lock();

12750

try {

12751

return _g_signal_add_emission_hook(signal_id, detail, hook_func, hook_data, data_destroy);

12752

@@ -1777,8 +1777,8 @@

12753

* @param signal_id cast=(guint)

12754

* @param hook_id cast=(gulong)

12755

*/

12756

-public static final native void _g_signal_remove_emission_hook(int signal_id, int /*long*/ hook_id);

12757

-public static final void g_signal_remove_emission_hook(int signal_id, int /*long*/ hook_id) {

12758

+public static final native void _g_signal_remove_emission_hook(int signal_id, long /*int*/ hook_id);

12759

+public static final void g_signal_remove_emission_hook(int signal_id, long /*int*/ hook_id) {

12760

lock.lock();

12761

try {

12762

_g_signal_remove_emission_hook (signal_id, hook_id);

12763

@@ -1791,8 +1791,8 @@

12764

* @param user_data cast=(gpointer)

12765

* @param destroy_data cast=(GClosureNotify)

12766

*/

12767

-public static final native int /*long*/ _g_cclosure_new(int /*long*/ callback_func, int /*long*/ user_data, int /*long*/ destroy_data);

12768

-public static final int /*long*/ g_cclosure_new(int /*long*/ callback_func, int /*long*/ user_data, int /*long*/ destroy_data) {

12769

+public static final native long /*int*/ _g_cclosure_new(long /*int*/ callback_func, long /*int*/ user_data, long /*int*/ destroy_data);

12770

+public static final long /*int*/ g_cclosure_new(long /*int*/ callback_func, long /*int*/ user_data, long /*int*/ destroy_data) {

12771

lock.lock();

12772

try {

12773

return _g_cclosure_new(callback_func, user_data, destroy_data);

12774

@@ -1801,8 +1801,8 @@

12775

}

12776

}

12777

/** @param closure cast=(GClosure *) */

12778

-public static final native int /*long*/ _g_closure_ref(int /*long*/ closure);

12779

-public static final int /*long*/ g_closure_ref(int /*long*/ closure) {

12780

+public static final native long /*int*/ _g_closure_ref(long /*int*/ closure);

12781

+public static final long /*int*/ g_closure_ref(long /*int*/ closure) {

12782

lock.lock();

12783

try {

12784

return _g_closure_ref(closure);

12785

@@ -1811,8 +1811,8 @@

12786

}

12787

}

12788

/** @param closure cast=(GClosure *) */

12789

-public static final native void _g_closure_unref(int /*long*/ closure);

12790

-public static final void g_closure_unref(int /*long*/ closure) {

12791

+public static final native void _g_closure_unref(long /*int*/ closure);

12792

+public static final void g_closure_unref(long /*int*/ closure) {

12793

lock.lock();

12794

try {

12795

_g_closure_unref(closure);

12796

@@ -1821,8 +1821,8 @@

12797

}

12798

}

12799

/** @param context cast=(GMainContext *) */

12800

-public static final native boolean _g_main_context_acquire(int /*long*/ context);

12801

-public static final boolean g_main_context_acquire(int /*long*/ context) {

12802

+public static final native boolean _g_main_context_acquire(long /*int*/ context);

12803

+public static final boolean g_main_context_acquire(long /*int*/ context) {

12804

lock.lock();

12805

try {

12806

return _g_main_context_acquire(context);

12807

@@ -1834,8 +1834,8 @@

12808

* @param context cast=(GMainContext *)

12809

* @param fds cast=(GPollFD *)

12810

*/

12811

-public static final native int _g_main_context_check(int /*long*/ context, int max_priority, int /*long*/ fds, int n_fds);

12812

-public static final int g_main_context_check(int /*long*/ context, int max_priority, int /*long*/ fds, int n_fds) {

12813

+public static final native int _g_main_context_check(long /*int*/ context, int max_priority, long /*int*/ fds, int n_fds);

12814

+public static final int g_main_context_check(long /*int*/ context, int max_priority, long /*int*/ fds, int n_fds) {

12815

lock.lock();

12816

try {

12817

return _g_main_context_check(context, max_priority, fds, n_fds);

12818

@@ -1843,8 +1843,8 @@

12819

lock.unlock();

12820

}

12821

}

12822

-public static final native int /*long*/ _g_main_context_default();

12823

-public static final int /*long*/ g_main_context_default() {

12824

+public static final native long /*int*/ _g_main_context_default();

12825

+public static final long /*int*/ g_main_context_default() {

12826

lock.lock();

12827

try {

12828

return _g_main_context_default();

12829

@@ -1853,8 +1853,8 @@

12830

}

12831

}

12832

/** @param context cast=(GMainContext *) */

12833

-public static final native boolean _g_main_context_iteration(int /*long*/ context, boolean may_block);

12834

-public static final boolean g_main_context_iteration(int /*long*/ context, boolean may_block) {

12835

+public static final native boolean _g_main_context_iteration(long /*int*/ context, boolean may_block);

12836

+public static final boolean g_main_context_iteration(long /*int*/ context, boolean may_block) {

12837

lock.lock();

12838

try {

12839

return _g_main_context_iteration(context, may_block);

12840

@@ -1863,8 +1863,8 @@

12841

}

12842

}

12843

/** @param context cast=(GMainContext *) */

12844

-public static final native boolean _g_main_context_pending(int /*long*/ context);

12845

-public static final boolean g_main_context_pending(int /*long*/ context) {

12846

+public static final native boolean _g_main_context_pending(long /*int*/ context);

12847

+public static final boolean g_main_context_pending(long /*int*/ context) {

12848

lock.lock();

12849

try {

12850

return _g_main_context_pending(context);

12851

@@ -1873,8 +1873,8 @@

12852

}

12853

}

12854

/** @param context cast=(GMainContext *) */

12855

-public static final native int /*long*/ _g_main_context_get_poll_func(int /*long*/ context);

12856

-public static final int /*long*/ g_main_context_get_poll_func(int /*long*/ context) {

12857

+public static final native long /*int*/ _g_main_context_get_poll_func(long /*int*/ context);

12858

+public static final long /*int*/ g_main_context_get_poll_func(long /*int*/ context) {

12859

lock.lock();

12860

try {

12861

return _g_main_context_get_poll_func(context);

12862

@@ -1883,8 +1883,8 @@

12863

}

12864

}

12865

/** @param context cast=(GMainContext *) */

12866

-public static final native boolean _g_main_context_prepare(int /*long*/ context, int[] priority);

12867

-public static final boolean g_main_context_prepare(int /*long*/ context, int[] priority) {

12868

+public static final native boolean _g_main_context_prepare(long /*int*/ context, int[] priority);

12869

+public static final boolean g_main_context_prepare(long /*int*/ context, int[] priority) {

12870

lock.lock();

12871

try {

12872

return _g_main_context_prepare(context, priority);

12873

@@ -1896,8 +1896,8 @@

12874

* @param context cast=(GMainContext *)

12875

* @param fds cast=(GPollFD *)

12876

*/

12877

-public static final native int _g_main_context_query(int /*long*/ context, int max_priority, int[] timeout_, int /*long*/ fds, int n_fds);

12878

-public static final int g_main_context_query(int /*long*/ context, int max_priority, int[] timeout_, int /*long*/ fds, int n_fds) {

12879

+public static final native int _g_main_context_query(long /*int*/ context, int max_priority, int[] timeout_, long /*int*/ fds, int n_fds);

12880

+public static final int g_main_context_query(long /*int*/ context, int max_priority, int[] timeout_, long /*int*/ fds, int n_fds) {

12881

lock.lock();

12882

try {

12883

return _g_main_context_query(context, max_priority, timeout_, fds, n_fds);

12884

@@ -1906,8 +1906,8 @@

12885

}

12886

}

12887

/** @param context cast=(GMainContext *) */

12888

-public static final native void _g_main_context_release(int /*long*/ context);

12889

-public static final void g_main_context_release(int /*long*/ context) {

12890

+public static final native void _g_main_context_release(long /*int*/ context);

12891

+public static final void g_main_context_release(long /*int*/ context) {

12892

lock.lock();

12893

try {

12894

_g_main_context_release(context);

12895

@@ -1916,7 +1916,7 @@

12896

}

12897

}

12898

/** @param context cast=(GMainContext *) */

12899

-public static final native void g_main_context_wakeup(int /*long*/ context);

12900

+public static final native void g_main_context_wakeup(long /*int*/ context);

12901

/**

12902

* @param opsysstring cast=(const gchar *)

12903

* @param len cast=(gssize)

12904

@@ -1924,8 +1924,8 @@

12905

* @param bytes_written cast=(gsize *)

12906

* @param error cast=(GError **)

12907

*/

12908

-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);

12909

-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) {

12910

+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);

12911

+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) {

12912

lock.lock();

12913

try {

12914

return _g_filename_to_utf8(opsysstring, len, bytes_read, bytes_written, error);

12915

@@ -1938,8 +1938,8 @@

12916

* @param hostname cast=(const char *)

12917

* @param error cast=(GError **)

12918

*/

12919

-public static final native int /*long*/ _g_filename_to_uri(int /*long*/ filename, int /*long*/ hostname, int /*long*/[] error);

12920

-public static final int /*long*/ g_filename_to_uri(int /*long*/ filename, int /*long*/ hostname, int /*long*/[] error) {

12921

+public static final native long /*int*/ _g_filename_to_uri(long /*int*/ filename, long /*int*/ hostname, long /*int*/[] error);

12922

+public static final long /*int*/ g_filename_to_uri(long /*int*/ filename, long /*int*/ hostname, long /*int*/[] error) {

12923

lock.lock();

12924

try {

12925

return _g_filename_to_uri(filename, hostname, error);

12926

@@ -1954,8 +1954,8 @@

12927

* @param bytes_written cast=(gsize *)

12928

* @param error cast=(GError **)

12929

*/

12930

-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);

12931

-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) {

12932

+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);

12933

+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) {

12934

lock.lock();

12935

try {

12936

return _g_filename_from_utf8(opsysstring, len, bytes_read, bytes_written, error);

12937

@@ -1968,8 +1968,8 @@

12938

* @param hostname cast=(char **)

12939

* @param error cast=(GError **)

12940

*/

12941

-public static final native int /*long*/ _g_filename_from_uri(int /*long*/ uri, int /*long*/[] hostname, int /*long*/[] error);

12942

-public static final int /*long*/ g_filename_from_uri(int /*long*/ uri, int /*long*/[] hostname, int /*long*/[] error) {

12943

+public static final native long /*int*/ _g_filename_from_uri(long /*int*/ uri, long /*int*/[] hostname, long /*int*/[] error);

12944

+public static final long /*int*/ g_filename_from_uri(long /*int*/ uri, long /*int*/[] hostname, long /*int*/[] error) {

12945

lock.lock();

12946

try {

12947

return _g_filename_from_uri(uri, hostname, error);

12948

@@ -1978,8 +1978,8 @@

12949

}

12950

}

12951

/** @param mem cast=(gpointer) */

12952

-public static final native void _g_free(int /*long*/ mem);

12953

-public static final void g_free(int /*long*/ mem) {

12954

+public static final native void _g_free(long /*int*/ mem);

12955

+public static final void g_free(long /*int*/ mem) {

12956

lock.lock();

12957

try {

12958

_g_free(mem);

12959

@@ -1991,8 +1991,8 @@

12960

* @param function cast=(GSourceFunc)

12961

* @param data cast=(gpointer)

12962

*/

12963

-public static final native int _g_idle_add(int /*long*/ function, int /*long*/ data);

12964

-public static final int g_idle_add(int /*long*/ function, int /*long*/ data) {

12965

+public static final native int _g_idle_add(long /*int*/ function, long /*int*/ data);

12966

+public static final int g_idle_add(long /*int*/ function, long /*int*/ data) {

12967

lock.lock();

12968

try {

12969

return _g_idle_add(function, data);

12970

@@ -2004,8 +2004,8 @@

12971

* @param list cast=(GList *)

12972

* @param data cast=(gpointer)

12973

*/

12974

-public static final native int /*long*/ _g_list_append(int /*long*/ list, int /*long*/ data);

12975

-public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ data) {

12976

+public static final native long /*int*/ _g_list_append(long /*int*/ list, long /*int*/ data);

12977

+public static final long /*int*/ g_list_append(long /*int*/ list, long /*int*/ data) {

12978

lock.lock();

12979

try {

12980

return _g_list_append(list, data);

12981

@@ -2014,8 +2014,8 @@

12982

}

12983

}

12984

/** @param list cast=(GList *) */

12985

-public static final native int /*long*/ _g_list_data(int /*long*/ list);

12986

-public static final int /*long*/ g_list_data(int /*long*/ list) {

12987

+public static final native long /*int*/ _g_list_data(long /*int*/ list);

12988

+public static final long /*int*/ g_list_data(long /*int*/ list) {

12989

lock.lock();

12990

try {

12991

return _g_list_data(list);

12992

@@ -2024,8 +2024,8 @@

12993

}

12994

}

12995

/** @param list cast=(GList *) */

12996

-public static final native void _g_list_free(int /*long*/ list);

12997

-public static final void g_list_free(int /*long*/ list) {

12998

+public static final native void _g_list_free(long /*int*/ list);

12999

+public static final void g_list_free(long /*int*/ list) {

13000

lock.lock();

13001

try {

13002

_g_list_free(list);

13003

@@ -2034,8 +2034,8 @@

13004

}

13005

}

13006

/** @param list cast=(GList *) */

13007

-public static final native void _g_list_free_1(int /*long*/ list);

13008

-public static final void g_list_free_1(int /*long*/ list) {

13009

+public static final native void _g_list_free_1(long /*int*/ list);

13010

+public static final void g_list_free_1(long /*int*/ list) {

13011

lock.lock();

13012

try {

13013

_g_list_free_1(list);

13014

@@ -2044,8 +2044,8 @@

13015

}

13016

}

13017

/** @param list cast=(GList *) */

13018

-public static final native int _g_list_length(int /*long*/ list);

13019

-public static final int g_list_length(int /*long*/ list) {

13020

+public static final native int _g_list_length(long /*int*/ list);

13021

+public static final int g_list_length(long /*int*/ list) {

13022

lock.lock();

13023

try {

13024

return _g_list_length(list);

13025

@@ -2057,8 +2057,8 @@

13026

* @param list cast=(GList *)

13027

* @param llist cast=(GList *)

13028

*/

13029

-public static final native void _g_list_set_next(int /*long*/ list, int /*long*/ llist);

13030

-public static final void g_list_set_next(int /*long*/ list, int /*long*/ llist) {

13031

+public static final native void _g_list_set_next(long /*int*/ list, long /*int*/ llist);

13032

+public static final void g_list_set_next(long /*int*/ list, long /*int*/ llist) {

13033

lock.lock();

13034

try {

13035

_g_list_set_next(list, llist);

13036

@@ -2066,8 +2066,8 @@

13037

lock.unlock();

13038

}

13039

}

13040

-public static final native int /*long*/ _g_list_next(int /*long*/ list);

13041

-public static final int /*long*/ g_list_next(int /*long*/ list) {

13042

+public static final native long /*int*/ _g_list_next(long /*int*/ list);

13043

+public static final long /*int*/ g_list_next(long /*int*/ list) {

13044

lock.lock();

13045

try {

13046

return _g_list_next(list);

13047

@@ -2079,8 +2079,8 @@

13048

* @param list cast=(GList *)

13049

* @param n cast=(guint)

13050

*/

13051

-public static final native int /*long*/ _g_list_nth(int /*long*/ list, int n);

13052

-public static final int /*long*/ g_list_nth(int /*long*/ list, int n) {

13053

+public static final native long /*int*/ _g_list_nth(long /*int*/ list, int n);

13054

+public static final long /*int*/ g_list_nth(long /*int*/ list, int n) {

13055

lock.lock();

13056

try {

13057

return _g_list_nth(list, n);

13058

@@ -2092,8 +2092,8 @@

13059

* @param list cast=(GList *)

13060

* @param n cast=(guint)

13061

*/

13062

-public static final native int /*long*/ _g_list_nth_data(int /*long*/ list, int n);

13063

-public static final int /*long*/ g_list_nth_data(int /*long*/ list, int n) {

13064

+public static final native long /*int*/ _g_list_nth_data(long /*int*/ list, int n);

13065

+public static final long /*int*/ g_list_nth_data(long /*int*/ list, int n) {

13066

lock.lock();

13067

try {

13068

return _g_list_nth_data(list, n);

13069

@@ -2105,8 +2105,8 @@

13070

* @param list cast=(GList *)

13071

* @param data cast=(gpointer)

13072

*/

13073

-public static final native int /*long*/ _g_list_prepend(int /*long*/ list, int /*long*/ data);

13074

-public static final int /*long*/ g_list_prepend(int /*long*/ list, int /*long*/ data) {

13075

+public static final native long /*int*/ _g_list_prepend(long /*int*/ list, long /*int*/ data);

13076

+public static final long /*int*/ g_list_prepend(long /*int*/ list, long /*int*/ data) {

13077

lock.lock();

13078

try {

13079

return _g_list_prepend(list, data);

13080

@@ -2118,8 +2118,8 @@

13081

* @param list cast=(GList *)

13082

* @param llist cast=(GList *)

13083

*/

13084

-public static final native void _g_list_set_previous(int /*long*/ list, int /*long*/ llist);

13085

-public static final void g_list_set_previous(int /*long*/ list, int /*long*/ llist) {

13086

+public static final native void _g_list_set_previous(long /*int*/ list, long /*int*/ llist);

13087

+public static final void g_list_set_previous(long /*int*/ list, long /*int*/ llist) {

13088

lock.lock();

13089

try {

13090

_g_list_set_previous(list, llist);

13091

@@ -2127,8 +2127,8 @@

13092

lock.unlock();

13093

}

13094

}

13095

-public static final native int /*long*/ _g_list_previous(int /*long*/ list);

13096

-public static final int /*long*/ g_list_previous(int /*long*/ list) {

13097

+public static final native long /*int*/ _g_list_previous(long /*int*/ list);

13098

+public static final long /*int*/ g_list_previous(long /*int*/ list) {

13099

lock.lock();

13100

try {

13101

return _g_list_previous(list);

13102

@@ -2140,8 +2140,8 @@

13103

* @param list cast=(GList *)

13104

* @param link cast=(GList *)

13105

*/

13106

-public static final native int /*long*/ _g_list_remove_link(int /*long*/ list, int /*long*/ link);

13107

-public static final int /*long*/ g_list_remove_link(int /*long*/ list, int /*long*/ link) {

13108

+public static final native long /*int*/ _g_list_remove_link(long /*int*/ list, long /*int*/ link);

13109

+public static final long /*int*/ g_list_remove_link(long /*int*/ list, long /*int*/ link) {

13110

lock.lock();

13111

try {

13112

return _g_list_remove_link(list, link);

13113

@@ -2150,8 +2150,8 @@

13114

}

13115

}

13116

/** @param list cast=(GList *) */

13117

-public static final native int /*long*/ _g_list_reverse(int /*long*/ list);

13118

-public static final int /*long*/ g_list_reverse(int /*long*/ list) {

13119

+public static final native long /*int*/ _g_list_reverse(long /*int*/ list);

13120

+public static final long /*int*/ g_list_reverse(long /*int*/ list) {

13121

lock.lock();

13122

try {

13123

return _g_list_reverse(list);

13124

@@ -2166,8 +2166,8 @@

13125

* @param bytes_written cast=(gsize *)

13126

* @param error cast=(GError **)

13127

*/

13128

-public static final native int /*long*/ _g_locale_from_utf8(int /*long*/ utf8string, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error);

13129

-public static final int /*long*/ g_locale_from_utf8(int /*long*/ utf8string, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error) {

13130

+public static final native long /*int*/ _g_locale_from_utf8(long /*int*/ utf8string, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error);

13131

+public static final long /*int*/ g_locale_from_utf8(long /*int*/ utf8string, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error) {

13132

lock.lock();

13133

try {

13134

return _g_locale_from_utf8(utf8string, len, bytes_read, bytes_written, error);

13135

@@ -2182,8 +2182,8 @@

13136

* @param bytes_written cast=(gsize *)

13137

* @param error cast=(GError **)

13138

*/

13139

-public static final native int /*long*/ _g_locale_to_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error);

13140

-public static final int /*long*/ g_locale_to_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error) {

13141

+public static final native long /*int*/ _g_locale_to_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error);

13142

+public static final long /*int*/ g_locale_to_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error) {

13143

lock.lock();

13144

try {

13145

return _g_locale_to_utf8(opsysstring, len, bytes_read, bytes_written, error);

13146

@@ -2197,8 +2197,8 @@

13147

* @param message cast=(gchar *)

13148

* @param unused_data cast=(gpointer)

13149

*/

13150

-public static final native void _g_log_default_handler(int /*long*/ log_domain, int log_levels, int /*long*/ message, int /*long*/ unused_data);

13151

-public static final void g_log_default_handler(int /*long*/ log_domain, int log_levels, int /*long*/ message, int /*long*/ unused_data) {

13152

+public static final native void _g_log_default_handler(long /*int*/ log_domain, int log_levels, long /*int*/ message, long /*int*/ unused_data);

13153

+public static final void g_log_default_handler(long /*int*/ log_domain, int log_levels, long /*int*/ message, long /*int*/ unused_data) {

13154

lock.lock();

13155

try {

13156

_g_log_default_handler(log_domain, log_levels, message, unused_data);

13157

@@ -2225,8 +2225,8 @@

13158

* @param log_func cast=(GLogFunc)

13159

* @param user_data cast=(gpointer)

13160

*/

13161

-public static final native int _g_log_set_handler(byte[] log_domain, int log_levels, int /*long*/ log_func, int /*long*/ user_data);

13162

-public static final int g_log_set_handler(byte[] log_domain, int log_levels, int /*long*/ log_func, int /*long*/ user_data) {

13163

+public static final native int _g_log_set_handler(byte[] log_domain, int log_levels, long /*int*/ log_func, long /*int*/ user_data);

13164

+public static final int g_log_set_handler(byte[] log_domain, int log_levels, long /*int*/ log_func, long /*int*/ user_data) {

13165

lock.lock();

13166

try {

13167

return _g_log_set_handler(log_domain, log_levels, log_func, user_data);

13168

@@ -2235,8 +2235,8 @@

13169

}

13170

}

13171

/** @param size cast=(gulong) */

13172

-public static final native int /*long*/ _g_malloc(int /*long*/ size);

13173

-public static final int /*long*/ g_malloc(int /*long*/ size) {

13174

+public static final native long /*int*/ _g_malloc(long /*int*/ size);

13175

+public static final long /*int*/ g_malloc(long /*int*/ size) {

13176

lock.lock();

13177

try {

13178

return _g_malloc(size);

13179

@@ -2249,8 +2249,8 @@

13180

* @param first_property_name cast=(const gchar *),flags=no_out

13181

* @param terminator cast=(const gchar *),flags=sentinel

13182

*/

13183

-public static final native void _g_object_get(int /*long*/ object, byte[] first_property_name, int[] value, int /*long*/ terminator);

13184

-public static final void g_object_get(int /*long*/ object, byte[] first_property_name, int[] value, int /*long*/ terminator) {

13185

+public static final native void _g_object_get(long /*int*/ object, byte[] first_property_name, int[] value, long /*int*/ terminator);

13186

+public static final void g_object_get(long /*int*/ object, byte[] first_property_name, int[] value, long /*int*/ terminator) {

13187

lock.lock();

13188

try {

13189

_g_object_get(object, first_property_name, value, terminator);

13190

@@ -2262,8 +2262,8 @@

13191

* @param object cast=(GObject *)

13192

* @param quark cast=(GQuark)

13193

*/

13194

-public static final native int /*long*/ _g_object_get_qdata(int /*long*/ object, int quark);

13195

-public static final int /*long*/ g_object_get_qdata(int /*long*/ object, int quark) {

13196

+public static final native long /*int*/ _g_object_get_qdata(long /*int*/ object, int quark);

13197

+public static final long /*int*/ g_object_get_qdata(long /*int*/ object, int quark) {

13198

lock.lock();

13199

try {

13200

return _g_object_get_qdata(object, quark);

13201

@@ -2275,8 +2275,8 @@

13202

* @param type cast=(GType)

13203

* @param first_property_name cast=(const gchar *)

13204

*/

13205

-public static final native int /*long*/ _g_object_new (int /*long*/ type, int /*long*/ first_property_name);

13206

-public static final int /*long*/ g_object_new (int /*long*/ type, int /*long*/ first_property_name) {

13207

+public static final native long /*int*/ _g_object_new (long /*int*/ type, long /*int*/ first_property_name);

13208

+public static final long /*int*/ g_object_new (long /*int*/ type, long /*int*/ first_property_name) {

13209

lock.lock();

13210

try {

13211

return _g_object_new(type, first_property_name);

13212

@@ -2288,8 +2288,8 @@

13213

* @param object cast=(GObject *)

13214

* @param property_name cast=(const gchar *)

13215

*/

13216

-public static final native void _g_object_notify (int /*long*/ object, byte[] property_name);

13217

-public static final void g_object_notify (int /*long*/ object, byte[] property_name) {

13218

+public static final native void _g_object_notify (long /*int*/ object, byte[] property_name);

13219

+public static final void g_object_notify (long /*int*/ object, byte[] property_name) {

13220

lock.lock();

13221

try {

13222

_g_object_notify(object, property_name);

13223

@@ -2298,8 +2298,8 @@

13224

}

13225

}

13226

/** @param object cast=(gpointer) */

13227

-public static final native int /*long*/ _g_object_ref(int /*long*/ object);

13228

-public static final int /*long*/ g_object_ref(int /*long*/ object) {

13229

+public static final native long /*int*/ _g_object_ref(long /*int*/ object);

13230

+public static final long /*int*/ g_object_ref(long /*int*/ object) {

13231

lock.lock();

13232

try {

13233

return _g_object_ref(object);

13234

@@ -2312,8 +2312,8 @@

13235

* @param first_property_name cast=(const gchar *),flags=no_out

13236

* @param terminator cast=(const gchar *),flags=sentinel

13237

*/

13238

-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, boolean data, int /*long*/ terminator);

13239

-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, boolean data, int /*long*/ terminator) {

13240

+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, boolean data, long /*int*/ terminator);

13241

+public static final void g_object_set(long /*int*/ object, byte[] first_property_name, boolean data, long /*int*/ terminator) {

13242

lock.lock();

13243

try {

13244

_g_object_set(object, first_property_name, data, terminator);

13245

@@ -2326,8 +2326,8 @@

13246

* @param first_property_name cast=(const gchar *)

13247

* @param terminator cast=(const gchar *),flags=sentinel

13248

*/

13249

-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, GdkColor data, int /*long*/ terminator);

13250

-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, GdkColor data, int /*long*/ terminator) {

13251

+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, GdkColor data, long /*int*/ terminator);

13252

+public static final void g_object_set(long /*int*/ object, byte[] first_property_name, GdkColor data, long /*int*/ terminator) {

13253

lock.lock();

13254

try {

13255

_g_object_set(object, first_property_name, data, terminator);

13256

@@ -2340,8 +2340,8 @@

13257

* @param first_property_name cast=(const gchar *),flags=no_out

13258

* @param terminator cast=(const gchar *),flags=sentinel

13259

*/

13260

-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, int data, int /*long*/ terminator);

13261

-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, int data, int /*long*/ terminator) {

13262

+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, int data, long /*int*/ terminator);

13263

+public static final void g_object_set(long /*int*/ object, byte[] first_property_name, int data, long /*int*/ terminator) {

13264

lock.lock();

13265

try {

13266

_g_object_set(object, first_property_name, data, terminator);

13267

@@ -2354,8 +2354,8 @@

13268

* @param first_property_name cast=(const gchar *),flags=no_out

13269

* @param terminator cast=(const gchar *),flags=sentinel

13270

*/

13271

-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, float data, int /*long*/ terminator);

13272

-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, float data, int /*long*/ terminator) {

13273

+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, float data, long /*int*/ terminator);

13274

+public static final void g_object_set(long /*int*/ object, byte[] first_property_name, float data, long /*int*/ terminator) {

13275

lock.lock();

13276

try {

13277

_g_object_set(object, first_property_name, data, terminator);

13278

@@ -2368,8 +2368,8 @@

13279

* @param first_property_name cast=(const gchar *),flags=no_out

13280

* @param terminator cast=(const gchar *),flags=sentinel

13281

*/

13282

-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, long data, int /*long*/ terminator);

13283

-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, long data, int /*long*/ terminator) {

13284

+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, long data, long /*int*/ terminator);

13285

+public static final void g_object_set(long /*int*/ object, byte[] first_property_name, long data, long /*int*/ terminator) {

13286

lock.lock();

13287

try {

13288

_g_object_set(object, first_property_name, data, terminator);

13289

@@ -2382,8 +2382,8 @@

13290

* @param quark cast=(GQuark)

13291

* @param data cast=(gpointer)

13292

*/

13293

-public static final native void _g_object_set_qdata(int /*long*/ object, int quark, int /*long*/ data);

13294

-public static final void g_object_set_qdata(int /*long*/ object, int quark, int /*long*/ data) {

13295

+public static final native void _g_object_set_qdata(long /*int*/ object, int quark, long /*int*/ data);

13296

+public static final void g_object_set_qdata(long /*int*/ object, int quark, long /*int*/ data) {

13297

lock.lock();

13298

try {

13299

_g_object_set_qdata(object, quark, data);

13300

@@ -2392,8 +2392,8 @@

13301

}

13302

}

13303

/** @param object cast=(gpointer) */

13304

-public static final native void _g_object_unref(int /*long*/ object);

13305

-public static final void g_object_unref(int /*long*/ object) {

13306

+public static final native void _g_object_unref(long /*int*/ object);

13307

+public static final void g_object_unref(long /*int*/ object) {

13308

lock.lock();

13309

try {

13310

_g_object_unref(object);

13311

@@ -2427,8 +2427,8 @@

13312

* @param proc cast=(GCallback)

13313

* @param data cast=(gpointer)

13314

*/

13315

-public static final native int _g_signal_connect(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data);

13316

-public static final int g_signal_connect(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data) {

13317

+public static final native int _g_signal_connect(long /*int*/ instance, byte[] detailed_signal, long /*int*/ proc, long /*int*/ data);

13318

+public static final int g_signal_connect(long /*int*/ instance, byte[] detailed_signal, long /*int*/ proc, long /*int*/ data) {

13319

lock.lock();

13320

try {

13321

return _g_signal_connect(instance, detailed_signal, proc, data);

13322

@@ -2442,8 +2442,8 @@

13323

* @param closure cast=(GClosure *)

13324

* @param after cast=(gboolean)

13325

*/

13326

-public static final native int _g_signal_connect_closure(int /*long*/ instance, byte[] detailed_signal, int /*long*/ closure, boolean after);

13327

-public static final int g_signal_connect_closure(int /*long*/ instance, byte[] detailed_signal, int /*long*/ closure, boolean after) {

13328

+public static final native int _g_signal_connect_closure(long /*int*/ instance, byte[] detailed_signal, long /*int*/ closure, boolean after);

13329

+public static final int g_signal_connect_closure(long /*int*/ instance, byte[] detailed_signal, long /*int*/ closure, boolean after) {

13330

lock.lock();

13331

try {

13332

return _g_signal_connect_closure(instance, detailed_signal, closure, after);

13333

@@ -2458,8 +2458,8 @@

13334

* @param closure cast=(GClosure *)

13335

* @param after cast=(gboolean)

13336

*/

13337

-public static final native int _g_signal_connect_closure_by_id(int /*long*/ instance, int signal_id, int detail, int /*long*/ closure, boolean after);

13338

-public static final int g_signal_connect_closure_by_id(int /*long*/ instance, int signal_id, int detail, int /*long*/ closure, boolean after) {

13339

+public static final native int _g_signal_connect_closure_by_id(long /*int*/ instance, int signal_id, int detail, long /*int*/ closure, boolean after);

13340

+public static final int g_signal_connect_closure_by_id(long /*int*/ instance, int signal_id, int detail, long /*int*/ closure, boolean after) {

13341

lock.lock();

13342

try {

13343

return _g_signal_connect_closure_by_id(instance, signal_id, detail, closure, after);

13344

@@ -2473,8 +2473,8 @@

13345

* @param proc cast=(GCallback)

13346

* @param data cast=(gpointer)

13347

*/

13348

-public static final native int _g_signal_connect_after(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data);

13349

-public static final int g_signal_connect_after(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data) {

13350

+public static final native int _g_signal_connect_after(long /*int*/ instance, byte[] detailed_signal, long /*int*/ proc, long /*int*/ data);

13351

+public static final int g_signal_connect_after(long /*int*/ instance, byte[] detailed_signal, long /*int*/ proc, long /*int*/ data) {

13352

lock.lock();

13353

try {

13354

return _g_signal_connect_after(instance, detailed_signal, proc, data);

13355

@@ -2486,8 +2486,8 @@

13356

* @param instance cast=(gpointer)

13357

* @param detailed_signal cast=(const gchar *),flags=no_out

13358

*/

13359

-public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal);

13360

-public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal) {

13361

+public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal);

13362

+public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal) {

13363

lock.lock();

13364

try {

13365

_g_signal_emit_by_name(instance, detailed_signal);

13366

@@ -2499,8 +2499,8 @@

13367

* @param instance cast=(gpointer)

13368

* @param detailed_signal cast=(const gchar *),flags=no_out

13369

*/

13370

-public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data);

13371

-public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data) {

13372

+public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data);

13373

+public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data) {

13374

lock.lock();

13375

try {

13376

_g_signal_emit_by_name(instance, detailed_signal, data);

13377

@@ -2512,8 +2512,8 @@

13378

* @param instance cast=(gpointer)

13379

* @param detailed_signal cast=(const gchar *),flags=no_out

13380

*/

13381

-public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data1, int /*long*/ data2);

13382

-public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data1, int /*long*/ data2) {

13383

+public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data1, long /*int*/ data2);

13384

+public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data1, long /*int*/ data2) {

13385

lock.lock();

13386

try {

13387

_g_signal_emit_by_name(instance, detailed_signal, data1, data2);

13388

@@ -2525,8 +2525,8 @@

13389

* @param instance cast=(gpointer)

13390

* @param detailed_signal cast=(const gchar *),flags=no_out

13391

*/

13392

-public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, byte [] data);

13393

-public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, byte [] data) {

13394

+public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, byte [] data);

13395

+public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, byte [] data) {

13396

lock.lock();

13397

try {

13398

_g_signal_emit_by_name(instance, detailed_signal, data);

13399

@@ -2538,8 +2538,8 @@

13400

* @param instance cast=(gpointer)

13401

* @param handler_id cast=(gulong)

13402

*/

13403

-public static final native void _g_signal_handler_disconnect(int /*long*/ instance, int handler_id);

13404

-public static final void g_signal_handler_disconnect(int /*long*/ instance, int handler_id) {

13405

+public static final native void _g_signal_handler_disconnect(long /*int*/ instance, int handler_id);

13406

+public static final void g_signal_handler_disconnect(long /*int*/ instance, int handler_id) {

13407

lock.lock();

13408

try {

13409

_g_signal_handler_disconnect(instance, handler_id);

13410

@@ -2556,8 +2556,8 @@

13411

* @param func cast=(gpointer)

13412

* @param data cast=(gpointer)

13413

*/

13414

-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);

13415

-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) {

13416

+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);

13417

+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) {

13418

lock.lock();

13419

try {

13420

return _g_signal_handlers_block_matched(instance, mask, signal_id, detail, closure, func, data);

13421

@@ -2574,8 +2574,8 @@

13422

* @param func cast=(gpointer)

13423

* @param data cast=(gpointer)

13424

*/

13425

-public static final native int _g_signal_handlers_disconnect_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data);

13426

-public static final int g_signal_handlers_disconnect_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data) {

13427

+public static final native int _g_signal_handlers_disconnect_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data);

13428

+public static final int g_signal_handlers_disconnect_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data) {

13429

lock.lock();

13430

try {

13431

return _g_signal_handlers_disconnect_matched(instance, mask, signal_id, detail, closure, func, data);

13432

@@ -2592,8 +2592,8 @@

13433

* @param func cast=(gpointer)

13434

* @param data cast=(gpointer)

13435

*/

13436

-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);

13437

-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) {

13438

+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);

13439

+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) {

13440

lock.lock();

13441

try {

13442

return _g_signal_handlers_unblock_matched(instance, mask, signal_id, detail, closure, func, data);

13443

@@ -2602,8 +2602,8 @@

13444

}

13445

}

13446

/** @param name cast=(const gchar *),flags=no_out */

13447

-public static final native int _g_signal_lookup (byte[] name, int /*long*/ itype);

13448

-public static final int g_signal_lookup (byte[] name, int /*long*/ itype) {

13449

+public static final native int _g_signal_lookup (byte[] name, long /*int*/ itype);

13450

+public static final int g_signal_lookup (byte[] name, long /*int*/ itype) {

13451

lock.lock();

13452

try {

13453

return _g_signal_lookup(name, itype);

13454

@@ -2615,8 +2615,8 @@

13455

* @param instance cast=(gpointer)

13456

* @param detailed_signal cast=(const gchar *),flags=no_out

13457

*/

13458

-public static final native void _g_signal_stop_emission_by_name(int /*long*/ instance, byte[] detailed_signal);

13459

-public static final void g_signal_stop_emission_by_name(int /*long*/ instance, byte[] detailed_signal) {

13460

+public static final native void _g_signal_stop_emission_by_name(long /*int*/ instance, byte[] detailed_signal);

13461

+public static final void g_signal_stop_emission_by_name(long /*int*/ instance, byte[] detailed_signal) {

13462

lock.lock();

13463

try {

13464

_g_signal_stop_emission_by_name(instance, detailed_signal);

13465

@@ -2625,8 +2625,8 @@

13466

}

13467

}

13468

/** @param tag cast=(guint) */

13469

-public static final native boolean /*long*/ _g_source_remove (int /*long*/ tag);

13470

-public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {

13471

+public static final native boolean /*long*/ _g_source_remove (long /*int*/ tag);

13472

+public static final boolean /*long*/ g_source_remove (long /*int*/ tag) {

13473

lock.lock();

13474

try {

13475

return _g_source_remove(tag);

13476

@@ -2635,8 +2635,8 @@

13477

}

13478

}

13479

/** @param list cast=(GSList *) */

13480

-public static final native int /*long*/ _g_slist_data (int /*long*/ list);

13481

-public static final int /*long*/ g_slist_data (int /*long*/ list) {

13482

+public static final native long /*int*/ _g_slist_data (long /*int*/ list);

13483

+public static final long /*int*/ g_slist_data (long /*int*/ list) {

13484

lock.lock();

13485

try {

13486

return _g_slist_data(list);

13487

@@ -2645,8 +2645,8 @@

13488

}

13489

}

13490

/** @param list cast=(GSList *) */

13491

-public static final native void _g_slist_free (int /*long*/ list);

13492

-public static final void g_slist_free (int /*long*/ list) {

13493

+public static final native void _g_slist_free (long /*int*/ list);

13494

+public static final void g_slist_free (long /*int*/ list) {

13495

lock.lock();

13496

try {

13497

_g_slist_free(list);

13498

@@ -2655,8 +2655,8 @@

13499

}

13500

}

13501

/** @param list cast=(GSList *) */

13502

-public static final native int /*long*/ _g_slist_next (int /*long*/ list);

13503

-public static final int /*long*/ g_slist_next (int /*long*/ list) {

13504

+public static final native long /*int*/ _g_slist_next (long /*int*/ list);

13505

+public static final long /*int*/ g_slist_next (long /*int*/ list) {

13506

lock.lock();

13507

try {

13508

return _g_slist_next(list);

13509

@@ -2665,8 +2665,8 @@

13510

}

13511

}

13512

/** @param list cast=(GSList *) */

13513

-public static final native int _g_slist_length (int /*long*/ list);

13514

-public static final int g_slist_length (int /*long*/ list) {

13515

+public static final native int _g_slist_length (long /*int*/ list);

13516

+public static final int g_slist_length (long /*int*/ list) {

13517

lock.lock();

13518

try {

13519

return _g_slist_length(list);

13520

@@ -2675,8 +2675,8 @@

13521

}

13522

}

13523

/** @param string_array cast=(gchar **) */

13524

-public static final native void _g_strfreev(int /*long*/ string_array);

13525

-public static final void g_strfreev(int /*long*/ string_array) {

13526

+public static final native void _g_strfreev(long /*int*/ string_array);

13527

+public static final void g_strfreev(long /*int*/ string_array) {

13528

lock.lock();

13529

try {

13530

_g_strfreev(string_array);

13531

@@ -2688,8 +2688,8 @@

13532

* @param str cast=(const gchar *)

13533

* @param endptr cast=(gchar **)

13534

*/

13535

-public static final native double _g_strtod(int /*long*/ str, int /*long*/[] endptr);

13536

-public static final double g_strtod(int /*long*/ str, int /*long*/[] endptr) {

13537

+public static final native double _g_strtod(long /*int*/ str, long /*int*/[] endptr);

13538

+public static final double g_strtod(long /*int*/ str, long /*int*/[] endptr) {

13539

lock.lock();

13540

try {

13541

return _g_strtod(str, endptr);

13542

@@ -2702,8 +2702,8 @@

13543

* @param interface_type cast=(GType)

13544

* @param info cast=(const GInterfaceInfo *)

13545

*/

13546

-public static final native void _g_type_add_interface_static (int /*long*/ instance_type, int /*long*/ interface_type, int /*long*/ info);

13547

-public static final void g_type_add_interface_static (int /*long*/ instance_type, int /*long*/ interface_type, int /*long*/ info) {

13548

+public static final native void _g_type_add_interface_static (long /*int*/ instance_type, long /*int*/ interface_type, long /*int*/ info);

13549

+public static final void g_type_add_interface_static (long /*int*/ instance_type, long /*int*/ interface_type, long /*int*/ info) {

13550

lock.lock();

13551

try {

13552

_g_type_add_interface_static(instance_type, interface_type, info);

13553

@@ -2712,8 +2712,8 @@

13554

}

13555

}

13556

/** @param g_class cast=(GType) */

13557

-public static final native int /*long*/ _g_type_class_peek (int /*long*/ g_class);

13558

-public static final int /*long*/ g_type_class_peek (int /*long*/ g_class) {

13559

+public static final native long /*int*/ _g_type_class_peek (long /*int*/ g_class);

13560

+public static final long /*int*/ g_type_class_peek (long /*int*/ g_class) {

13561

lock.lock();

13562

try {

13563

return _g_type_class_peek(g_class);

13564

@@ -2722,8 +2722,8 @@

13565

}

13566

}

13567

/** @param g_class cast=(gpointer) */

13568

-public static final native int /*long*/ _g_type_class_peek_parent (int /*long*/ g_class);

13569

-public static final int /*long*/ g_type_class_peek_parent (int /*long*/ g_class) {

13570

+public static final native long /*int*/ _g_type_class_peek_parent (long /*int*/ g_class);

13571

+public static final long /*int*/ g_type_class_peek_parent (long /*int*/ g_class) {

13572

lock.lock();

13573

try {

13574

return _g_type_class_peek_parent(g_class);

13575

@@ -2732,8 +2732,8 @@

13576

}

13577

}

13578

/** @param g_class cast=(GType) */

13579

-public static final native int /*long*/ _g_type_class_ref (int /*long*/ g_class);

13580

-public static final int /*long*/ g_type_class_ref (int /*long*/ g_class) {

13581

+public static final native long /*int*/ _g_type_class_ref (long /*int*/ g_class);

13582

+public static final long /*int*/ g_type_class_ref (long /*int*/ g_class) {

13583

lock.lock();

13584

try {

13585

return _g_type_class_ref(g_class);

13586

@@ -2742,8 +2742,8 @@

13587

}

13588

}

13589

/** @param g_class cast=(gpointer) */

13590

-public static final native void _g_type_class_unref (int /*long*/ g_class);

13591

-public static final void g_type_class_unref (int /*long*/ g_class) {

13592

+public static final native void _g_type_class_unref (long /*int*/ g_class);

13593

+public static final void g_type_class_unref (long /*int*/ g_class) {

13594

lock.lock();

13595

try {

13596

_g_type_class_unref(g_class);

13597

@@ -2752,8 +2752,8 @@

13598

}

13599

}

13600

/** @param name cast=(const gchar *) */

13601

-public static final native int /*long*/ _g_type_from_name (byte[] name);

13602

-public static final int /*long*/ g_type_from_name (byte[] name) {

13603

+public static final native long /*int*/ _g_type_from_name (byte[] name);

13604

+public static final long /*int*/ g_type_from_name (byte[] name) {

13605

lock.lock();

13606

try {

13607

return _g_type_from_name(name);

13608

@@ -2762,8 +2762,8 @@

13609

}

13610

}

13611

/** @param iface cast=(gpointer) */

13612

-public static final native int /*long*/ _g_type_interface_peek_parent (int /*long*/ iface);

13613

-public static final int /*long*/ g_type_interface_peek_parent (int /*long*/ iface) {

13614

+public static final native long /*int*/ _g_type_interface_peek_parent (long /*int*/ iface);

13615

+public static final long /*int*/ g_type_interface_peek_parent (long /*int*/ iface) {

13616

lock.lock();

13617

try {

13618

return _g_type_interface_peek_parent(iface);

13619

@@ -2775,8 +2775,8 @@

13620

* @param type cast=(GType)

13621

* @param is_a_type cast=(GType)

13622

*/

13623

-public static final native boolean _g_type_is_a (int /*long*/ type, int /*long*/ is_a_type);

13624

-public static final boolean g_type_is_a (int /*long*/ type, int /*long*/ is_a_type) {

13625

+public static final native boolean _g_type_is_a (long /*int*/ type, long /*int*/ is_a_type);

13626

+public static final boolean g_type_is_a (long /*int*/ type, long /*int*/ is_a_type) {

13627

lock.lock();

13628

try {

13629

return _g_type_is_a(type, is_a_type);

13630

@@ -2785,8 +2785,8 @@

13631

}

13632

}

13633

/** @param handle cast=(GType) */

13634

-public static final native int /*long*/ _g_type_name (int /*long*/ handle);

13635

-public static final int /*long*/ g_type_name (int /*long*/ handle) {

13636

+public static final native long /*int*/ _g_type_name (long /*int*/ handle);

13637

+public static final long /*int*/ g_type_name (long /*int*/ handle) {

13638

lock.lock();

13639

try {

13640

return _g_type_name(handle);

13641

@@ -2795,8 +2795,8 @@

13642

}

13643

}

13644

/** @param type cast=(GType) */

13645

-public static final native int /*long*/ _g_type_parent (int /*long*/ type);

13646

-public static final int /*long*/ g_type_parent (int /*long*/ type) {

13647

+public static final native long /*int*/ _g_type_parent (long /*int*/ type);

13648

+public static final long /*int*/ g_type_parent (long /*int*/ type) {

13649

lock.lock();

13650

try {

13651

return _g_type_parent(type);

13652

@@ -2808,8 +2808,8 @@

13653

* @param type cast=(GType)

13654

* @param query cast=(GTypeQuery *)

13655

*/

13656

-public static final native void _g_type_query (int /*long*/ type, int /*long*/ query);

13657

-public static final void g_type_query (int /*long*/ type, int /*long*/ query) {

13658

+public static final native void _g_type_query (long /*int*/ type, long /*int*/ query);

13659

+public static final void g_type_query (long /*int*/ type, long /*int*/ query) {

13660

lock.lock();

13661

try {

13662

_g_type_query(type, query);

13663

@@ -2823,8 +2823,8 @@

13664

* @param info cast=(const GTypeInfo *)

13665

* @param flags cast=(GTypeFlags)

13666

*/

13667

-public static final native int /*long*/ _g_type_register_static (int /*long*/ parent_type, byte[] type_name, int /*long*/ info, int flags);

13668

-public static final int /*long*/ g_type_register_static (int /*long*/ parent_type, byte[] type_name, int /*long*/ info, int flags) {

13669

+public static final native long /*int*/ _g_type_register_static (long /*int*/ parent_type, byte[] type_name, long /*int*/ info, int flags);

13670

+public static final long /*int*/ g_type_register_static (long /*int*/ parent_type, byte[] type_name, long /*int*/ info, int flags) {

13671

lock.lock();

13672

try {

13673

return _g_type_register_static(parent_type, type_name, info, flags);

13674

@@ -2833,8 +2833,8 @@

13675

}

13676

}

13677

/** @param vtable cast=(GThreadFunctions *) */

13678

-public static final native void _g_thread_init(int /*long*/ vtable);

13679

-public static final void g_thread_init(int /*long*/ vtable) {

13680

+public static final native void _g_thread_init(long /*int*/ vtable);

13681

+public static final void g_thread_init(long /*int*/ vtable) {

13682

lock.lock();

13683

try {

13684

_g_thread_init(vtable);

13685

@@ -2858,8 +2858,8 @@

13686

* @param items_written cast=(glong *),flags=critical

13687

* @param error cast=(GError **),flags=critical

13688

*/

13689

-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);

13690

-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) {

13691

+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);

13692

+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) {

13693

lock.lock();

13694

try {

13695

return _g_utf16_to_utf8(str, len, items_read, items_written, error);

13696

@@ -2868,8 +2868,8 @@

13697

}

13698

}

13699

/** @param str cast=(const gchar *) */

13700

-public static final native int /*long*/ _g_utf8_offset_to_pointer(int /*long*/ str, int /*long*/ offset);

13701

-public static final int /*long*/ g_utf8_offset_to_pointer(int /*long*/ str, int /*long*/ offset) {

13702

+public static final native long /*int*/ _g_utf8_offset_to_pointer(long /*int*/ str, long /*int*/ offset);

13703

+public static final long /*int*/ g_utf8_offset_to_pointer(long /*int*/ str, long /*int*/ offset) {

13704

lock.lock();

13705

try {

13706

return _g_utf8_offset_to_pointer(str, offset);

13707

@@ -2881,8 +2881,8 @@

13708

* @param str cast=(const gchar *)

13709

* @param pos cast=(const gchar *)

13710

*/

13711

-public static final native int /*long*/ _g_utf8_pointer_to_offset(int /*long*/ str, int /*long*/ pos);

13712

-public static final int /*long*/ g_utf8_pointer_to_offset(int /*long*/ str, int /*long*/ pos) {

13713

+public static final native long /*int*/ _g_utf8_pointer_to_offset(long /*int*/ str, long /*int*/ pos);

13714

+public static final long /*int*/ g_utf8_pointer_to_offset(long /*int*/ str, long /*int*/ pos) {

13715

lock.lock();

13716

try {

13717

return _g_utf8_pointer_to_offset(str, pos);

13718

@@ -2891,8 +2891,8 @@

13719

}

13720

}

13721

/** @param str cast=(const gchar *) */

13722

-public static final native int /*long*/ _g_utf8_strlen(int /*long*/ str, int /*long*/ max);

13723

-public static final int /*long*/ g_utf8_strlen(int /*long*/ str, int /*long*/ max) {

13724

+public static final native long /*int*/ _g_utf8_strlen(long /*int*/ str, long /*int*/ max);

13725

+public static final long /*int*/ g_utf8_strlen(long /*int*/ str, long /*int*/ max) {

13726

lock.lock();

13727

try {

13728

return _g_utf8_strlen(str, max);

13729

@@ -2907,8 +2907,8 @@

13730

* @param items_written cast=(glong *),flags=critical

13731

* @param error cast=(GError **),flags=critical

13732

*/

13733

-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);

13734

-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) {

13735

+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);

13736

+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) {

13737

lock.lock();

13738

try {

13739

return _g_utf8_to_utf16(str, len, items_read, items_written, error);

13740

@@ -2923,8 +2923,8 @@

13741

* @param items_written cast=(glong *),flags=critical

13742

* @param error cast=(GError **),flags=critical

13743

*/

13744

-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);

13745

-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) {

13746

+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);

13747

+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) {

13748

lock.lock();

13749

try {

13750

return _g_utf8_to_utf16(str, len, items_read, items_written, error);

13751

@@ -2933,8 +2933,8 @@

13752

}

13753

}

13754

/** @param value cast=(const GValue *) */

13755

-public static final native int /*long*/ _g_value_peek_pointer (int /*long*/ value);

13756

-public static final int /*long*/ g_value_peek_pointer (int /*long*/ value) {

13757

+public static final native long /*int*/ _g_value_peek_pointer (long /*int*/ value);

13758

+public static final long /*int*/ g_value_peek_pointer (long /*int*/ value) {

13759

lock.lock();

13760

try {

13761

return _g_value_peek_pointer(value);

13762

@@ -2943,8 +2943,8 @@

13763

}

13764

}

13765

/** @param atom_name cast=(const gchar *),flags=no_out critical */

13766

-public static final native int /*long*/ _gdk_atom_intern(byte[] atom_name, boolean only_if_exists);

13767

-public static final int /*long*/ gdk_atom_intern(byte[] atom_name, boolean only_if_exists) {

13768

+public static final native long /*int*/ _gdk_atom_intern(byte[] atom_name, boolean only_if_exists);

13769

+public static final long /*int*/ gdk_atom_intern(byte[] atom_name, boolean only_if_exists) {

13770

lock.lock();

13771

try {

13772

return _gdk_atom_intern(atom_name, only_if_exists);

13773

@@ -2953,8 +2953,8 @@

13774

}

13775

}

13776

/** @param atom cast=(GdkAtom) */

13777

-public static final native int /*long*/ _gdk_atom_name(int /*long*/ atom);

13778

-public static final int /*long*/ gdk_atom_name(int /*long*/ atom) {

13779

+public static final native long /*int*/ _gdk_atom_name(long /*int*/ atom);

13780

+public static final long /*int*/ gdk_atom_name(long /*int*/ atom) {

13781

lock.lock();

13782

try {

13783

return _gdk_atom_name(atom);

13784

@@ -2977,8 +2977,8 @@

13785

* @param width cast=(gint)

13786

* @param height cast=(gint)

13787

*/

13788

-public static final native int /*long*/ _gdk_bitmap_create_from_data(int /*long*/ window, byte[] data, int width, int height);

13789

-public static final int /*long*/ gdk_bitmap_create_from_data(int /*long*/ window, byte[] data, int width, int height) {

13790

+public static final native long /*int*/ _gdk_bitmap_create_from_data(long /*int*/ window, byte[] data, int width, int height);

13791

+public static final long /*int*/ gdk_bitmap_create_from_data(long /*int*/ window, byte[] data, int width, int height) {

13792

lock.lock();

13793

try {

13794

return _gdk_bitmap_create_from_data(window, data, width, height);

13795

@@ -2987,8 +2987,8 @@

13796

}

13797

}

13798

/** @method flags=dynamic */

13799

-public static final native int /*long*/ _gdk_cairo_create(int /*long*/ drawable);

13800

-public static final int /*long*/ gdk_cairo_create(int /*long*/ drawable) {

13801

+public static final native long /*int*/ _gdk_cairo_create(long /*int*/ drawable);

13802

+public static final long /*int*/ gdk_cairo_create(long /*int*/ drawable) {

13803

lock.lock();

13804

try {

13805

return _gdk_cairo_create(drawable);

13806

@@ -2997,8 +2997,8 @@

13807

}

13808

}

13809

/** @method flags=dynamic */

13810

-public static final native void _gdk_cairo_region(int /*long*/ cairo, int /*long*/ region);

13811

-public static final void gdk_cairo_region(int /*long*/ cairo, int /*long*/ region) {

13812

+public static final native void _gdk_cairo_region(long /*int*/ cairo, long /*int*/ region);

13813

+public static final void gdk_cairo_region(long /*int*/ cairo, long /*int*/ region) {

13814

lock.lock();

13815

try {

13816

_gdk_cairo_region(cairo, region);

13817

@@ -3007,8 +3007,8 @@

13818

}

13819

}

13820

/** @method flags=dynamic */

13821

-public static final native void _gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor color);

13822

-public static final void gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor color) {

13823

+public static final native void _gdk_cairo_set_source_color(long /*int*/ cairo, GdkColor color);

13824

+public static final void gdk_cairo_set_source_color(long /*int*/ cairo, GdkColor color) {

13825

lock.lock();

13826

try {

13827

_gdk_cairo_set_source_color(cairo, color);

13828

@@ -3020,8 +3020,8 @@

13829

* @param colormap cast=(GdkColormap *)

13830

* @param color cast=(GdkColor *),flags=no_in

13831

*/

13832

-public static final native boolean _gdk_color_white(int /*long*/ colormap, GdkColor color);

13833

-public static final boolean gdk_color_white(int /*long*/ colormap, GdkColor color) {

13834

+public static final native boolean _gdk_color_white(long /*int*/ colormap, GdkColor color);

13835

+public static final boolean gdk_color_white(long /*int*/ colormap, GdkColor color) {

13836

lock.lock();

13837

try {

13838

return _gdk_color_white(colormap, color);

13839

@@ -3035,8 +3035,8 @@

13840

* @param writeable cast=(gboolean)

13841

* @param best_match cast=(gboolean)

13842

*/

13843

-public static final native boolean _gdk_colormap_alloc_color(int /*long*/ colormap, GdkColor color, boolean writeable, boolean best_match);

13844

-public static final boolean gdk_colormap_alloc_color(int /*long*/ colormap, GdkColor color, boolean writeable, boolean best_match) {

13845

+public static final native boolean _gdk_colormap_alloc_color(long /*int*/ colormap, GdkColor color, boolean writeable, boolean best_match);

13846

+public static final boolean gdk_colormap_alloc_color(long /*int*/ colormap, GdkColor color, boolean writeable, boolean best_match) {

13847

lock.lock();

13848

try {

13849

return _gdk_colormap_alloc_color(colormap, color, writeable, best_match);

13850

@@ -3049,8 +3049,8 @@

13851

* @param colors cast=(GdkColor *),flags=no_out

13852

* @param ncolors cast=(gint)

13853

*/

13854

-public static final native void _gdk_colormap_free_colors(int /*long*/ colormap, GdkColor colors, int ncolors);

13855

-public static final void gdk_colormap_free_colors(int /*long*/ colormap, GdkColor colors, int ncolors) {

13856

+public static final native void _gdk_colormap_free_colors(long /*int*/ colormap, GdkColor colors, int ncolors);

13857

+public static final void gdk_colormap_free_colors(long /*int*/ colormap, GdkColor colors, int ncolors) {

13858

lock.lock();

13859

try {

13860

_gdk_colormap_free_colors(colormap, colors, ncolors);

13861

@@ -3058,8 +3058,8 @@

13862

lock.unlock();

13863

}

13864

}

13865

-public static final native int /*long*/ _gdk_colormap_get_system();

13866

-public static final int /*long*/ gdk_colormap_get_system() {

13867

+public static final native long /*int*/ _gdk_colormap_get_system();

13868

+public static final long /*int*/ gdk_colormap_get_system() {

13869

lock.lock();

13870

try {

13871

return _gdk_colormap_get_system();

13872

@@ -3072,8 +3072,8 @@

13873

* @param pixel cast=(gulong)

13874

* @param result cast=(GdkColor *)

13875

*/

13876

-public static final native void _gdk_colormap_query_color(int /*long*/ colormap, int /*long*/ pixel, GdkColor result);

13877

-public static final void gdk_colormap_query_color(int /*long*/ colormap, int /*long*/ pixel, GdkColor result) {

13878

+public static final native void _gdk_colormap_query_color(long /*int*/ colormap, long /*int*/ pixel, GdkColor result);

13879

+public static final void gdk_colormap_query_color(long /*int*/ colormap, long /*int*/ pixel, GdkColor result) {

13880

lock.lock();

13881

try {

13882

_gdk_colormap_query_color(colormap, pixel, result);

13883

@@ -3082,8 +3082,8 @@

13884

}

13885

}

13886

/** @param cursor cast=(GdkCursor *) */

13887

-public static final native void _gdk_cursor_destroy(int /*long*/ cursor);

13888

-public static final void gdk_cursor_destroy(int /*long*/ cursor) {

13889

+public static final native void _gdk_cursor_destroy(long /*int*/ cursor);

13890

+public static final void gdk_cursor_destroy(long /*int*/ cursor) {

13891

lock.lock();

13892

try {

13893

_gdk_cursor_destroy(cursor);

13894

@@ -3092,8 +3092,8 @@

13895

}

13896

}

13897

/** @param cursor_type cast=(GdkCursorType) */

13898

-public static final native int /*long*/ _gdk_cursor_new(int /*long*/ cursor_type);

13899

-public static final int /*long*/ gdk_cursor_new(int /*long*/ cursor_type) {

13900

+public static final native long /*int*/ _gdk_cursor_new(long /*int*/ cursor_type);

13901

+public static final long /*int*/ gdk_cursor_new(long /*int*/ cursor_type) {

13902

lock.lock();

13903

try {

13904

return _gdk_cursor_new(cursor_type);

13905

@@ -3109,8 +3109,8 @@

13906

* @param x cast=(gint)

13907

* @param y cast=(gint)

13908

*/

13909

-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);

13910

-public static final int /*long*/ gdk_cursor_new_from_pixmap(int /*long*/ source, int /*long*/ mask, GdkColor fg, GdkColor bg, int x, int y) {

13911

+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);

13912

+public static final long /*int*/ gdk_cursor_new_from_pixmap(long /*int*/ source, long /*int*/ mask, GdkColor fg, GdkColor bg, int x, int y) {

13913

lock.lock();

13914

try {

13915

return _gdk_cursor_new_from_pixmap(source, mask, fg, bg, x, y);

13916

@@ -3119,8 +3119,8 @@

13917

}

13918

}

13919

/** @method flags=dynamic */

13920

-public static final native int /*long*/ _gdk_cursor_new_from_pixbuf(int /*long*/ display, int /*long*/ pixbuf, int x, int y);

13921

-public static final int /*long*/ gdk_cursor_new_from_pixbuf(int /*long*/ display, int /*long*/ pixbuf, int x, int y) {

13922

+public static final native long /*int*/ _gdk_cursor_new_from_pixbuf(long /*int*/ display, long /*int*/ pixbuf, int x, int y);

13923

+public static final long /*int*/ gdk_cursor_new_from_pixbuf(long /*int*/ display, long /*int*/ pixbuf, int x, int y) {

13924

lock.lock();

13925

try {

13926

return _gdk_cursor_new_from_pixbuf(display, pixbuf, x, y);

13927

@@ -3129,8 +3129,8 @@

13928

}

13929

}

13930

/** @method flags=dynamic */

13931

-public static final native int /*long*/ _gdk_display_get_default();

13932

-public static final int /*long*/ gdk_display_get_default() {

13933

+public static final native long /*int*/ _gdk_display_get_default();

13934

+public static final long /*int*/ gdk_display_get_default() {

13935

lock.lock();

13936

try {

13937

return _gdk_display_get_default();

13938

@@ -3139,8 +3139,8 @@

13939

}

13940

}

13941

/** @method flags=dynamic */

13942

-public static final native boolean _gdk_display_supports_cursor_color(int /*long*/ display);

13943

-public static final boolean gdk_display_supports_cursor_color(int /*long*/ display) {

13944

+public static final native boolean _gdk_display_supports_cursor_color(long /*int*/ display);

13945

+public static final boolean gdk_display_supports_cursor_color(long /*int*/ display) {

13946

lock.lock();

13947

try {

13948

return _gdk_display_supports_cursor_color(display);

13949

@@ -3153,8 +3153,8 @@

13950

* @param action cast=(GdkDragAction)

13951

* @param time cast=(guint32)

13952

*/

13953

-public static final native void _gdk_drag_status(int /*long*/ context, int action, int time);

13954

-public static final void gdk_drag_status(int /*long*/ context, int action, int time) {

13955

+public static final native void _gdk_drag_status(long /*int*/ context, int action, int time);

13956

+public static final void gdk_drag_status(long /*int*/ context, int action, int time) {

13957

lock.lock();

13958

try {

13959

_gdk_drag_status(context, action, time);

13960

@@ -3173,8 +3173,8 @@

13961

* @param angle1 cast=(gint)

13962

* @param angle2 cast=(gint)

13963

*/

13964

-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);

13965

-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) {

13966

+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);

13967

+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) {

13968

lock.lock();

13969

try {

13970

_gdk_draw_arc(drawable, gc, filled, x, y, width, height, angle1, angle2);

13971

@@ -3193,8 +3193,8 @@

13972

* @param width cast=(gint)

13973

* @param height cast=(gint)

13974

*/

13975

-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);

13976

-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) {

13977

+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);

13978

+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) {

13979

lock.lock();

13980

try {

13981

_gdk_draw_drawable(drawable, gc, src, xsrc, ysrc, xdest, ydest, width, height);

13982

@@ -3207,8 +3207,8 @@

13983

* @param gc cast=(GdkGC *)

13984

* @param image cast=(GdkImage *)

13985

*/

13986

-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);

13987

-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) {

13988

+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);

13989

+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) {

13990

lock.lock();

13991

try {

13992

_gdk_draw_image(drawable, gc, image, xsrc, ysrc, xdest, ydest, width, height);

13993

@@ -3223,8 +3223,8 @@

13994

* @param y cast=(gint)

13995

* @param layout cast=(PangoLayout *)

13996

*/

13997

-public static final native void _gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc, int x, int y, int /*long*/ layout);

13998

-public static final void gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc, int x, int y, int /*long*/ layout) {

13999

+public static final native void _gdk_draw_layout(long /*int*/ drawable, long /*int*/ gc, int x, int y, long /*int*/ layout);

14000

+public static final void gdk_draw_layout(long /*int*/ drawable, long /*int*/ gc, int x, int y, long /*int*/ layout) {

14001

lock.lock();

14002

try {

14003

_gdk_draw_layout(drawable, gc, x, y, layout);

14004

@@ -3241,8 +3241,8 @@

14005

* @param foreground flags=no_out

14006

* @param background flags=no_out

14007

*/

14008

-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);

14009

-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) {

14010

+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);

14011

+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) {

14012

lock.lock();

14013

try {

14014

_gdk_draw_layout_with_colors(drawable, gc, x, y, layout, foreground, background);

14015

@@ -3258,8 +3258,8 @@

14016

* @param x2 cast=(gint)

14017

* @param y2 cast=(gint)

14018

*/

14019

-public static final native void _gdk_draw_line(int /*long*/ drawable, int /*long*/ gc, int x1, int y1, int x2, int y2);

14020

-public static final void gdk_draw_line(int /*long*/ drawable, int /*long*/ gc, int x1, int y1, int x2, int y2) {

14021

+public static final native void _gdk_draw_line(long /*int*/ drawable, long /*int*/ gc, int x1, int y1, int x2, int y2);

14022

+public static final void gdk_draw_line(long /*int*/ drawable, long /*int*/ gc, int x1, int y1, int x2, int y2) {

14023

lock.lock();

14024

try {

14025

_gdk_draw_line(drawable, gc, x1, y1, x2, y2);

14026

@@ -3273,8 +3273,8 @@

14027

* @param points cast=(GdkPoint *),flags=no_out critical

14028

* @param npoints cast=(gint)

14029

*/

14030

-public static final native void _gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc, int[] points, int npoints);

14031

-public static final void gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc, int[] points, int npoints) {

14032

+public static final native void _gdk_draw_lines(long /*int*/ drawable, long /*int*/ gc, int[] points, int npoints);

14033

+public static final void gdk_draw_lines(long /*int*/ drawable, long /*int*/ gc, int[] points, int npoints) {

14034

lock.lock();

14035

try {

14036

_gdk_draw_lines(drawable, gc, points, npoints);

14037

@@ -3297,8 +3297,8 @@

14038

* @param x_dither cast=(gint)

14039

* @param y_dither cast=(gint)

14040

*/

14041

-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);

14042

-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) {

14043

+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);

14044

+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) {

14045

lock.lock();

14046

try {

14047

_gdk_draw_pixbuf(drawable, gc, pixbuf, xsrc, ysrc, xdest, ydest, width, height, dither, x_dither, y_dither);

14048

@@ -3310,8 +3310,8 @@

14049

* @param drawable cast=(GdkDrawable *)

14050

* @param gc cast=(GdkGC *)

14051

*/

14052

-public static final native void _gdk_draw_point(int /*long*/ drawable, int /*long*/ gc, int x, int y);

14053

-public static final void gdk_draw_point(int /*long*/ drawable, int /*long*/ gc, int x, int y) {

14054

+public static final native void _gdk_draw_point(long /*int*/ drawable, long /*int*/ gc, int x, int y);

14055

+public static final void gdk_draw_point(long /*int*/ drawable, long /*int*/ gc, int x, int y) {

14056

lock.lock();

14057

try {

14058

_gdk_draw_point(drawable, gc, x, y);

14059

@@ -3326,8 +3326,8 @@

14060

* @param points cast=(GdkPoint *),flags=no_out critical

14061

* @param npoints cast=(gint)

14062

*/

14063

-public static final native void _gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc, int filled, int[] points, int npoints);

14064

-public static final void gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc, int filled, int[] points, int npoints) {

14065

+public static final native void _gdk_draw_polygon(long /*int*/ drawable, long /*int*/ gc, int filled, int[] points, int npoints);

14066

+public static final void gdk_draw_polygon(long /*int*/ drawable, long /*int*/ gc, int filled, int[] points, int npoints) {

14067

lock.lock();

14068

try {

14069

_gdk_draw_polygon(drawable, gc, filled, points, npoints);

14070

@@ -3344,8 +3344,8 @@

14071

* @param width cast=(gint)

14072

* @param height cast=(gint)

14073

*/

14074

-public static final native void _gdk_draw_rectangle(int /*long*/ drawable, int /*long*/ gc, int filled, int x, int y, int width, int height);

14075

-public static final void gdk_draw_rectangle(int /*long*/ drawable, int /*long*/ gc, int filled, int x, int y, int width, int height) {

14076

+public static final native void _gdk_draw_rectangle(long /*int*/ drawable, long /*int*/ gc, int filled, int x, int y, int width, int height);

14077

+public static final void gdk_draw_rectangle(long /*int*/ drawable, long /*int*/ gc, int filled, int x, int y, int width, int height) {

14078

lock.lock();

14079

try {

14080

_gdk_draw_rectangle(drawable, gc, filled, x, y, width, height);

14081

@@ -3354,8 +3354,8 @@

14082

}

14083

}

14084

/** @param drawable cast=(GdkDrawable *) */

14085

-public static final native int _gdk_drawable_get_depth(int /*long*/ drawable);

14086

-public static final int gdk_drawable_get_depth(int /*long*/ drawable) {

14087

+public static final native int _gdk_drawable_get_depth(long /*int*/ drawable);

14088

+public static final int gdk_drawable_get_depth(long /*int*/ drawable) {

14089

lock.lock();

14090

try {

14091

return _gdk_drawable_get_depth(drawable);

14092

@@ -3371,8 +3371,8 @@

14093

* @param width cast=(gint)

14094

* @param height cast=(gint)

14095

*/

14096

-public static final native int /*long*/ _gdk_drawable_get_image(int /*long*/ drawable, int x, int y, int width, int height);

14097

-public static final int /*long*/ gdk_drawable_get_image(int /*long*/ drawable, int x, int y, int width, int height) {

14098

+public static final native long /*int*/ _gdk_drawable_get_image(long /*int*/ drawable, int x, int y, int width, int height);

14099

+public static final long /*int*/ gdk_drawable_get_image(long /*int*/ drawable, int x, int y, int width, int height) {

14100

lock.lock();

14101

try {

14102

return _gdk_drawable_get_image(drawable, x, y, width, height);

14103

@@ -3385,8 +3385,8 @@

14104

* @param width cast=(gint *),flags=no_in critical

14105

* @param height cast=(gint *),flags=no_in critical

14106

*/

14107

-public static final native void _gdk_drawable_get_size(int /*long*/ drawable, int[] width, int[] height);

14108

-public static final void gdk_drawable_get_size(int /*long*/ drawable, int[] width, int[] height) {

14109

+public static final native void _gdk_drawable_get_size(long /*int*/ drawable, int[] width, int[] height);

14110

+public static final void gdk_drawable_get_size(long /*int*/ drawable, int[] width, int[] height) {

14111

lock.lock();

14112

try {

14113

_gdk_drawable_get_size(drawable, width, height);

14114

@@ -3395,8 +3395,8 @@

14115

}

14116

}

14117

/** @param drawable cast=(GdkDrawable *) */

14118

-public static final native int /*long*/ _gdk_drawable_get_visible_region(int /*long*/ drawable);

14119

-public static final int /*long*/ gdk_drawable_get_visible_region(int /*long*/ drawable) {

14120

+public static final native long /*int*/ _gdk_drawable_get_visible_region(long /*int*/ drawable);

14121

+public static final long /*int*/ gdk_drawable_get_visible_region(long /*int*/ drawable) {

14122

lock.lock();

14123

try {

14124

return _gdk_drawable_get_visible_region(drawable);

14125

@@ -3405,8 +3405,8 @@

14126

}

14127

}

14128

/** @param event cast=(GdkEvent *) */

14129

-public static final native int /*long*/ _gdk_event_copy(int /*long*/ event);

14130

-public static final int /*long*/ gdk_event_copy(int /*long*/ event) {

14131

+public static final native long /*int*/ _gdk_event_copy(long /*int*/ event);

14132

+public static final long /*int*/ gdk_event_copy(long /*int*/ event) {

14133

lock.lock();

14134

try {

14135

return _gdk_event_copy(event);

14136

@@ -3415,8 +3415,8 @@

14137

}

14138

}

14139

/** @param event cast=(GdkEvent *) */

14140

-public static final native void _gdk_event_free(int /*long*/ event);

14141

-public static final void gdk_event_free(int /*long*/ event) {

14142

+public static final native void _gdk_event_free(long /*int*/ event);

14143

+public static final void gdk_event_free(long /*int*/ event) {

14144

lock.lock();

14145

try {

14146

_gdk_event_free(event);

14147

@@ -3424,8 +3424,8 @@

14148

lock.unlock();

14149

}

14150

}

14151

-public static final native int /*long*/ _gdk_event_get();

14152

-public static final int /*long*/ gdk_event_get() {

14153

+public static final native long /*int*/ _gdk_event_get();

14154

+public static final long /*int*/ gdk_event_get() {

14155

lock.lock();

14156

try {

14157

return _gdk_event_get();

14158

@@ -3438,8 +3438,8 @@

14159

* @param px cast=(gdouble *)

14160

* @param py cast=(gdouble *)

14161

*/

14162

-public static final native boolean _gdk_event_get_root_coords(int /*long*/ event, double[] px, double[] py);

14163

-public static final boolean gdk_event_get_root_coords(int /*long*/ event, double[] px, double[] py) {

14164

+public static final native boolean _gdk_event_get_root_coords(long /*int*/ event, double[] px, double[] py);

14165

+public static final boolean gdk_event_get_root_coords(long /*int*/ event, double[] px, double[] py) {

14166

lock.lock();

14167

try {

14168

return _gdk_event_get_root_coords(event, px, py);

14169

@@ -3452,8 +3452,8 @@

14170

* @param px cast=(gdouble *)

14171

* @param py cast=(gdouble *)

14172

*/

14173

-public static final native boolean _gdk_event_get_coords(int /*long*/ event, double[] px, double[] py);

14174

-public static final boolean gdk_event_get_coords(int /*long*/ event, double[] px, double[] py) {

14175

+public static final native boolean _gdk_event_get_coords(long /*int*/ event, double[] px, double[] py);

14176

+public static final boolean gdk_event_get_coords(long /*int*/ event, double[] px, double[] py) {

14177

lock.lock();

14178

try {

14179

return _gdk_event_get_coords(event, px, py);

14180

@@ -3462,8 +3462,8 @@

14181

}

14182

}

14183

/** @param window cast=(GdkWindow *) */

14184

-public static final native int /*long*/ _gdk_event_get_graphics_expose(int /*long*/ window);

14185

-public static final int /*long*/ gdk_event_get_graphics_expose(int /*long*/ window) {

14186

+public static final native long /*int*/ _gdk_event_get_graphics_expose(long /*int*/ window);

14187

+public static final long /*int*/ gdk_event_get_graphics_expose(long /*int*/ window) {

14188

lock.lock();

14189

try {

14190

return _gdk_event_get_graphics_expose(window);

14191

@@ -3475,8 +3475,8 @@

14192

* @param event cast=(GdkEvent *)

14193

* @param pmod cast=(GdkModifierType *)

14194

*/

14195

-public static final native boolean _gdk_event_get_state(int /*long*/ event, int[] pmod);

14196

-public static final boolean gdk_event_get_state(int /*long*/ event, int[] pmod) {

14197

+public static final native boolean _gdk_event_get_state(long /*int*/ event, int[] pmod);

14198

+public static final boolean gdk_event_get_state(long /*int*/ event, int[] pmod) {

14199

lock.lock();

14200

try {

14201

return _gdk_event_get_state(event, pmod);

14202

@@ -3485,8 +3485,8 @@

14203

}

14204

}

14205

/** @param event cast=(GdkEvent *) */

14206

-public static final native int _gdk_event_get_time(int /*long*/ event);

14207

-public static final int gdk_event_get_time(int /*long*/ event) {

14208

+public static final native int _gdk_event_get_time(long /*int*/ event);

14209

+public static final int gdk_event_get_time(long /*int*/ event) {

14210

lock.lock();

14211

try {

14212

return _gdk_event_get_time(event);

14213

@@ -3499,8 +3499,8 @@

14214

* @param data cast=(gpointer)

14215

* @param notify cast=(GDestroyNotify)

14216

*/

14217

-public static final native void _gdk_event_handler_set(int /*long*/ func, int /*long*/ data, int /*long*/ notify);

14218

-public static final void gdk_event_handler_set(int /*long*/ func, int /*long*/ data, int /*long*/ notify) {

14219

+public static final native void _gdk_event_handler_set(long /*int*/ func, long /*int*/ data, long /*int*/ notify);

14220

+public static final void gdk_event_handler_set(long /*int*/ func, long /*int*/ data, long /*int*/ notify) {

14221

lock.lock();

14222

try {

14223

_gdk_event_handler_set(func, data, notify);

14224

@@ -3508,8 +3508,8 @@

14225

lock.unlock();

14226

}

14227

}

14228

-public static final native int /*long*/ _gdk_event_new(int type);

14229

-public static final int /*long*/ gdk_event_new(int type) {

14230

+public static final native long /*int*/ _gdk_event_new(int type);

14231

+public static final long /*int*/ gdk_event_new(int type) {

14232

lock.lock();

14233

try {

14234

return _gdk_event_new(type);

14235

@@ -3517,8 +3517,8 @@

14236

lock.unlock();

14237

}

14238

}

14239

-public static final native int /*long*/ _gdk_event_peek();

14240

-public static final int /*long*/ gdk_event_peek() {

14241

+public static final native long /*int*/ _gdk_event_peek();

14242

+public static final long /*int*/ gdk_event_peek() {

14243

lock.lock();

14244

try {

14245

return _gdk_event_peek();

14246

@@ -3527,8 +3527,8 @@

14247

}

14248

}

14249

/** @param event cast=(GdkEvent *) */

14250

-public static final native void _gdk_event_put(int /*long*/ event);

14251

-public static final void gdk_event_put(int /*long*/ event) {

14252

+public static final native void _gdk_event_put(long /*int*/ event);

14253

+public static final void gdk_event_put(long /*int*/ event) {

14254

lock.lock();

14255

try {

14256

_gdk_event_put(event);

14257

@@ -3564,8 +3564,8 @@

14258

}

14259

}

14260

/** @param list cast=(gchar **) */

14261

-public static final native void _gdk_free_text_list(int /*long*/ list);

14262

-public static final void gdk_free_text_list(int /*long*/ list) {

14263

+public static final native void _gdk_free_text_list(long /*int*/ list);

14264

+public static final void gdk_free_text_list(long /*int*/ list) {

14265

lock.lock();

14266

try {

14267

_gdk_free_text_list(list);

14268

@@ -3577,8 +3577,8 @@

14269

* @param gc cast=(GdkGC *)

14270

* @param values cast=(GdkGCValues *),flags=no_in

14271

*/

14272

-public static final native void _gdk_gc_get_values(int /*long*/ gc, GdkGCValues values);

14273

-public static final void gdk_gc_get_values(int /*long*/ gc, GdkGCValues values) {

14274

+public static final native void _gdk_gc_get_values(long /*int*/ gc, GdkGCValues values);

14275

+public static final void gdk_gc_get_values(long /*int*/ gc, GdkGCValues values) {

14276

lock.lock();

14277

try {

14278

_gdk_gc_get_values(gc, values);

14279

@@ -3587,8 +3587,8 @@

14280

}

14281

}

14282

/** @param window cast=(GdkDrawable *) */

14283

-public static final native int /*long*/ _gdk_gc_new(int /*long*/ window);

14284

-public static final int /*long*/ gdk_gc_new(int /*long*/ window) {

14285

+public static final native long /*int*/ _gdk_gc_new(long /*int*/ window);

14286

+public static final long /*int*/ gdk_gc_new(long /*int*/ window) {

14287

lock.lock();

14288

try {

14289

return _gdk_gc_new(window);

14290

@@ -3600,8 +3600,8 @@

14291

* @param gc cast=(GdkGC *)

14292

* @param color cast=(GdkColor *),flags=no_out

14293

*/

14294

-public static final native void _gdk_gc_set_background(int /*long*/ gc, GdkColor color);

14295

-public static final void gdk_gc_set_background(int /*long*/ gc, GdkColor color) {

14296

+public static final native void _gdk_gc_set_background(long /*int*/ gc, GdkColor color);

14297

+public static final void gdk_gc_set_background(long /*int*/ gc, GdkColor color) {

14298

lock.lock();

14299

try {

14300

_gdk_gc_set_background(gc, color);

14301

@@ -3613,8 +3613,8 @@

14302

* @param gc cast=(GdkGC *)

14303

* @param mask cast=(GdkBitmap *)

14304

*/

14305

-public static final native void _gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask);

14306

-public static final void gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask) {

14307

+public static final native void _gdk_gc_set_clip_mask(long /*int*/ gc, long /*int*/ mask);

14308

+public static final void gdk_gc_set_clip_mask(long /*int*/ gc, long /*int*/ mask) {

14309

lock.lock();

14310

try {

14311

_gdk_gc_set_clip_mask(gc, mask);

14312

@@ -3627,8 +3627,8 @@

14313

* @param x cast=(gint)

14314

* @param y cast=(gint)

14315

*/

14316

-public static final native void _gdk_gc_set_clip_origin(int /*long*/ gc, int x, int y);

14317

-public static final void gdk_gc_set_clip_origin(int /*long*/ gc, int x, int y) {

14318

+public static final native void _gdk_gc_set_clip_origin(long /*int*/ gc, int x, int y);

14319

+public static final void gdk_gc_set_clip_origin(long /*int*/ gc, int x, int y) {

14320

lock.lock();

14321

try {

14322

_gdk_gc_set_clip_origin(gc, x, y);

14323

@@ -3640,8 +3640,8 @@

14324

* @param gc cast=(GdkGC *)

14325

* @param rectangle cast=(GdkRectangle *),flags=no_out

14326

*/

14327

-public static final native void _gdk_gc_set_clip_rectangle(int /*long*/ gc, GdkRectangle rectangle);

14328

-public static final void gdk_gc_set_clip_rectangle(int /*long*/ gc, GdkRectangle rectangle) {

14329

+public static final native void _gdk_gc_set_clip_rectangle(long /*int*/ gc, GdkRectangle rectangle);

14330

+public static final void gdk_gc_set_clip_rectangle(long /*int*/ gc, GdkRectangle rectangle) {

14331

lock.lock();

14332

try {

14333

_gdk_gc_set_clip_rectangle(gc, rectangle);

14334

@@ -3653,8 +3653,8 @@

14335

* @param gc cast=(GdkGC *)

14336

* @param region cast=(GdkRegion *)

14337

*/

14338

-public static final native void _gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ region);

14339

-public static final void gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ region) {

14340

+public static final native void _gdk_gc_set_clip_region(long /*int*/ gc, long /*int*/ region);

14341

+public static final void gdk_gc_set_clip_region(long /*int*/ gc, long /*int*/ region) {

14342

lock.lock();

14343

try {

14344

_gdk_gc_set_clip_region(gc, region);

14345

@@ -3668,8 +3668,8 @@

14346

* @param dash_list cast=(gint8 *),flags=no_out critical

14347

* @param n cast=(gint)

14348

*/

14349

-public static final native void _gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byte[] dash_list, int n);

14350

-public static final void gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byte[] dash_list, int n) {

14351

+public static final native void _gdk_gc_set_dashes(long /*int*/ gc, int dash_offset, byte[] dash_list, int n);

14352

+public static final void gdk_gc_set_dashes(long /*int*/ gc, int dash_offset, byte[] dash_list, int n) {

14353

lock.lock();

14354

try {

14355

_gdk_gc_set_dashes(gc, dash_offset, dash_list, n);

14356

@@ -3681,8 +3681,8 @@

14357

* @param gc cast=(GdkGC *)

14358

* @param exposures cast=(gboolean)

14359

*/

14360

-public static final native void _gdk_gc_set_exposures(int /*long*/ gc, boolean exposures);

14361

-public static final void gdk_gc_set_exposures(int /*long*/ gc, boolean exposures) {

14362

+public static final native void _gdk_gc_set_exposures(long /*int*/ gc, boolean exposures);

14363

+public static final void gdk_gc_set_exposures(long /*int*/ gc, boolean exposures) {

14364

lock.lock();

14365

try {

14366

_gdk_gc_set_exposures(gc, exposures);

14367

@@ -3694,8 +3694,8 @@

14368

* @param gc cast=(GdkGC *)

14369

* @param fill cast=(GdkFill)

14370

*/

14371

-public static final native void _gdk_gc_set_fill(int /*long*/ gc, int fill);

14372

-public static final void gdk_gc_set_fill(int /*long*/ gc, int fill) {

14373

+public static final native void _gdk_gc_set_fill(long /*int*/ gc, int fill);

14374

+public static final void gdk_gc_set_fill(long /*int*/ gc, int fill) {

14375

lock.lock();

14376

try {

14377

_gdk_gc_set_fill(gc, fill);

14378

@@ -3707,8 +3707,8 @@

14379

* @param gc cast=(GdkGC *)

14380

* @param color cast=(GdkColor *),flags=no_out

14381

*/

14382

-public static final native void _gdk_gc_set_foreground(int /*long*/ gc, GdkColor color);

14383

-public static final void gdk_gc_set_foreground(int /*long*/ gc, GdkColor color) {

14384

+public static final native void _gdk_gc_set_foreground(long /*int*/ gc, GdkColor color);

14385

+public static final void gdk_gc_set_foreground(long /*int*/ gc, GdkColor color) {

14386

lock.lock();

14387

try {

14388

_gdk_gc_set_foreground(gc, color);

14389

@@ -3720,8 +3720,8 @@

14390

* @param gc cast=(GdkGC *)

14391

* @param function cast=(GdkFunction)

14392

*/

14393

-public static final native void _gdk_gc_set_function(int /*long*/ gc, int /*long*/ function);

14394

-public static final void gdk_gc_set_function(int /*long*/ gc, int /*long*/ function) {

14395

+public static final native void _gdk_gc_set_function(long /*int*/ gc, long /*int*/ function);

14396

+public static final void gdk_gc_set_function(long /*int*/ gc, long /*int*/ function) {

14397

lock.lock();

14398

try {

14399

_gdk_gc_set_function(gc, function);

14400

@@ -3736,8 +3736,8 @@

14401

* @param cap_style cast=(GdkCapStyle)

14402

* @param join_style cast=(GdkJoinStyle)

14403

*/

14404

-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);

14405

-public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_width, int line_style, int cap_style, int join_style) {

14406

+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);

14407

+public static final void gdk_gc_set_line_attributes(long /*int*/ gc, int line_width, int line_style, int cap_style, int join_style) {

14408

lock.lock();

14409

try {

14410

_gdk_gc_set_line_attributes(gc, line_width, line_style, cap_style, join_style);

14411

@@ -3749,8 +3749,8 @@

14412

* @param gc cast=(GdkGC *)

14413

* @param stipple cast=(GdkPixmap *)

14414

*/

14415

-public static final native void _gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stipple);

14416

-public static final void gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stipple) {

14417

+public static final native void _gdk_gc_set_stipple(long /*int*/ gc, long /*int*/ stipple);

14418

+public static final void gdk_gc_set_stipple(long /*int*/ gc, long /*int*/ stipple) {

14419

lock.lock();

14420

try {

14421

_gdk_gc_set_stipple(gc, stipple);

14422

@@ -3762,8 +3762,8 @@

14423

* @param gc cast=(GdkGC *)

14424

* @param mode cast=(GdkSubwindowMode)

14425

*/

14426

-public static final native void _gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode);

14427

-public static final void gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode) {

14428

+public static final native void _gdk_gc_set_subwindow(long /*int*/ gc, long /*int*/ mode);

14429

+public static final void gdk_gc_set_subwindow(long /*int*/ gc, long /*int*/ mode) {

14430

lock.lock();

14431

try {

14432

_gdk_gc_set_subwindow(gc, mode);

14433

@@ -3775,8 +3775,8 @@

14434

* @param gc cast=(GdkGC *)

14435

* @param tile cast=(GdkPixmap *)

14436

*/

14437

-public static final native void _gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile);

14438

-public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {

14439

+public static final native void _gdk_gc_set_tile(long /*int*/ gc, long /*int*/ tile);

14440

+public static final void gdk_gc_set_tile(long /*int*/ gc, long /*int*/ tile) {

14441

lock.lock();

14442

try {

14443

_gdk_gc_set_tile(gc, tile);

14444

@@ -3785,8 +3785,8 @@

14445

}

14446

}

14447

/** @param gc cast=(GdkGC *) */

14448

-public static final native void _gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y);

14449

-public static final void gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y) {

14450

+public static final native void _gdk_gc_set_ts_origin(long /*int*/ gc, int x, int y);

14451

+public static final void gdk_gc_set_ts_origin(long /*int*/ gc, int x, int y) {

14452

lock.lock();

14453

try {

14454

_gdk_gc_set_ts_origin(gc, x, y);

14455

@@ -3799,8 +3799,8 @@

14456

* @param values cast=(GdkGCValues *),flags=no_out

14457

* @param values_mask cast=(GdkGCValuesMask)

14458

*/

14459

-public static final native void _gdk_gc_set_values(int /*long*/ gc, GdkGCValues values, int values_mask);

14460

-public static final void gdk_gc_set_values(int /*long*/ gc, GdkGCValues values, int values_mask) {

14461

+public static final native void _gdk_gc_set_values(long /*int*/ gc, GdkGCValues values, int values_mask);

14462

+public static final void gdk_gc_set_values(long /*int*/ gc, GdkGCValues values, int values_mask) {

14463

lock.lock();

14464

try {

14465

_gdk_gc_set_values(gc, values, values_mask);

14466

@@ -3817,8 +3817,8 @@

14467

lock.unlock();

14468

}

14469

}

14470

-public static final native int /*long*/ _gdk_keymap_get_default();

14471

-public static final int /*long*/ gdk_keymap_get_default() {

14472

+public static final native long /*int*/ _gdk_keymap_get_default();

14473

+public static final long /*int*/ gdk_keymap_get_default() {

14474

lock.lock();

14475

try {

14476

return _gdk_keymap_get_default();

14477

@@ -3834,8 +3834,8 @@

14478

* @param level cast=(gint*)

14479

* @param consumed_modifiers cast=(GdkModifierType *)

14480

*/

14481

-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);

14482

-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) {

14483

+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);

14484

+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) {

14485

lock.lock();

14486

try {

14487

return _gdk_keymap_translate_keyboard_state(keymap, hardware_keycode, state, group, keyval, effective_group, level, consumed_modifiers);

14488

@@ -3861,8 +3861,8 @@

14489

lock.unlock();

14490

}

14491

}

14492

-public static final native int /*long*/ _gdk_pango_context_get();

14493

-public static final int /*long*/ gdk_pango_context_get() {

14494

+public static final native long /*int*/ _gdk_pango_context_get();

14495

+public static final long /*int*/ gdk_pango_context_get() {

14496

lock.lock();

14497

try {

14498

return _gdk_pango_context_get();

14499

@@ -3874,8 +3874,8 @@

14500

* @param context cast=(PangoContext *)

14501

* @param colormap cast=(GdkColormap *)

14502

*/

14503

-public static final native void _gdk_pango_context_set_colormap(int /*long*/ context, int /*long*/ colormap);

14504

-public static final void gdk_pango_context_set_colormap(int /*long*/ context, int /*long*/ colormap) {

14505

+public static final native void _gdk_pango_context_set_colormap(long /*int*/ context, long /*int*/ colormap);

14506

+public static final void gdk_pango_context_set_colormap(long /*int*/ context, long /*int*/ colormap) {

14507

lock.lock();

14508

try {

14509

_gdk_pango_context_set_colormap(context, colormap);

14510

@@ -3884,8 +3884,8 @@

14511

}

14512

}

14513

/** @param layout cast=(PangoLayout *) */

14514

-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);

14515

-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) {

14516

+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);

14517

+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) {

14518

lock.lock();

14519

try {

14520

return _gdk_pango_layout_get_clip_region(layout, x_origin, y_origin, index_ranges, n_ranges);

14521

@@ -3897,8 +3897,8 @@

14522

* @param src_pixbuf cast=(GdkPixbuf *)

14523

* @param dest_pixbuf cast=(GdkPixbuf *)

14524

*/

14525

-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);

14526

-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) {

14527

+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);

14528

+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) {

14529

lock.lock();

14530

try {

14531

_gdk_pixbuf_copy_area(src_pixbuf, src_x, src_y, width, height, dest_pixbuf, dest_x, dest_y);

14532

@@ -3911,8 +3911,8 @@

14533

* @param src cast=(GdkDrawable *)

14534

* @param cmap cast=(GdkColormap *)

14535

*/

14536

-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);

14537

-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) {

14538

+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);

14539

+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) {

14540

lock.lock();

14541

try {

14542

return _gdk_pixbuf_get_from_drawable(dest, src, cmap, src_x, src_y, dest_x, dest_y, width, height);

14543

@@ -3921,8 +3921,8 @@

14544

}

14545

}

14546

/** @param pixbuf cast=(const GdkPixbuf *) */

14547

-public static final native boolean _gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf);

14548

-public static final boolean gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf) {

14549

+public static final native boolean _gdk_pixbuf_get_has_alpha(long /*int*/ pixbuf);

14550

+public static final boolean gdk_pixbuf_get_has_alpha(long /*int*/ pixbuf) {

14551

lock.lock();

14552

try {

14553

return _gdk_pixbuf_get_has_alpha(pixbuf);

14554

@@ -3931,8 +3931,8 @@

14555

}

14556

}

14557

/** @param pixbuf cast=(const GdkPixbuf *) */

14558

-public static final native int _gdk_pixbuf_get_height(int /*long*/ pixbuf);

14559

-public static final int gdk_pixbuf_get_height(int /*long*/ pixbuf) {

14560

+public static final native int _gdk_pixbuf_get_height(long /*int*/ pixbuf);

14561

+public static final int gdk_pixbuf_get_height(long /*int*/ pixbuf) {

14562

lock.lock();

14563

try {

14564

return _gdk_pixbuf_get_height(pixbuf);

14565

@@ -3941,8 +3941,8 @@

14566

}

14567

}

14568

/** @param pixbuf cast=(const GdkPixbuf *) */

14569

-public static final native int /*long*/ _gdk_pixbuf_get_pixels(int /*long*/ pixbuf);

14570

-public static final int /*long*/ gdk_pixbuf_get_pixels(int /*long*/ pixbuf) {

14571

+public static final native long /*int*/ _gdk_pixbuf_get_pixels(long /*int*/ pixbuf);

14572

+public static final long /*int*/ gdk_pixbuf_get_pixels(long /*int*/ pixbuf) {

14573

lock.lock();

14574

try {

14575

return _gdk_pixbuf_get_pixels(pixbuf);

14576

@@ -3951,8 +3951,8 @@

14577

}

14578

}

14579

/** @param pixbuf cast=(const GdkPixbuf *) */

14580

-public static final native int _gdk_pixbuf_get_rowstride(int /*long*/ pixbuf);

14581

-public static final int gdk_pixbuf_get_rowstride(int /*long*/ pixbuf) {

14582

+public static final native int _gdk_pixbuf_get_rowstride(long /*int*/ pixbuf);

14583

+public static final int gdk_pixbuf_get_rowstride(long /*int*/ pixbuf) {

14584

lock.lock();

14585

try {

14586

return _gdk_pixbuf_get_rowstride(pixbuf);

14587

@@ -3961,8 +3961,8 @@

14588

}

14589

}

14590

/** @param pixbuf cast=(const GdkPixbuf *) */

14591

-public static final native int _gdk_pixbuf_get_width(int /*long*/ pixbuf);

14592

-public static final int gdk_pixbuf_get_width(int /*long*/ pixbuf) {

14593

+public static final native int _gdk_pixbuf_get_width(long /*int*/ pixbuf);

14594

+public static final int gdk_pixbuf_get_width(long /*int*/ pixbuf) {

14595

lock.lock();

14596

try {

14597

return _gdk_pixbuf_get_width(pixbuf);

14598

@@ -3970,8 +3970,8 @@

14599

lock.unlock();

14600

}

14601

}

14602

-public static final native int /*long*/ _gdk_pixbuf_loader_new();

14603

-public static final int /*long*/ gdk_pixbuf_loader_new() {

14604

+public static final native long /*int*/ _gdk_pixbuf_loader_new();

14605

+public static final long /*int*/ gdk_pixbuf_loader_new() {

14606

lock.lock();

14607

try {

14608

return _gdk_pixbuf_loader_new();

14609

@@ -3983,8 +3983,8 @@

14610

* @param loader cast=(GdkPixbufLoader *)

14611

* @param error cast=(GError **)

14612

*/

14613

-public static final native boolean _gdk_pixbuf_loader_close(int /*long*/ loader, int /*long*/ [] error);

14614

-public static final boolean gdk_pixbuf_loader_close(int /*long*/ loader, int /*long*/ [] error) {

14615

+public static final native boolean _gdk_pixbuf_loader_close(long /*int*/ loader, long /*int*/ [] error);

14616

+public static final boolean gdk_pixbuf_loader_close(long /*int*/ loader, long /*int*/ [] error) {

14617

lock.lock();

14618

try {

14619

return _gdk_pixbuf_loader_close(loader, error);

14620

@@ -3993,8 +3993,8 @@

14621

}

14622

}

14623

/** @param loader cast=(GdkPixbufLoader *) */

14624

-public static final native int /*long*/ _gdk_pixbuf_loader_get_pixbuf(int /*long*/ loader);

14625

-public static final int /*long*/ gdk_pixbuf_loader_get_pixbuf(int /*long*/ loader) {

14626

+public static final native long /*int*/ _gdk_pixbuf_loader_get_pixbuf(long /*int*/ loader);

14627

+public static final long /*int*/ gdk_pixbuf_loader_get_pixbuf(long /*int*/ loader) {

14628

lock.lock();

14629

try {

14630

return _gdk_pixbuf_loader_get_pixbuf(loader);

14631

@@ -4008,8 +4008,8 @@

14632

* @param count cast=(gsize)

14633

* @param error cast=(GError **)

14634

*/

14635

-public static final native boolean _gdk_pixbuf_loader_write(int /*long*/ loader, int /*long*/ buffer, int count, int /*long*/ [] error);

14636

-public static final boolean gdk_pixbuf_loader_write(int /*long*/ loader, int /*long*/ buffer, int count, int /*long*/ [] error) {

14637

+public static final native boolean _gdk_pixbuf_loader_write(long /*int*/ loader, long /*int*/ buffer, int count, long /*int*/ [] error);

14638

+public static final boolean gdk_pixbuf_loader_write(long /*int*/ loader, long /*int*/ buffer, int count, long /*int*/ [] error) {

14639

lock.lock();

14640

try {

14641

return _gdk_pixbuf_loader_write(loader, buffer, count, error);

14642

@@ -4021,8 +4021,8 @@

14643

* @param colorspace cast=(GdkColorspace)

14644

* @param has_alpha cast=(gboolean)

14645

*/

14646

-public static final native int /*long*/ _gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height);

14647

-public static final int /*long*/ gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height) {

14648

+public static final native long /*int*/ _gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height);

14649

+public static final long /*int*/ gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height) {

14650

lock.lock();

14651

try {

14652

return _gdk_pixbuf_new(colorspace, has_alpha, bits_per_sample, width, height);

14653

@@ -4034,8 +4034,8 @@

14654

* @param filename cast=(const char *)

14655

* @param error cast=(GError**)

14656

*/

14657

-public static final native int /*long*/ _gdk_pixbuf_new_from_file(byte[] filename, int /*long*/ [] error);

14658

-public static final int /*long*/ gdk_pixbuf_new_from_file(byte[] filename, int /*long*/ [] error) {

14659

+public static final native long /*int*/ _gdk_pixbuf_new_from_file(byte[] filename, long /*int*/ [] error);

14660

+public static final long /*int*/ gdk_pixbuf_new_from_file(byte[] filename, long /*int*/ [] error) {

14661

lock.lock();

14662

try {

14663

return _gdk_pixbuf_new_from_file(filename, error);

14664

@@ -4049,8 +4049,8 @@

14665

* @param gc cast=(GdkGC *)

14666

* @param dither cast=(GdkRgbDither)

14667

*/

14668

-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);

14669

-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) {

14670

+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);

14671

+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) {

14672

lock.lock();

14673

try {

14674

_gdk_pixbuf_render_to_drawable(pixbuf, drawable, gc, src_x, src_y, dest_x, dest_y, width, height, dither, x_dither, y_dither);

14675

@@ -4064,8 +4064,8 @@

14676

* @param alpha_mode cast=(GdkPixbufAlphaMode)

14677

* @param dither cast=(GdkRgbDither)

14678

*/

14679

-public static final native void _gdk_pixbuf_render_to_drawable_alpha(int /*long*/ pixbuf, int /*long*/ drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_mode, int alpha_threshold, int dither, int x_dither, int y_dither);

14680

-public static final void gdk_pixbuf_render_to_drawable_alpha(int /*long*/ pixbuf, int /*long*/ drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_mode, int alpha_threshold, int dither, int x_dither, int y_dither) {

14681

+public static final native void _gdk_pixbuf_render_to_drawable_alpha(long /*int*/ pixbuf, long /*int*/ drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_mode, int alpha_threshold, int dither, int x_dither, int y_dither);

14682

+public static final void gdk_pixbuf_render_to_drawable_alpha(long /*int*/ pixbuf, long /*int*/ drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_mode, int alpha_threshold, int dither, int x_dither, int y_dither) {

14683

lock.lock();

14684

try {

14685

_gdk_pixbuf_render_to_drawable_alpha(pixbuf, drawable, src_x, src_y, dest_x, dest_y, width, height, alpha_mode, alpha_threshold, dither, x_dither, y_dither);

14686

@@ -4078,8 +4078,8 @@

14687

* @param pixmap_return cast=(GdkDrawable **)

14688

* @param mask_return cast=(GdkBitmap **)

14689

*/

14690

-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);

14691

-public static final void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf, int /*long*/[] pixmap_return, int /*long*/[] mask_return, int alpha_threshold) {

14692

+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);

14693

+public static final void gdk_pixbuf_render_pixmap_and_mask(long /*int*/ pixbuf, long /*int*/[] pixmap_return, long /*int*/[] mask_return, int alpha_threshold) {

14694

lock.lock();

14695

try {

14696

_gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, mask_return, alpha_threshold);

14697

@@ -4097,8 +4097,8 @@

14698

* @param option_values=(char **)

14699

* @param error cast=(GError **)

14700

*/

14701

-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);

14702

-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) {

14703

+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);

14704

+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) {

14705

lock.lock();

14706

try {

14707

return _gdk_pixbuf_save_to_bufferv(pixbuf, buffer, buffer_size, type, option_keys, option_values, error);

14708

@@ -4114,8 +4114,8 @@

14709

* @param scale_x cast=(double)

14710

* @param scale_y cast=(double)

14711

*/

14712

-public static final native void _gdk_pixbuf_scale(int /*long*/ src, int /*long*/ dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, int interp_type);

14713

-public static final void gdk_pixbuf_scale(int /*long*/ src, int /*long*/ dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, int interp_type) {

14714

+public static final native void _gdk_pixbuf_scale(long /*int*/ src, long /*int*/ dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, int interp_type);

14715

+public static final void gdk_pixbuf_scale(long /*int*/ src, long /*int*/ dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, int interp_type) {

14716

lock.lock();

14717

try {

14718

_gdk_pixbuf_scale(src, dest, dest_x, dest_y, dest_width, dest_height, offset_x, offset_y, scale_x, scale_y, interp_type);

14719

@@ -4127,8 +4127,8 @@

14720

* @param src cast=(const GdkPixbuf *)

14721

* @param interp_type cast=(GdkInterpType)

14722

*/

14723

-public static final native int /*long*/ _gdk_pixbuf_scale_simple(int /*long*/ src, int dest_width, int dest_height, int interp_type);

14724

-public static final int /*long*/ gdk_pixbuf_scale_simple(int /*long*/ src, int dest_width, int dest_height, int interp_type) {

14725

+public static final native long /*int*/ _gdk_pixbuf_scale_simple(long /*int*/ src, int dest_width, int dest_height, int interp_type);

14726

+public static final long /*int*/ gdk_pixbuf_scale_simple(long /*int*/ src, int dest_width, int dest_height, int interp_type) {

14727

lock.lock();

14728

try {

14729

return _gdk_pixbuf_scale_simple(src, dest_width, dest_height, interp_type);

14730

@@ -4142,8 +4142,8 @@

14731

* @param height cast=(gint)

14732

* @param depth cast=(gint)

14733

*/

14734

-public static final native int /*long*/ _gdk_pixmap_new(int /*long*/ window, int width, int height, int depth);

14735

-public static final int /*long*/ gdk_pixmap_new(int /*long*/ window, int width, int height, int depth) {

14736

+public static final native long /*int*/ _gdk_pixmap_new(long /*int*/ window, int width, int height, int depth);

14737

+public static final long /*int*/ gdk_pixmap_new(long /*int*/ window, int width, int height, int depth) {

14738

lock.lock();

14739

try {

14740

return _gdk_pixmap_new(window, width, height, depth);

14741

@@ -4159,8 +4159,8 @@

14742

* @param cursor cast=(GdkCursor *)

14743

* @param time cast=(guint32)

14744

*/

14745

-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);

14746

-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) {

14747

+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);

14748

+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) {

14749

lock.lock();

14750

try {

14751

return _gdk_pointer_grab(window, owner_events, event_mask, confine_to, cursor, time);

14752

@@ -4196,8 +4196,8 @@

14753

* @param actual_length cast=(gint *)

14754

* @param data cast=(guchar **)

14755

*/

14756

-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);

14757

-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) {

14758

+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);

14759

+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) {

14760

lock.lock();

14761

try {

14762

return _gdk_property_get(window, property, type, offset, length, pdelete, actual_property_type, actual_format, actual_length, data);

14763

@@ -4206,8 +4206,8 @@

14764

}

14765

}

14766

/** @param region cast=(GdkRegion *) */

14767

-public static final native void _gdk_region_destroy(int /*long*/ region);

14768

-public static final void gdk_region_destroy(int /*long*/ region) {

14769

+public static final native void _gdk_region_destroy(long /*int*/ region);

14770

+public static final void gdk_region_destroy(long /*int*/ region) {

14771

lock.lock();

14772

try {

14773

_gdk_region_destroy(region);

14774

@@ -4216,8 +4216,8 @@

14775

}

14776

}

14777

/** @param region cast=(GdkRegion *) */

14778

-public static final native boolean _gdk_region_empty(int /*long*/ region);

14779

-public static final boolean gdk_region_empty(int /*long*/ region) {

14780

+public static final native boolean _gdk_region_empty(long /*int*/ region);

14781

+public static final boolean gdk_region_empty(long /*int*/ region) {

14782

lock.lock();

14783

try {

14784

return _gdk_region_empty(region);

14785

@@ -4229,8 +4229,8 @@

14786

* @param region cast=(GdkRegion *)

14787

* @param rectangle cast=(GdkRectangle *),flags=no_in

14788

*/

14789

-public static final native void _gdk_region_get_clipbox(int /*long*/ region, GdkRectangle rectangle);

14790

-public static final void gdk_region_get_clipbox(int /*long*/ region, GdkRectangle rectangle) {

14791

+public static final native void _gdk_region_get_clipbox(long /*int*/ region, GdkRectangle rectangle);

14792

+public static final void gdk_region_get_clipbox(long /*int*/ region, GdkRectangle rectangle) {

14793

lock.lock();

14794

try {

14795

_gdk_region_get_clipbox(region, rectangle);

14796

@@ -4243,8 +4243,8 @@

14797

* @param rectangles cast=(GdkRectangle **)

14798

* @param n_rectangles cast=(gint *)

14799

*/

14800

-public static final native void _gdk_region_get_rectangles(int /*long*/ region, int /*long*/[] rectangles, int[] n_rectangles);

14801

-public static final void gdk_region_get_rectangles(int /*long*/ region, int /*long*/[] rectangles, int[] n_rectangles) {

14802

+public static final native void _gdk_region_get_rectangles(long /*int*/ region, long /*int*/[] rectangles, int[] n_rectangles);

14803

+public static final void gdk_region_get_rectangles(long /*int*/ region, long /*int*/[] rectangles, int[] n_rectangles) {

14804

lock.lock();

14805

try {

14806

_gdk_region_get_rectangles(region, rectangles, n_rectangles);

14807

@@ -4256,8 +4256,8 @@

14808

* @param source1 cast=(GdkRegion *)

14809

* @param source2 cast=(GdkRegion *)

14810

*/

14811

-public static final native void _gdk_region_intersect(int /*long*/ source1, int /*long*/ source2);

14812

-public static final void gdk_region_intersect(int /*long*/ source1, int /*long*/ source2) {

14813

+public static final native void _gdk_region_intersect(long /*int*/ source1, long /*int*/ source2);

14814

+public static final void gdk_region_intersect(long /*int*/ source1, long /*int*/ source2) {

14815

lock.lock();

14816

try {

14817

_gdk_region_intersect(source1, source2);

14818

@@ -4265,8 +4265,8 @@

14819

lock.unlock();

14820

}

14821

}

14822

-public static final native int /*long*/ _gdk_region_new();

14823

-public static final int /*long*/ gdk_region_new() {

14824

+public static final native long /*int*/ _gdk_region_new();

14825

+public static final long /*int*/ gdk_region_new() {

14826

lock.lock();

14827

try {

14828

return _gdk_region_new();

14829

@@ -4279,8 +4279,8 @@

14830

* @param dx cast=(gint)

14831

* @param dy cast=(gint)

14832

*/

14833

-public static final native void _gdk_region_offset(int /*long*/ region, int dx, int dy);

14834

-public static final void gdk_region_offset(int /*long*/ region, int dx, int dy) {

14835

+public static final native void _gdk_region_offset(long /*int*/ region, int dx, int dy);

14836

+public static final void gdk_region_offset(long /*int*/ region, int dx, int dy) {

14837

lock.lock();

14838

try {

14839

_gdk_region_offset(region, dx, dy);

14840

@@ -4293,8 +4293,8 @@

14841

* @param x cast=(gint)

14842

* @param y cast=(gint)

14843

*/

14844

-public static final native boolean _gdk_region_point_in(int /*long*/ region, int x, int y);

14845

-public static final boolean gdk_region_point_in(int /*long*/ region, int x, int y) {

14846

+public static final native boolean _gdk_region_point_in(long /*int*/ region, int x, int y);

14847

+public static final boolean gdk_region_point_in(long /*int*/ region, int x, int y) {

14848

lock.lock();

14849

try {

14850

return _gdk_region_point_in(region, x, y);

14851

@@ -4306,8 +4306,8 @@

14852

* @param points cast=(GdkPoint *)

14853

* @param fill_rule cast=(GdkFillRule)

14854

*/

14855

-public static final native int /*long*/ _gdk_region_polygon(int[] points, int npoints, int fill_rule);

14856

-public static final int /*long*/ gdk_region_polygon(int[] points, int npoints, int fill_rule) {

14857

+public static final native long /*int*/ _gdk_region_polygon(int[] points, int npoints, int fill_rule);

14858

+public static final long /*int*/ gdk_region_polygon(int[] points, int npoints, int fill_rule) {

14859

lock.lock();

14860

try {

14861

return _gdk_region_polygon(points, npoints, fill_rule);

14862

@@ -4316,8 +4316,8 @@

14863

}

14864

}

14865

/** @param rectangle flags=no_out */

14866

-public static final native int /*long*/ _gdk_region_rectangle(GdkRectangle rectangle);

14867

-public static final int /*long*/ gdk_region_rectangle(GdkRectangle rectangle) {

14868

+public static final native long /*int*/ _gdk_region_rectangle(GdkRectangle rectangle);

14869

+public static final long /*int*/ gdk_region_rectangle(GdkRectangle rectangle) {

14870

lock.lock();

14871

try {

14872

return _gdk_region_rectangle(rectangle);

14873

@@ -4329,8 +4329,8 @@

14874

* @param region cast=(GdkRegion *)

14875

* @param rect cast=(GdkRectangle *),flags=no_out

14876

*/

14877

-public static final native int /*long*/ _gdk_region_rect_in(int /*long*/ region, GdkRectangle rect);

14878

-public static final int /*long*/ gdk_region_rect_in(int /*long*/ region, GdkRectangle rect) {

14879

+public static final native long /*int*/ _gdk_region_rect_in(long /*int*/ region, GdkRectangle rect);

14880

+public static final long /*int*/ gdk_region_rect_in(long /*int*/ region, GdkRectangle rect) {

14881

lock.lock();

14882

try {

14883

return _gdk_region_rect_in(region, rect);

14884

@@ -4342,8 +4342,8 @@

14885

* @param source1 cast=(GdkRegion *)

14886

* @param source2 cast=(GdkRegion *)

14887

*/

14888

-public static final native void _gdk_region_subtract(int /*long*/ source1, int /*long*/ source2);

14889

-public static final void gdk_region_subtract(int /*long*/ source1, int /*long*/ source2) {

14890

+public static final native void _gdk_region_subtract(long /*int*/ source1, long /*int*/ source2);

14891

+public static final void gdk_region_subtract(long /*int*/ source1, long /*int*/ source2) {

14892

lock.lock();

14893

try {

14894

_gdk_region_subtract(source1, source2);

14895

@@ -4355,8 +4355,8 @@

14896

* @param source1 cast=(GdkRegion *)

14897

* @param source2 cast=(GdkRegion *)

14898

*/

14899

-public static final native void _gdk_region_union(int /*long*/ source1, int /*long*/ source2);

14900

-public static final void gdk_region_union(int /*long*/ source1, int /*long*/ source2) {

14901

+public static final native void _gdk_region_union(long /*int*/ source1, long /*int*/ source2);

14902

+public static final void gdk_region_union(long /*int*/ source1, long /*int*/ source2) {

14903

lock.lock();

14904

try {

14905

_gdk_region_union(source1, source2);

14906

@@ -4368,8 +4368,8 @@

14907

* @param region cast=(GdkRegion *)

14908

* @param rect cast=(GdkRectangle *),flags=no_out

14909

*/

14910

-public static final native void _gdk_region_union_with_rect(int /*long*/ region, GdkRectangle rect);

14911

-public static final void gdk_region_union_with_rect(int /*long*/ region, GdkRectangle rect) {

14912

+public static final native void _gdk_region_union_with_rect(long /*int*/ region, GdkRectangle rect);

14913

+public static final void gdk_region_union_with_rect(long /*int*/ region, GdkRectangle rect) {

14914

lock.lock();

14915

try {

14916

_gdk_region_union_with_rect(region, rect);

14917

@@ -4387,8 +4387,8 @@

14918

}

14919

}

14920

/** @method flags=dynamic */

14921

-public static final native int /*long*/ _gdk_screen_get_default();

14922

-public static final int /*long*/ gdk_screen_get_default() {

14923

+public static final native long /*int*/ _gdk_screen_get_default();

14924

+public static final long /*int*/ gdk_screen_get_default() {

14925

lock.lock();

14926

try {

14927

return _gdk_screen_get_default();

14928

@@ -4402,8 +4402,8 @@

14929

* @param x cast=(gint)

14930

* @param y cast=(gint)

14931

*/

14932

-public static final native int _gdk_screen_get_monitor_at_point (int /*long*/ screen, int x, int y);

14933

-public static final int gdk_screen_get_monitor_at_point (int /*long*/ screen, int x, int y) {

14934

+public static final native int _gdk_screen_get_monitor_at_point (long /*int*/ screen, int x, int y);

14935

+public static final int gdk_screen_get_monitor_at_point (long /*int*/ screen, int x, int y) {

14936

lock.lock();

14937

try {

14938

return _gdk_screen_get_monitor_at_point (screen, x, y);

14939

@@ -4416,8 +4416,8 @@

14940

* @param screen cast=(GdkScreen *)

14941

* @param window cast=(GdkWindow *)

14942

*/

14943

-public static final native int _gdk_screen_get_monitor_at_window(int /*long*/ screen, int /*long*/ window);

14944

-public static final int gdk_screen_get_monitor_at_window(int /*long*/ screen, int /*long*/ window) {

14945

+public static final native int _gdk_screen_get_monitor_at_window(long /*int*/ screen, long /*int*/ window);

14946

+public static final int gdk_screen_get_monitor_at_window(long /*int*/ screen, long /*int*/ window) {

14947

lock.lock();

14948

try {

14949

return _gdk_screen_get_monitor_at_window(screen, window);

14950

@@ -4430,8 +4430,8 @@

14951

* @param screen cast=(GdkScreen *)

14952

* @param dest flags=no_in

14953

*/

14954

-public static final native void _gdk_screen_get_monitor_geometry (int /*long*/ screen, int monitor_num, GdkRectangle dest);

14955

-public static final void gdk_screen_get_monitor_geometry (int /*long*/ screen, int monitor_num, GdkRectangle dest) {

14956

+public static final native void _gdk_screen_get_monitor_geometry (long /*int*/ screen, int monitor_num, GdkRectangle dest);

14957

+public static final void gdk_screen_get_monitor_geometry (long /*int*/ screen, int monitor_num, GdkRectangle dest) {

14958

lock.lock();

14959

try {

14960

_gdk_screen_get_monitor_geometry(screen, monitor_num, dest);

14961

@@ -4443,8 +4443,8 @@

14962

* @method flags=dynamic

14963

* @param screen cast=(GdkScreen *)

14964

*/

14965

-public static final native int _gdk_screen_get_n_monitors(int /*long*/ screen);

14966

-public static final int gdk_screen_get_n_monitors(int /*long*/ screen) {

14967

+public static final native int _gdk_screen_get_n_monitors(long /*int*/ screen);

14968

+public static final int gdk_screen_get_n_monitors(long /*int*/ screen) {

14969

lock.lock();

14970

try {

14971

return _gdk_screen_get_n_monitors(screen);

14972

@@ -4456,8 +4456,8 @@

14973

* @method flags=dynamic

14974

* @param screen cast=(GdkScreen *)

14975

*/

14976

-public static final native int _gdk_screen_get_number(int /*long*/ screen);

14977

-public static final int gdk_screen_get_number(int /*long*/ screen) {

14978

+public static final native int _gdk_screen_get_number(long /*int*/ screen);

14979

+public static final int gdk_screen_get_number(long /*int*/ screen) {

14980

lock.lock();

14981

try {

14982

return _gdk_screen_get_number(screen);

14983

@@ -4509,8 +4509,8 @@

14984

* @param ctext cast=(guchar **)

14985

* @param length cast=(gint *)

14986

*/

14987

-public static final native boolean _gdk_utf8_to_compound_text(byte[] str, int /*long*/[] encoding, int[] format, int /*long*/[] ctext, int[] length);

14988

-public static final boolean gdk_utf8_to_compound_text(byte[] str, int /*long*/[] encoding, int[] format, int /*long*/[] ctext, int[] length) {

14989

+public static final native boolean _gdk_utf8_to_compound_text(byte[] str, long /*int*/[] encoding, int[] format, long /*int*/[] ctext, int[] length);

14990

+public static final boolean gdk_utf8_to_compound_text(byte[] str, long /*int*/[] encoding, int[] format, long /*int*/[] ctext, int[] length) {

14991

lock.lock();

14992

try {

14993

return _gdk_utf8_to_compound_text(str, encoding, format, ctext, length);

14994

@@ -4519,8 +4519,8 @@

14995

}

14996

}

14997

/** @param str cast=(const gchar *) */

14998

-public static final native int /*long*/ _gdk_utf8_to_string_target(byte[] str);

14999

-public static final int /*long*/ gdk_utf8_to_string_target(byte[] str) {

15000

+public static final native long /*int*/ _gdk_utf8_to_string_target(byte[] str);

15001

+public static final long /*int*/ gdk_utf8_to_string_target(byte[] str) {

15002

lock.lock();

15003

try {

15004

return _gdk_utf8_to_string_target(str);

15005

@@ -4533,8 +4533,8 @@

15006

* @param text cast=(guchar *)

15007

* @param list cast=(gchar ***)

15008

*/

15009

-public static final native int _gdk_text_property_to_utf8_list (int /*long*/ encoding, int format, int /*long*/ text, int length, int /*long*/[] list);

15010

-public static final int gdk_text_property_to_utf8_list (int /*long*/ encoding, int format, int /*long*/ text, int length, int /*long*/[] list) {

15011

+public static final native int _gdk_text_property_to_utf8_list (long /*int*/ encoding, int format, long /*int*/ text, int length, long /*int*/[] list);

15012

+public static final int gdk_text_property_to_utf8_list (long /*int*/ encoding, int format, long /*int*/ text, int length, long /*int*/[] list) {

15013

lock.lock();

15014

try {

15015

return _gdk_text_property_to_utf8_list(encoding, format, text, length, list);

15016

@@ -4546,8 +4546,8 @@

15017

* @method flags=dynamic

15018

* @param display cast=(GdkDisplay*)

15019

*/

15020

-public static final native void _gtk_tooltip_trigger_tooltip_query (int /*long*/ display);

15021

-public static final void gtk_tooltip_trigger_tooltip_query (int /*long*/ display){

15022

+public static final native void _gtk_tooltip_trigger_tooltip_query (long /*int*/ display);

15023

+public static final void gtk_tooltip_trigger_tooltip_query (long /*int*/ display){

15024

lock.lock();

15025

try {

15026

_gtk_tooltip_trigger_tooltip_query (display);

15027

@@ -4565,8 +4565,8 @@

15028

lock.unlock();

15029

}

15030

}

15031

-public static final native int /*long*/ _gdk_visual_get_system();

15032

-public static final int /*long*/ gdk_visual_get_system() {

15033

+public static final native long /*int*/ _gdk_visual_get_system();

15034

+public static final long /*int*/ gdk_visual_get_system() {

15035

lock.lock();

15036

try {

15037

return _gdk_visual_get_system();

15038

@@ -4578,8 +4578,8 @@

15039

* @param win_x cast=(gint *)

15040

* @param win_y cast=(gint *)

15041

*/

15042

-public static final native int /*long*/ _gdk_window_at_pointer(int[] win_x, int[] win_y);

15043

-public static final int /*long*/ gdk_window_at_pointer(int[] win_x, int[] win_y) {

15044

+public static final native long /*int*/ _gdk_window_at_pointer(int[] win_x, int[] win_y);

15045

+public static final long /*int*/ gdk_window_at_pointer(int[] win_x, int[] win_y) {

15046

lock.lock();

15047

try {

15048

return _gdk_window_at_pointer(win_x, win_y);

15049

@@ -4591,8 +4591,8 @@

15050

* @param window cast=(GdkWindow *)

15051

* @param rectangle cast=(GdkRectangle *),flags=no_out

15052

*/

15053

-public static final native void _gdk_window_begin_paint_rect(int /*long*/ window, GdkRectangle rectangle);

15054

-public static final void gdk_window_begin_paint_rect(int /*long*/ window, GdkRectangle rectangle) {

15055

+public static final native void _gdk_window_begin_paint_rect(long /*int*/ window, GdkRectangle rectangle);

15056

+public static final void gdk_window_begin_paint_rect(long /*int*/ window, GdkRectangle rectangle) {

15057

lock.lock();

15058

try {

15059

_gdk_window_begin_paint_rect(window, rectangle);

15060

@@ -4601,8 +4601,8 @@

15061

}

15062

}

15063

/** @param window cast=(GdkWindow *) */

15064

-public static final native void _gdk_window_clear_area(int /*long*/ window, int x, int y, int width, int height);

15065

-public static final void gdk_window_clear_area(int /*long*/ window, int x, int y, int width, int height) {

15066

+public static final native void _gdk_window_clear_area(long /*int*/ window, int x, int y, int width, int height);

15067

+public static final void gdk_window_clear_area(long /*int*/ window, int x, int y, int width, int height) {

15068

lock.lock();

15069

try {

15070

_gdk_window_clear_area(window, x, y, width, height);

15071

@@ -4611,8 +4611,8 @@

15072

}

15073

}

15074

/** @param window cast=(GdkWindow *) */

15075

-public static final native void _gdk_window_destroy(int /*long*/ window);

15076

-public static final void gdk_window_destroy(int /*long*/ window) {

15077

+public static final native void _gdk_window_destroy(long /*int*/ window);

15078

+public static final void gdk_window_destroy(long /*int*/ window) {

15079

lock.lock();

15080

try {

15081

_gdk_window_destroy(window);

15082

@@ -4621,8 +4621,8 @@

15083

}

15084

}

15085

/** @param window cast=(GdkWindow *) */

15086

-public static final native void _gdk_window_end_paint(int /*long*/ window);

15087

-public static final void gdk_window_end_paint(int /*long*/ window) {

15088

+public static final native void _gdk_window_end_paint(long /*int*/ window);

15089

+public static final void gdk_window_end_paint(long /*int*/ window) {

15090

lock.lock();

15091

try {

15092

_gdk_window_end_paint(window);

15093

@@ -4631,8 +4631,8 @@

15094

}

15095

}

15096

/** @param window cast=(GdkWindow *) */

15097

-public static final native int /*long*/ _gdk_window_get_children(int /*long*/ window);

15098

-public static final int /*long*/ gdk_window_get_children(int /*long*/ window) {

15099

+public static final native long /*int*/ _gdk_window_get_children(long /*int*/ window);

15100

+public static final long /*int*/ gdk_window_get_children(long /*int*/ window) {

15101

lock.lock();

15102

try {

15103

return _gdk_window_get_children(window);

15104

@@ -4641,8 +4641,8 @@

15105

}

15106

}

15107

/** @param window cast=(GdkWindow *) */

15108

-public static final native int _gdk_window_get_events(int /*long*/ window);

15109

-public static final int gdk_window_get_events(int /*long*/ window) {

15110

+public static final native int _gdk_window_get_events(long /*int*/ window);

15111

+public static final int gdk_window_get_events(long /*int*/ window) {

15112

lock.lock();

15113

try {

15114

return _gdk_window_get_events(window);

15115

@@ -4651,8 +4651,8 @@

15116

}

15117

}

15118

/** @param window cast=(GdkWindow *) */

15119

-public static final native void _gdk_window_focus(int /*long*/ window, int timestamp);

15120

-public static final void gdk_window_focus(int /*long*/ window, int timestamp) {

15121

+public static final native void _gdk_window_focus(long /*int*/ window, int timestamp);

15122

+public static final void gdk_window_focus(long /*int*/ window, int timestamp) {

15123

lock.lock();

15124

try {

15125

_gdk_window_focus(window, timestamp);

15126

@@ -4661,8 +4661,8 @@

15127

}

15128

}

15129

/** @param window cast=(GdkWindow *) */

15130

-public static final native void _gdk_window_freeze_updates(int /*long*/ window);

15131

-public static final void gdk_window_freeze_updates(int /*long*/ window) {

15132

+public static final native void _gdk_window_freeze_updates(long /*int*/ window);

15133

+public static final void gdk_window_freeze_updates(long /*int*/ window) {

15134

lock.lock();

15135

try {

15136

_gdk_window_freeze_updates(window);

15137

@@ -4674,8 +4674,8 @@

15138

* @param window cast=(GdkWindow *)

15139

* @param rect cast=(GdkRectangle *),flags=no_in

15140

*/

15141

-public static final native void _gdk_window_get_frame_extents(int /*long*/ window, GdkRectangle rect);

15142

-public static final void gdk_window_get_frame_extents(int /*long*/ window, GdkRectangle rect) {

15143

+public static final native void _gdk_window_get_frame_extents(long /*int*/ window, GdkRectangle rect);

15144

+public static final void gdk_window_get_frame_extents(long /*int*/ window, GdkRectangle rect) {

15145

lock.lock();

15146

try {

15147

_gdk_window_get_frame_extents(window, rect);

15148

@@ -4689,8 +4689,8 @@

15149

* @param x_offset cast=(gint *)

15150

* @param y_offset cast=(gint *)

15151

*/

15152

-public static final native void _gdk_window_get_internal_paint_info(int /*long*/ window, int /*long*/ [] real_drawable, int[] x_offset, int[] y_offset);

15153

-public static final void gdk_window_get_internal_paint_info(int /*long*/ window, int /*long*/ [] real_drawable, int[] x_offset, int[] y_offset) {

15154

+public static final native void _gdk_window_get_internal_paint_info(long /*int*/ window, long /*int*/ [] real_drawable, int[] x_offset, int[] y_offset);

15155

+public static final void gdk_window_get_internal_paint_info(long /*int*/ window, long /*int*/ [] real_drawable, int[] x_offset, int[] y_offset) {

15156

lock.lock();

15157

try {

15158

_gdk_window_get_internal_paint_info(window, real_drawable, x_offset, y_offset);

15159

@@ -4703,8 +4703,8 @@

15160

* @param x cast=(gint *)

15161

* @param y cast=(gint *)

15162

*/

15163

-public static final native int _gdk_window_get_origin(int /*long*/ window, int[] x, int[] y);

15164

-public static final int gdk_window_get_origin(int /*long*/ window, int[] x, int[] y) {

15165

+public static final native int _gdk_window_get_origin(long /*int*/ window, int[] x, int[] y);

15166

+public static final int gdk_window_get_origin(long /*int*/ window, int[] x, int[] y) {

15167

lock.lock();

15168

try {

15169

return _gdk_window_get_origin(window, x, y);

15170

@@ -4713,8 +4713,8 @@

15171

}

15172

}

15173

/** @param window cast=(GdkWindow *) */

15174

-public static final native int /*long*/ _gdk_window_get_parent(int /*long*/ window);

15175

-public static final int /*long*/ gdk_window_get_parent(int /*long*/ window) {

15176

+public static final native long /*int*/ _gdk_window_get_parent(long /*int*/ window);

15177

+public static final long /*int*/ gdk_window_get_parent(long /*int*/ window) {

15178

lock.lock();

15179

try {

15180

return _gdk_window_get_parent(window);

15181

@@ -4728,8 +4728,8 @@

15182

* @param y cast=(gint *)

15183

* @param mask cast=(GdkModifierType *)

15184

*/

15185

-public static final native int /*long*/ _gdk_window_get_pointer(int /*long*/ window, int[] x, int[] y, int[] mask);

15186

-public static final int /*long*/ gdk_window_get_pointer(int /*long*/ window, int[] x, int[] y, int[] mask) {

15187

+public static final native long /*int*/ _gdk_window_get_pointer(long /*int*/ window, int[] x, int[] y, int[] mask);

15188

+public static final long /*int*/ gdk_window_get_pointer(long /*int*/ window, int[] x, int[] y, int[] mask) {

15189

lock.lock();

15190

try {

15191

return _gdk_window_get_pointer(window, x, y, mask);

15192

@@ -4742,8 +4742,8 @@

15193

* @param x cast=(gint *)

15194

* @param y cast=(gint *)

15195

*/

15196

-public static final native void _gdk_window_get_position(int /*long*/ window, int[] x, int[] y);

15197

-public static final void gdk_window_get_position(int /*long*/ window, int[] x, int[] y) {

15198

+public static final native void _gdk_window_get_position(long /*int*/ window, int[] x, int[] y);

15199

+public static final void gdk_window_get_position(long /*int*/ window, int[] x, int[] y) {

15200

lock.lock();

15201

try {

15202

_gdk_window_get_position(window, x, y);

15203

@@ -4755,8 +4755,8 @@

15204

* @param window cast=(GdkWindow *)

15205

* @param data cast=(gpointer *)

15206

*/

15207

-public static final native void _gdk_window_get_user_data(int /*long*/ window, int /*long*/[] data);

15208

-public static final void gdk_window_get_user_data(int /*long*/ window, int /*long*/[] data) {

15209

+public static final native void _gdk_window_get_user_data(long /*int*/ window, long /*int*/[] data);

15210

+public static final void gdk_window_get_user_data(long /*int*/ window, long /*int*/[] data) {

15211

lock.lock();

15212

try {

15213

_gdk_window_get_user_data(window, data);

15214

@@ -4765,8 +4765,8 @@

15215

}

15216

}

15217

/** @param window cast=(GdkWindow *) */

15218

-public static final native void _gdk_window_hide(int /*long*/ window);

15219

-public static final void gdk_window_hide(int /*long*/ window) {

15220

+public static final native void _gdk_window_hide(long /*int*/ window);

15221

+public static final void gdk_window_hide(long /*int*/ window) {

15222

lock.lock();

15223

try {

15224

_gdk_window_hide(window);

15225

@@ -4779,8 +4779,8 @@

15226

* @param rectangle cast=(GdkRectangle *),flags=no_out

15227

* @param invalidate_children cast=(gboolean)

15228

*/

15229

-public static final native void _gdk_window_invalidate_rect(int /*long*/ window, GdkRectangle rectangle, boolean invalidate_children);

15230

-public static final void gdk_window_invalidate_rect(int /*long*/ window, GdkRectangle rectangle, boolean invalidate_children) {

15231

+public static final native void _gdk_window_invalidate_rect(long /*int*/ window, GdkRectangle rectangle, boolean invalidate_children);

15232

+public static final void gdk_window_invalidate_rect(long /*int*/ window, GdkRectangle rectangle, boolean invalidate_children) {

15233

lock.lock();

15234

try {

15235

_gdk_window_invalidate_rect(window, rectangle, invalidate_children);

15236

@@ -4793,8 +4793,8 @@

15237

* @param region cast=(GdkRegion *)

15238

* @param invalidate_children cast=(gboolean)

15239

*/

15240

-public static final native void _gdk_window_invalidate_region(int /*long*/ window, int /*long*/ region, boolean invalidate_children);

15241

-public static final void gdk_window_invalidate_region(int /*long*/ window, int /*long*/ region, boolean invalidate_children) {

15242

+public static final native void _gdk_window_invalidate_region(long /*int*/ window, long /*int*/ region, boolean invalidate_children);

15243

+public static final void gdk_window_invalidate_region(long /*int*/ window, long /*int*/ region, boolean invalidate_children) {

15244

lock.lock();

15245

try {

15246

_gdk_window_invalidate_region(window, region, invalidate_children);

15247

@@ -4803,8 +4803,8 @@

15248

}

15249

}

15250

/** @param window cast=(GdkWindow *) */

15251

-public static final native boolean _gdk_window_is_visible(int /*long*/ window);

15252

-public static final boolean gdk_window_is_visible(int /*long*/ window) {

15253

+public static final native boolean _gdk_window_is_visible(long /*int*/ window);

15254

+public static final boolean gdk_window_is_visible(long /*int*/ window) {

15255

lock.lock();

15256

try {

15257

return _gdk_window_is_visible(window);

15258

@@ -4813,8 +4813,8 @@

15259

}

15260

}

15261

/** @param window cast=(GdkWindow *) */

15262

-public static final native void _gdk_window_move(int /*long*/ window, int x, int y);

15263

-public static final void gdk_window_move(int /*long*/ window, int x, int y) {

15264

+public static final native void _gdk_window_move(long /*int*/ window, int x, int y);

15265

+public static final void gdk_window_move(long /*int*/ window, int x, int y) {

15266

lock.lock();

15267

try {

15268

_gdk_window_move(window, x, y);

15269

@@ -4826,8 +4826,8 @@

15270

* @param parent cast=(GdkWindow *)

15271

* @param attributes flags=no_out

15272

*/

15273

-public static final native int /*long*/ _gdk_window_new(int /*long*/ parent, GdkWindowAttr attributes, int attributes_mask);

15274

-public static final int /*long*/ gdk_window_new(int /*long*/ parent, GdkWindowAttr attributes, int attributes_mask) {

15275

+public static final native long /*int*/ _gdk_window_new(long /*int*/ parent, GdkWindowAttr attributes, int attributes_mask);

15276

+public static final long /*int*/ gdk_window_new(long /*int*/ parent, GdkWindowAttr attributes, int attributes_mask) {

15277

lock.lock();

15278

try {

15279

return _gdk_window_new(parent, attributes, attributes_mask);

15280

@@ -4836,8 +4836,8 @@

15281

}

15282

}

15283

/** @param window cast=(GdkWindow *) */

15284

-public static final native void _gdk_window_lower(int /*long*/ window);

15285

-public static final void gdk_window_lower(int /*long*/ window) {

15286

+public static final native void _gdk_window_lower(long /*int*/ window);

15287

+public static final void gdk_window_lower(long /*int*/ window) {

15288

lock.lock();

15289

try {

15290

_gdk_window_lower(window);

15291

@@ -4858,8 +4858,8 @@

15292

* @param window cast=(GdkWindow *)

15293

* @param update_children cast=(gboolean)

15294

*/

15295

-public static final native void _gdk_window_process_updates(int /*long*/ window, boolean update_children);

15296

-public static final void gdk_window_process_updates(int /*long*/ window, boolean update_children) {

15297

+public static final native void _gdk_window_process_updates(long /*int*/ window, boolean update_children);

15298

+public static final void gdk_window_process_updates(long /*int*/ window, boolean update_children) {

15299

lock.lock();

15300

try {

15301

_gdk_window_process_updates(window, update_children);

15302

@@ -4868,8 +4868,8 @@

15303

}

15304

}

15305

/** @param window cast=(GdkWindow *) */

15306

-public static final native void _gdk_window_raise(int /*long*/ window);

15307

-public static final void gdk_window_raise(int /*long*/ window) {

15308

+public static final native void _gdk_window_raise(long /*int*/ window);

15309

+public static final void gdk_window_raise(long /*int*/ window) {

15310

lock.lock();

15311

try {

15312

_gdk_window_raise(window);

15313

@@ -4878,8 +4878,8 @@

15314

}

15315

}

15316

/** @param window cast=(GdkWindow *) */

15317

-public static final native void _gdk_window_resize(int /*long*/ window, int width, int height);

15318

-public static final void gdk_window_resize(int /*long*/ window, int width, int height) {

15319

+public static final native void _gdk_window_resize(long /*int*/ window, int width, int height);

15320

+public static final void gdk_window_resize(long /*int*/ window, int width, int height) {

15321

lock.lock();

15322

try {

15323

_gdk_window_resize(window, width, height);

15324

@@ -4888,8 +4888,8 @@

15325

}

15326

}

15327

/** @param window cast=(GdkWindow *) */

15328

-public static final native void _gdk_window_scroll(int /*long*/ window, int dx, int dy);

15329

-public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy) {

15330

+public static final native void _gdk_window_scroll(long /*int*/ window, int dx, int dy);

15331

+public static final void gdk_window_scroll(long /*int*/ window, int dx, int dy) {

15332

lock.lock();

15333

try {

15334

_gdk_window_scroll(window, dx, dy);

15335

@@ -4902,8 +4902,8 @@

15336

* @param window cast=(GdkWindow *)

15337

* @param accept_focus cast=(gboolean)

15338

*/

15339

-public static final native void _gdk_window_set_accept_focus(int /*long*/ window, boolean accept_focus);

15340

-public static final void gdk_window_set_accept_focus(int /*long*/ window, boolean accept_focus) {

15341

+public static final native void _gdk_window_set_accept_focus(long /*int*/ window, boolean accept_focus);

15342

+public static final void gdk_window_set_accept_focus(long /*int*/ window, boolean accept_focus) {

15343

lock.lock();

15344

try {

15345

_gdk_window_set_accept_focus(window, accept_focus);

15346

@@ -4916,8 +4916,8 @@

15347

* @param pixmap cast=(GdkPixmap *)

15348

* @param parent_relative cast=(gboolean)

15349

*/

15350

-public static final native void _gdk_window_set_back_pixmap(int /*long*/ window, int /*long*/ pixmap, boolean parent_relative);

15351

-public static final void gdk_window_set_back_pixmap(int /*long*/ window, int /*long*/ pixmap, boolean parent_relative) {

15352

+public static final native void _gdk_window_set_back_pixmap(long /*int*/ window, long /*int*/ pixmap, boolean parent_relative);

15353

+public static final void gdk_window_set_back_pixmap(long /*int*/ window, long /*int*/ pixmap, boolean parent_relative) {

15354

lock.lock();

15355

try {

15356

_gdk_window_set_back_pixmap(window, pixmap, parent_relative);

15357

@@ -4929,8 +4929,8 @@

15358

* @param window cast=(GdkWindow *)

15359

* @param cursor cast=(GdkCursor *)

15360

*/

15361

-public static final native void _gdk_window_set_cursor(int /*long*/ window, int /*long*/ cursor);

15362

-public static final void gdk_window_set_cursor(int /*long*/ window, int /*long*/ cursor) {

15363

+public static final native void _gdk_window_set_cursor(long /*int*/ window, long /*int*/ cursor);

15364

+public static final void gdk_window_set_cursor(long /*int*/ window, long /*int*/ cursor) {

15365

lock.lock();

15366

try {

15367

_gdk_window_set_cursor(window, cursor);

15368

@@ -4952,8 +4952,8 @@

15369

* @param window cast=(GdkWindow *)

15370

* @param decorations cast=(GdkWMDecoration)

15371

*/

15372

-public static final native void _gdk_window_set_decorations(int /*long*/ window, int decorations);

15373

-public static final void gdk_window_set_decorations(int /*long*/ window, int decorations) {

15374

+public static final native void _gdk_window_set_decorations(long /*int*/ window, int decorations);

15375

+public static final void gdk_window_set_decorations(long /*int*/ window, int decorations) {

15376

lock.lock();

15377

try {

15378

_gdk_window_set_decorations(window, decorations);

15379

@@ -4962,8 +4962,8 @@

15380

}

15381

}

15382

/** @param window cast=(GdkWindow *) */

15383

-public static final native void _gdk_window_set_events(int /*long*/ window, int event_mask);

15384

-public static final void gdk_window_set_events(int /*long*/ window, int event_mask) {

15385

+public static final native void _gdk_window_set_events(long /*int*/ window, int event_mask);

15386

+public static final void gdk_window_set_events(long /*int*/ window, int event_mask) {

15387

lock.lock();

15388

try {

15389

_gdk_window_set_events(window, event_mask);

15390

@@ -4977,8 +4977,8 @@

15391

* @param pixmap cast=(GdkPixmap *)

15392

* @param mask cast=(GdkBitmap *)

15393

*/

15394

-public static final native void _gdk_window_set_icon(int /*long*/ window, int /*long*/ icon_window, int /*long*/ pixmap, int /*long*/ mask);

15395

-public static final void gdk_window_set_icon(int /*long*/ window, int /*long*/ icon_window, int /*long*/ pixmap, int /*long*/ mask) {

15396

+public static final native void _gdk_window_set_icon(long /*int*/ window, long /*int*/ icon_window, long /*int*/ pixmap, long /*int*/ mask);

15397

+public static final void gdk_window_set_icon(long /*int*/ window, long /*int*/ icon_window, long /*int*/ pixmap, long /*int*/ mask) {

15398

lock.lock();

15399

try {

15400

_gdk_window_set_icon(window, icon_window, pixmap, mask);

15401

@@ -4990,8 +4990,8 @@

15402

* @param window cast=(GdkWindow *)

15403

* @param pixbufs cast=(GList *)

15404

*/

15405

-public static final native void _gdk_window_set_icon_list(int /*long*/ window, int /*long*/ pixbufs);

15406

-public static final void gdk_window_set_icon_list(int /*long*/ window, int /*long*/ pixbufs) {

15407

+public static final native void _gdk_window_set_icon_list(long /*int*/ window, long /*int*/ pixbufs);

15408

+public static final void gdk_window_set_icon_list(long /*int*/ window, long /*int*/ pixbufs) {

15409

lock.lock();

15410

try {

15411

_gdk_window_set_icon_list(window, pixbufs);

15412

@@ -5004,8 +5004,8 @@

15413

* @param window cast=(GdkWindow *)

15414

* @param setting cast=(gboolean)

15415

*/

15416

-public static final native void _gdk_window_set_keep_above(int /*long*/ window, boolean setting);

15417

-public static final void gdk_window_set_keep_above(int /*long*/ window, boolean setting) {

15418

+public static final native void _gdk_window_set_keep_above(long /*int*/ window, boolean setting);

15419

+public static final void gdk_window_set_keep_above(long /*int*/ window, boolean setting) {

15420

lock.lock();

15421

try {

15422

_gdk_window_set_keep_above(window, setting);

15423

@@ -5017,8 +5017,8 @@

15424

* @param window cast=(GdkWindow *)

15425

* @param override_redirect cast=(gboolean)

15426

*/

15427

-public static final native void _gdk_window_set_override_redirect(int /*long*/ window, boolean override_redirect);

15428

-public static final void gdk_window_set_override_redirect(int /*long*/ window, boolean override_redirect) {

15429

+public static final native void _gdk_window_set_override_redirect(long /*int*/ window, boolean override_redirect);

15430

+public static final void gdk_window_set_override_redirect(long /*int*/ window, boolean override_redirect) {

15431

lock.lock();

15432

try {

15433

_gdk_window_set_override_redirect(window, override_redirect);

15434

@@ -5030,8 +5030,8 @@

15435

* @param window cast=(GdkWindow *)

15436

* @param user_data cast=(gpointer)

15437

*/

15438

-public static final native void _gdk_window_set_user_data(int /*long*/ window, int /*long*/ user_data);

15439

-public static final void gdk_window_set_user_data(int /*long*/ window, int /*long*/ user_data) {

15440

+public static final native void _gdk_window_set_user_data(long /*int*/ window, long /*int*/ user_data);

15441

+public static final void gdk_window_set_user_data(long /*int*/ window, long /*int*/ user_data) {

15442

lock.lock();

15443

try {

15444

_gdk_window_set_user_data(window, user_data);

15445

@@ -5043,8 +5043,8 @@

15446

* @param window cast=(GdkWindow *)

15447

* @param shape_region cast=(GdkRegion *)

15448

*/

15449

-public static final native void _gdk_window_shape_combine_region (int /*long*/ window, int /*long*/ shape_region, int offset_x, int offset_y);

15450

-public static final void gdk_window_shape_combine_region (int /*long*/ window, int /*long*/ shape_region, int offset_x, int offset_y) {

15451

+public static final native void _gdk_window_shape_combine_region (long /*int*/ window, long /*int*/ shape_region, int offset_x, int offset_y);

15452

+public static final void gdk_window_shape_combine_region (long /*int*/ window, long /*int*/ shape_region, int offset_x, int offset_y) {

15453

lock.lock();

15454

try {

15455

_gdk_window_shape_combine_region(window, shape_region, offset_x, offset_y);

15456

@@ -5053,8 +5053,8 @@

15457

}

15458

}

15459

/** @param window cast=(GdkWindow *) */

15460

-public static final native void _gdk_window_show(int /*long*/ window);

15461

-public static final void gdk_window_show(int /*long*/ window) {

15462

+public static final native void _gdk_window_show(long /*int*/ window);

15463

+public static final void gdk_window_show(long /*int*/ window) {

15464

lock.lock();

15465

try {

15466

_gdk_window_show(window);

15467

@@ -5063,8 +5063,8 @@

15468

}

15469

}

15470

/** @param window cast=(GdkWindow *) */

15471

-public static final native void _gdk_window_show_unraised(int /*long*/ window);

15472

-public static final void gdk_window_show_unraised(int /*long*/ window) {

15473

+public static final native void _gdk_window_show_unraised(long /*int*/ window);

15474

+public static final void gdk_window_show_unraised(long /*int*/ window) {

15475

lock.lock();

15476

try {

15477

_gdk_window_show_unraised(window);

15478

@@ -5073,8 +5073,8 @@

15479

}

15480

}

15481

/** @param window cast=(GdkWindow *) */

15482

-public static final native void _gdk_window_thaw_updates(int /*long*/ window);

15483

-public static final void gdk_window_thaw_updates(int /*long*/ window) {

15484

+public static final native void _gdk_window_thaw_updates(long /*int*/ window);

15485

+public static final void gdk_window_thaw_updates(long /*int*/ window) {

15486

lock.lock();

15487

try {

15488

_gdk_window_thaw_updates(window);

15489

@@ -5082,8 +5082,8 @@

15490

lock.unlock();

15491

}

15492

}

15493

-public static final native int /*long*/ _gtk_accel_group_new();

15494

-public static final int /*long*/ gtk_accel_group_new() {

15495

+public static final native long /*int*/ _gtk_accel_group_new();

15496

+public static final long /*int*/ gtk_accel_group_new() {

15497

lock.lock();

15498

try {

15499

return _gtk_accel_group_new();

15500

@@ -5096,8 +5096,8 @@

15501

* @param accelKey cast=(guint)

15502

* @param accelMods cast=(GdkModifierType)

15503

*/

15504

-public static final native boolean _gtk_accel_groups_activate(int /*long*/ accelGroup, int accelKey, int accelMods);

15505

-public static final boolean gtk_accel_groups_activate(int /*long*/ accelGroup, int accelKey, int accelMods) {

15506

+public static final native boolean _gtk_accel_groups_activate(long /*int*/ accelGroup, int accelKey, int accelMods);

15507

+public static final boolean gtk_accel_groups_activate(long /*int*/ accelGroup, int accelKey, int accelMods) {

15508

lock.lock();

15509

try {

15510

return _gtk_accel_groups_activate(accelGroup, accelKey, accelMods);

15511

@@ -5109,8 +5109,8 @@

15512

* @param accel_label cast=(GtkAccelLabel *)

15513

* @param accel_widget cast=(GtkWidget *)

15514

*/

15515

-public static final native void _gtk_accel_label_set_accel_widget(int /*long*/ accel_label, int /*long*/ accel_widget);

15516

-public static final void gtk_accel_label_set_accel_widget(int /*long*/ accel_label, int /*long*/ accel_widget) {

15517

+public static final native void _gtk_accel_label_set_accel_widget(long /*int*/ accel_label, long /*int*/ accel_widget);

15518

+public static final void gtk_accel_label_set_accel_widget(long /*int*/ accel_label, long /*int*/ accel_widget) {

15519

lock.lock();

15520

try {

15521

_gtk_accel_label_set_accel_widget(accel_label, accel_widget);

15522

@@ -5119,8 +5119,8 @@

15523

}

15524

}

15525

/** @param adjustment cast=(GtkAdjustment *) */

15526

-public static final native void _gtk_adjustment_changed(int /*long*/ adjustment);

15527

-public static final void gtk_adjustment_changed(int /*long*/ adjustment) {

15528

+public static final native void _gtk_adjustment_changed(long /*int*/ adjustment);

15529

+public static final void gtk_adjustment_changed(long /*int*/ adjustment) {

15530

lock.lock();

15531

try {

15532

_gtk_adjustment_changed(adjustment);

15533

@@ -5135,8 +5135,8 @@

15534

* @param step_increment cast=(gdouble)

15535

* @param page_increment cast=(gdouble)

15536

*/

15537

-public static final native int /*long*/ _gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size);

15538

-public static final int /*long*/ gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size) {

15539

+public static final native long /*int*/ _gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size);

15540

+public static final long /*int*/ gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size) {

15541

lock.lock();

15542

try {

15543

return _gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size);

15544

@@ -5148,8 +5148,8 @@

15545

* @param adjustment cast=(GtkAdjustment *)

15546

* @param value cast=(gdouble)

15547

*/

15548

-public static final native void _gtk_adjustment_set_value(int /*long*/ adjustment, double value);

15549

-public static final void gtk_adjustment_set_value(int /*long*/ adjustment, double value) {

15550

+public static final native void _gtk_adjustment_set_value(long /*int*/ adjustment, double value);

15551

+public static final void gtk_adjustment_set_value(long /*int*/ adjustment, double value) {

15552

lock.lock();

15553

try {

15554

_gtk_adjustment_set_value(adjustment, value);

15555

@@ -5158,8 +5158,8 @@

15556

}

15557

}

15558

/** @param adjustment cast=(GtkAdjustment *) */

15559

-public static final native void _gtk_adjustment_value_changed(int /*long*/ adjustment);

15560

-public static final void gtk_adjustment_value_changed(int /*long*/ adjustment) {

15561

+public static final native void _gtk_adjustment_value_changed(long /*int*/ adjustment);

15562

+public static final void gtk_adjustment_value_changed(long /*int*/ adjustment) {

15563

lock.lock();

15564

try {

15565

_gtk_adjustment_value_changed(adjustment);

15566

@@ -5171,8 +5171,8 @@

15567

* @param arrow_type cast=(GtkArrowType)

15568

* @param shadow_type cast=(GtkShadowType)

15569

*/

15570

-public static final native int /*long*/ _gtk_arrow_new(int arrow_type, int shadow_type);

15571

-public static final int /*long*/ gtk_arrow_new(int arrow_type, int shadow_type) {

15572

+public static final native long /*int*/ _gtk_arrow_new(int arrow_type, int shadow_type);

15573

+public static final long /*int*/ gtk_arrow_new(int arrow_type, int shadow_type) {

15574

lock.lock();

15575

try {

15576

return _gtk_arrow_new(arrow_type, shadow_type);

15577

@@ -5185,8 +5185,8 @@

15578

* @param arrow_type cast=(GtkArrowType)

15579

* @param shadow_type cast=(GtkShadowType)

15580

*/

15581

-public static final native void _gtk_arrow_set(int /*long*/ arrow, int arrow_type, int shadow_type);

15582

-public static final void gtk_arrow_set(int /*long*/ arrow, int arrow_type, int shadow_type) {

15583

+public static final native void _gtk_arrow_set(long /*int*/ arrow, int arrow_type, int shadow_type);

15584

+public static final void gtk_arrow_set(long /*int*/ arrow, int arrow_type, int shadow_type) {

15585

lock.lock();

15586

try {

15587

_gtk_arrow_set(arrow, arrow_type, shadow_type);

15588

@@ -5195,8 +5195,8 @@

15589

}

15590

}

15591

/** @param bin cast=(GtkBin *) */

15592

-public static final native int /*long*/ _gtk_bin_get_child(int /*long*/ bin);

15593

-public static final int /*long*/ gtk_bin_get_child(int /*long*/ bin) {

15594

+public static final native long /*int*/ _gtk_bin_get_child(long /*int*/ bin);

15595

+public static final long /*int*/ gtk_bin_get_child(long /*int*/ bin) {

15596

lock.lock();

15597

try {

15598

return _gtk_bin_get_child(bin);

15599

@@ -5205,8 +5205,8 @@

15600

}

15601

}

15602

/** @param border cast=(GtkBorder *) */

15603

-public static final native void _gtk_border_free(int /*long*/ border);

15604

-public static final void gtk_border_free(int /*long*/ border) {

15605

+public static final native void _gtk_border_free(long /*int*/ border);

15606

+public static final void gtk_border_free(long /*int*/ border) {

15607

lock.lock();

15608

try {

15609

_gtk_border_free(border);

15610

@@ -5215,8 +5215,8 @@

15611

}

15612

}

15613

/** @param box cast=(GtkBox *) */

15614

-public static final native void _gtk_box_set_spacing(int /*long*/ box, int spacing);

15615

-public static final void gtk_box_set_spacing(int /*long*/ box, int spacing) {

15616

+public static final native void _gtk_box_set_spacing(long /*int*/ box, int spacing);

15617

+public static final void gtk_box_set_spacing(long /*int*/ box, int spacing) {

15618

lock.lock();

15619

try {

15620

_gtk_box_set_spacing(box, spacing);

15621

@@ -5228,8 +5228,8 @@

15622

* @param box cast=(GtkBox *)

15623

* @param child cast=(GtkWidget *)

15624

*/

15625

-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);

15626

-public static final void gtk_box_set_child_packing(int /*long*/ box, int /*long*/ child, boolean expand, boolean fill, int padding, int pack_type) {

15627

+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);

15628

+public static final void gtk_box_set_child_packing(long /*int*/ box, long /*int*/ child, boolean expand, boolean fill, int padding, int pack_type) {

15629

lock.lock();

15630

try {

15631

_gtk_box_set_child_packing(box, child, expand, fill, padding, pack_type);

15632

@@ -5238,8 +5238,8 @@

15633

}

15634

}

15635

/** @param button cast=(GtkButton *) */

15636

-public static final native void _gtk_button_clicked(int /*long*/ button);

15637

-public static final void gtk_button_clicked(int /*long*/ button) {

15638

+public static final native void _gtk_button_clicked(long /*int*/ button);

15639

+public static final void gtk_button_clicked(long /*int*/ button) {

15640

lock.lock();

15641

try {

15642

_gtk_button_clicked(button);

15643

@@ -5248,8 +5248,8 @@

15644

}

15645

}

15646

/** @param button cast=(GtkButton *) */

15647

-public static final native int _gtk_button_get_relief(int /*long*/ button);

15648

-public static final int gtk_button_get_relief(int /*long*/ button) {

15649

+public static final native int _gtk_button_get_relief(long /*int*/ button);

15650

+public static final int gtk_button_get_relief(long /*int*/ button) {

15651

lock.lock();

15652

try {

15653

return _gtk_button_get_relief(button);

15654

@@ -5257,8 +5257,8 @@

15655

lock.unlock();

15656

}

15657

}

15658

-public static final native int /*long*/ _gtk_button_new();

15659

-public static final int /*long*/ gtk_button_new() {

15660

+public static final native long /*int*/ _gtk_button_new();

15661

+public static final long /*int*/ gtk_button_new() {

15662

lock.lock();

15663

try {

15664

return _gtk_button_new();

15665

@@ -5270,8 +5270,8 @@

15666

* @param button cast=(GtkButton *)

15667

* @param newstyle cast=(GtkReliefStyle)

15668

*/

15669

-public static final native void _gtk_button_set_relief(int /*long*/ button, int newstyle);

15670

-public static final void gtk_button_set_relief(int /*long*/ button, int newstyle) {

15671

+public static final native void _gtk_button_set_relief(long /*int*/ button, int newstyle);

15672

+public static final void gtk_button_set_relief(long /*int*/ button, int newstyle) {

15673

lock.lock();

15674

try {

15675

_gtk_button_set_relief(button, newstyle);

15676

@@ -5280,8 +5280,8 @@

15677

}

15678

}

15679

/** @method flags=dynamic */

15680

-public static final native int /*long*/ _gtk_calendar_new();

15681

-public static final int /*long*/ gtk_calendar_new() {

15682

+public static final native long /*int*/ _gtk_calendar_new();

15683

+public static final long /*int*/ gtk_calendar_new() {

15684

lock.lock();

15685

try {

15686

return _gtk_calendar_new();

15687

@@ -5295,8 +5295,8 @@

15688

* @param month cast=(guint)

15689

* @param year cast=(guint)

15690

*/

15691

-public static final native boolean /*long*/ _gtk_calendar_select_month(int /*long*/ calendar, int month, int year);

15692

-public static final boolean /*long*/ gtk_calendar_select_month(int /*long*/ calendar, int month, int year) {

15693

+public static final native boolean /*long*/ _gtk_calendar_select_month(long /*int*/ calendar, int month, int year);

15694

+public static final boolean /*long*/ gtk_calendar_select_month(long /*int*/ calendar, int month, int year) {

15695

lock.lock();

15696

try {

15697

return _gtk_calendar_select_month(calendar, month, year);

15698

@@ -5309,8 +5309,8 @@

15699

* @param calendar cast=(GtkCalendar *)

15700

* @param day cast=(guint)

15701

*/

15702

-public static final native void _gtk_calendar_select_day(int /*long*/ calendar, int day);

15703

-public static final void gtk_calendar_select_day(int /*long*/ calendar, int day) {

15704

+public static final native void _gtk_calendar_select_day(long /*int*/ calendar, int day);

15705

+public static final void gtk_calendar_select_day(long /*int*/ calendar, int day) {

15706

lock.lock();

15707

try {

15708

_gtk_calendar_select_day(calendar, day);

15709

@@ -5323,8 +5323,8 @@

15710

* @param calendar cast=(GtkCalendar *)

15711

* @param flags cast=(GtkCalendarDisplayOptions)

15712

*/

15713

-public static final native void _gtk_calendar_set_display_options(int /*long*/ calendar, int flags);

15714

-public static final void gtk_calendar_set_display_options(int /*long*/ calendar, int flags) {

15715

+public static final native void _gtk_calendar_set_display_options(long /*int*/ calendar, int flags);

15716

+public static final void gtk_calendar_set_display_options(long /*int*/ calendar, int flags) {

15717

lock.lock();

15718

try {

15719

_gtk_calendar_set_display_options(calendar, flags);

15720

@@ -5337,8 +5337,8 @@

15721

* @param calendar cast=(GtkCalendar *)

15722

* @param flags cast=(GtkCalendarDisplayOptions)

15723

*/

15724

-public static final native void _gtk_calendar_display_options(int /*long*/ calendar, int flags);

15725

-public static final void gtk_calendar_display_options(int /*long*/ calendar, int flags) {

15726

+public static final native void _gtk_calendar_display_options(long /*int*/ calendar, int flags);

15727

+public static final void gtk_calendar_display_options(long /*int*/ calendar, int flags) {

15728

lock.lock();

15729

try {

15730

_gtk_calendar_display_options(calendar, flags);

15731

@@ -5353,8 +5353,8 @@

15732

* @param month cast=(guint *)

15733

* @param day cast=(guint *)

15734

*/

15735

-public static final native void _gtk_calendar_get_date(int /*long*/ calendar, int[] year, int[] month, int[] day);

15736

-public static final void gtk_calendar_get_date(int /*long*/ calendar, int[] year, int[] month, int[] day) {

15737

+public static final native void _gtk_calendar_get_date(long /*int*/ calendar, int[] year, int[] month, int[] day);

15738

+public static final void gtk_calendar_get_date(long /*int*/ calendar, int[] year, int[] month, int[] day) {

15739

lock.lock();

15740

try {

15741

_gtk_calendar_get_date(calendar, year, month, day);

15742

@@ -5363,8 +5363,8 @@

15743

}

15744

}

15745

/** @method flags=dynamic */

15746

-public static final native void _gtk_cell_layout_clear(int /*long*/ cell_layout);

15747

-public static final void gtk_cell_layout_clear(int /*long*/ cell_layout) {

15748

+public static final native void _gtk_cell_layout_clear(long /*int*/ cell_layout);

15749

+public static final void gtk_cell_layout_clear(long /*int*/ cell_layout) {

15750

lock.lock();

15751

try {

15752

_gtk_cell_layout_clear(cell_layout);

15753

@@ -5373,8 +5373,8 @@

15754

}

15755

}

15756

/** @method flags=no_gen */

15757

-public static final native void _gtk_cell_layout_set_attributes(int /*long*/ cell_layout, int /*long*/ cell, byte[] attribute, int column, int /*long*/ sentinel);

15758

-public static final void gtk_cell_layout_set_attributes(int /*long*/ cell_layout, int /*long*/ cell, byte[] attribute, int column, int /*long*/ sentinel) {

15759

+public static final native void _gtk_cell_layout_set_attributes(long /*int*/ cell_layout, long /*int*/ cell, byte[] attribute, int column, long /*int*/ sentinel);

15760

+public static final void gtk_cell_layout_set_attributes(long /*int*/ cell_layout, long /*int*/ cell, byte[] attribute, int column, long /*int*/ sentinel) {

15761

lock.lock();

15762

try {

15763

_gtk_cell_layout_set_attributes(cell_layout, cell, attribute, column, sentinel);

15764

@@ -5383,8 +5383,8 @@

15765

}

15766

}

15767

/** @method flags=dynamic */

15768

-public static final native void _gtk_cell_layout_pack_start(int /*long*/ cell_layout, int /*long*/ cell, boolean expand);

15769

-public static final void gtk_cell_layout_pack_start(int /*long*/ cell_layout, int /*long*/ cell, boolean expand) {

15770

+public static final native void _gtk_cell_layout_pack_start(long /*int*/ cell_layout, long /*int*/ cell, boolean expand);

15771

+public static final void gtk_cell_layout_pack_start(long /*int*/ cell_layout, long /*int*/ cell, boolean expand) {

15772

lock.lock();

15773

try {

15774

_gtk_cell_layout_pack_start(cell_layout, cell, expand);

15775

@@ -5401,8 +5401,8 @@

15776

* @param width cast=(gint *)

15777

* @param height cast=(gint *)

15778

*/

15779

-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);

15780

-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) {

15781

+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);

15782

+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) {

15783

lock.lock();

15784

try {

15785

_gtk_cell_renderer_get_size(cell, widget, area, x_offset, y_offset, width, height);

15786

@@ -5410,8 +5410,8 @@

15787

lock.unlock();

15788

}

15789

}

15790

-public static final native int /*long*/ _gtk_cell_renderer_pixbuf_new();

15791

-public static final int /*long*/ gtk_cell_renderer_pixbuf_new() {

15792

+public static final native long /*int*/ _gtk_cell_renderer_pixbuf_new();

15793

+public static final long /*int*/ gtk_cell_renderer_pixbuf_new() {

15794

lock.lock();

15795

try {

15796

return _gtk_cell_renderer_pixbuf_new();

15797

@@ -5419,8 +5419,8 @@

15798

lock.unlock();

15799

}

15800

}

15801

-public static final native int /*long*/ _gtk_cell_renderer_text_new();

15802

-public static final int /*long*/ gtk_cell_renderer_text_new() {

15803

+public static final native long /*int*/ _gtk_cell_renderer_text_new();

15804

+public static final long /*int*/ gtk_cell_renderer_text_new() {

15805

lock.lock();

15806

try {

15807

return _gtk_cell_renderer_text_new();

15808

@@ -5428,8 +5428,8 @@

15809

lock.unlock();

15810

}

15811

}

15812

-public static final native int /*long*/ _gtk_cell_renderer_toggle_new();

15813

-public static final int /*long*/ gtk_cell_renderer_toggle_new() {

15814

+public static final native long /*int*/ _gtk_cell_renderer_toggle_new();

15815

+public static final long /*int*/ gtk_cell_renderer_toggle_new() {

15816

lock.lock();

15817

try {

15818

return _gtk_cell_renderer_toggle_new();

15819

@@ -5437,8 +5437,8 @@

15820

lock.unlock();

15821

}

15822

}

15823

-public static final native int /*long*/ _gtk_check_button_new();

15824

-public static final int /*long*/ gtk_check_button_new() {

15825

+public static final native long /*int*/ _gtk_check_button_new();

15826

+public static final long /*int*/ gtk_check_button_new() {

15827

lock.lock();

15828

try {

15829

return _gtk_check_button_new();

15830

@@ -5447,8 +5447,8 @@

15831

}

15832

}

15833

/** @param check_menu_item cast=(GtkCheckMenuItem *) */

15834

-public static final native boolean _gtk_check_menu_item_get_active(int /*long*/ check_menu_item);

15835

-public static final boolean gtk_check_menu_item_get_active(int /*long*/ check_menu_item) {

15836

+public static final native boolean _gtk_check_menu_item_get_active(long /*int*/ check_menu_item);

15837

+public static final boolean gtk_check_menu_item_get_active(long /*int*/ check_menu_item) {

15838

lock.lock();

15839

try {

15840

return _gtk_check_menu_item_get_active(check_menu_item);

15841

@@ -5457,8 +5457,8 @@

15842

}

15843

}

15844

/** @param label cast=(const gchar *) */

15845

-public static final native int /*long*/ _gtk_check_menu_item_new_with_label(byte[] label);

15846

-public static final int /*long*/ gtk_check_menu_item_new_with_label(byte[] label) {

15847

+public static final native long /*int*/ _gtk_check_menu_item_new_with_label(byte[] label);

15848

+public static final long /*int*/ gtk_check_menu_item_new_with_label(byte[] label) {

15849

lock.lock();

15850

try {

15851

return _gtk_check_menu_item_new_with_label(label);

15852

@@ -5470,8 +5470,8 @@

15853

* @param wid cast=(GtkCheckMenuItem *)

15854

* @param active cast=(gboolean)

15855

*/

15856

-public static final native void _gtk_check_menu_item_set_active(int /*long*/ wid, boolean active);

15857

-public static final void gtk_check_menu_item_set_active(int /*long*/ wid, boolean active) {

15858

+public static final native void _gtk_check_menu_item_set_active(long /*int*/ wid, boolean active);

15859

+public static final void gtk_check_menu_item_set_active(long /*int*/ wid, boolean active) {

15860

lock.lock();

15861

try {

15862

_gtk_check_menu_item_set_active(wid, active);

15863

@@ -5479,8 +5479,8 @@

15864

lock.unlock();

15865

}

15866

}

15867

-public static final native int /*long*/ _gtk_check_version(int required_major, int required_minor, int required_micro);

15868

-public static final int /*long*/ gtk_check_version(int required_major, int required_minor, int required_micro) {

15869

+public static final native long /*int*/ _gtk_check_version(int required_major, int required_minor, int required_micro);

15870

+public static final long /*int*/ gtk_check_version(int required_major, int required_minor, int required_micro) {

15871

lock.lock();

15872

try {

15873

return _gtk_check_version(required_major, required_minor, required_micro);

15874

@@ -5489,8 +5489,8 @@

15875

}

15876

}

15877

/** @param clipboard cast=(GtkClipboard *) */

15878

-public static final native void _gtk_clipboard_clear(int /*long*/ clipboard);

15879

-public static final void gtk_clipboard_clear(int /*long*/ clipboard) {

15880

+public static final native void _gtk_clipboard_clear(long /*int*/ clipboard);

15881

+public static final void gtk_clipboard_clear(long /*int*/ clipboard) {

15882

lock.lock();

15883

try {

15884

_gtk_clipboard_clear(clipboard);

15885

@@ -5499,8 +5499,8 @@

15886

}

15887

}

15888

/** @param selection cast=(GdkAtom) */

15889

-public static final native int /*long*/ _gtk_clipboard_get(int /*long*/ selection);

15890

-public static final int /*long*/ gtk_clipboard_get(int /*long*/ selection) {

15891

+public static final native long /*int*/ _gtk_clipboard_get(long /*int*/ selection);

15892

+public static final long /*int*/ gtk_clipboard_get(long /*int*/ selection) {

15893

lock.lock();

15894

try {

15895

return _gtk_clipboard_get(selection);

15896

@@ -5516,8 +5516,8 @@

15897

* @param clear_func cast=(GtkClipboardClearFunc)

15898

* @param user_data cast=(GObject *)

15899

*/

15900

-public static final native boolean _gtk_clipboard_set_with_data(int /*long*/ clipboard, int /*long*/ target, int n_targets, int /*long*/ get_func, int /*long*/ clear_func, int /*long*/ user_data);

15901

-public static final boolean gtk_clipboard_set_with_data(int /*long*/ clipboard, int /*long*/ target, int n_targets, int /*long*/ get_func, int /*long*/ clear_func, int /*long*/ user_data) {

15902

+public static final native boolean _gtk_clipboard_set_with_data(long /*int*/ clipboard, long /*int*/ target, int n_targets, long /*int*/ get_func, long /*int*/ clear_func, long /*int*/ user_data);

15903

+public static final boolean gtk_clipboard_set_with_data(long /*int*/ clipboard, long /*int*/ target, int n_targets, long /*int*/ get_func, long /*int*/ clear_func, long /*int*/ user_data) {

15904

lock.lock();

15905

try {

15906

return _gtk_clipboard_set_with_data(clipboard, target, n_targets, get_func, clear_func, user_data);

15907

@@ -5529,8 +5529,8 @@

15908

* @param clipboard cast=(GtkClipboard *)

15909

* @param target cast=(GdkAtom)

15910

*/

15911

-public static final native int /*long*/ _gtk_clipboard_wait_for_contents(int /*long*/ clipboard, int /*long*/ target);

15912

-public static final int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ clipboard, int /*long*/ target) {

15913

+public static final native long /*int*/ _gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target);

15914

+public static final long /*int*/ gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target) {

15915

lock.lock();

15916

try {

15917

return _gtk_clipboard_wait_for_contents(clipboard, target);

15918

@@ -5539,8 +5539,8 @@

15919

}

15920

}

15921

/** @param title cast=(const gchar *) */

15922

-public static final native int /*long*/ _gtk_color_selection_dialog_new(byte[] title);

15923

-public static final int /*long*/ gtk_color_selection_dialog_new(byte[] title) {

15924

+public static final native long /*int*/ _gtk_color_selection_dialog_new(byte[] title);

15925

+public static final long /*int*/ gtk_color_selection_dialog_new(byte[] title) {

15926

lock.lock();

15927

try {

15928

return _gtk_color_selection_dialog_new(title);

15929

@@ -5552,8 +5552,8 @@

15930

* @param colorsel cast=(GtkColorSelection *)

15931

* @param color cast=(GdkColor *),flags=no_in

15932

*/

15933

-public static final native void _gtk_color_selection_get_current_color(int /*long*/ colorsel, GdkColor color);

15934

-public static final void gtk_color_selection_get_current_color(int /*long*/ colorsel, GdkColor color) {

15935

+public static final native void _gtk_color_selection_get_current_color(long /*int*/ colorsel, GdkColor color);

15936

+public static final void gtk_color_selection_get_current_color(long /*int*/ colorsel, GdkColor color) {

15937

lock.lock();

15938

try {

15939

_gtk_color_selection_get_current_color(colorsel, color);

15940

@@ -5565,8 +5565,8 @@

15941

* @param colorsel cast=(GtkColorSelection *)

15942

* @param color cast=(GdkColor *),flags=no_out

15943

*/

15944

-public static final native void _gtk_color_selection_set_current_color(int /*long*/ colorsel, GdkColor color);

15945

-public static final void gtk_color_selection_set_current_color(int /*long*/ colorsel, GdkColor color) {

15946

+public static final native void _gtk_color_selection_set_current_color(long /*int*/ colorsel, GdkColor color);

15947

+public static final void gtk_color_selection_set_current_color(long /*int*/ colorsel, GdkColor color) {

15948

lock.lock();

15949

try {

15950

_gtk_color_selection_set_current_color(colorsel, color);

15951

@@ -5575,8 +5575,8 @@

15952

}

15953

}

15954

/** @param colorsel cast=(GtkColorSelection *) */

15955

-public static final native void _gtk_color_selection_set_has_palette(int /*long*/ colorsel, boolean has_palette);

15956

-public static final void gtk_color_selection_set_has_palette(int /*long*/ colorsel, boolean has_palette) {

15957

+public static final native void _gtk_color_selection_set_has_palette(long /*int*/ colorsel, boolean has_palette);

15958

+public static final void gtk_color_selection_set_has_palette(long /*int*/ colorsel, boolean has_palette) {

15959

lock.lock();

15960

try {

15961

_gtk_color_selection_set_has_palette(colorsel, has_palette);

15962

@@ -5585,8 +5585,8 @@

15963

}

15964

}

15965

/** @param combo cast=(GtkCombo *) */

15966

-public static final native void _gtk_combo_disable_activate(int /*long*/ combo);

15967

-public static final void gtk_combo_disable_activate(int /*long*/ combo) {

15968

+public static final native void _gtk_combo_disable_activate(long /*int*/ combo);

15969

+public static final void gtk_combo_disable_activate(long /*int*/ combo) {

15970

lock.lock();

15971

try {

15972

_gtk_combo_disable_activate(combo);

15973

@@ -5594,8 +5594,8 @@

15974

lock.unlock();

15975

}

15976

}

15977

-public static final native int /*long*/ _gtk_combo_new();

15978

-public static final int /*long*/ gtk_combo_new() {

15979

+public static final native long /*int*/ _gtk_combo_new();

15980

+public static final long /*int*/ gtk_combo_new() {

15981

lock.lock();

15982

try {

15983

return _gtk_combo_new();

15984

@@ -5607,8 +5607,8 @@

15985

* @param combo cast=(GtkCombo *)

15986

* @param val cast=(gboolean)

15987

*/

15988

-public static final native void _gtk_combo_set_case_sensitive(int /*long*/ combo, boolean val);

15989

-public static final void gtk_combo_set_case_sensitive(int /*long*/ combo, boolean val) {

15990

+public static final native void _gtk_combo_set_case_sensitive(long /*int*/ combo, boolean val);

15991

+public static final void gtk_combo_set_case_sensitive(long /*int*/ combo, boolean val) {

15992

lock.lock();

15993

try {

15994

_gtk_combo_set_case_sensitive(combo, val);

15995

@@ -5617,8 +5617,8 @@

15996

}

15997

}

15998

/** @method flags=dynamic */

15999

-public static final native void _gtk_combo_box_set_focus_on_click(int /*long*/ combo, boolean val);

16000

-public static final void gtk_combo_box_set_focus_on_click(int /*long*/ combo, boolean val) {

16001

+public static final native void _gtk_combo_box_set_focus_on_click(long /*int*/ combo, boolean val);

16002

+public static final void gtk_combo_box_set_focus_on_click(long /*int*/ combo, boolean val) {

16003

lock.lock();

16004

try {

16005

_gtk_combo_box_set_focus_on_click(combo, val);

16006

@@ -5630,8 +5630,8 @@

16007

* @param combo cast=(GtkCombo *)

16008

* @param strings cast=(GList *)

16009

*/

16010

-public static final native void _gtk_combo_set_popdown_strings(int /*long*/ combo, int /*long*/ strings);

16011

-public static final void gtk_combo_set_popdown_strings(int /*long*/ combo, int /*long*/ strings) {

16012

+public static final native void _gtk_combo_set_popdown_strings(long /*int*/ combo, long /*int*/ strings);

16013

+public static final void gtk_combo_set_popdown_strings(long /*int*/ combo, long /*int*/ strings) {

16014

lock.lock();

16015

try {

16016

_gtk_combo_set_popdown_strings(combo, strings);

16017

@@ -5640,8 +5640,8 @@

16018

}

16019

}

16020

/** @method flags=dynamic */

16021

-public static final native int /*long*/ _gtk_combo_box_entry_new_text();

16022

-public static final int /*long*/ gtk_combo_box_entry_new_text() {

16023

+public static final native long /*int*/ _gtk_combo_box_entry_new_text();

16024

+public static final long /*int*/ gtk_combo_box_entry_new_text() {

16025

lock.lock();

16026

try {

16027

return _gtk_combo_box_entry_new_text();

16028

@@ -5650,8 +5650,8 @@

16029

}

16030

}

16031

/** @method flags=dynamic */

16032

-public static final native int /*long*/ _gtk_combo_box_new_text();

16033

-public static final int /*long*/ gtk_combo_box_new_text() {

16034

+public static final native long /*int*/ _gtk_combo_box_new_text();

16035

+public static final long /*int*/ gtk_combo_box_new_text() {

16036

lock.lock();

16037

try {

16038

return _gtk_combo_box_new_text();

16039

@@ -5660,8 +5660,8 @@

16040

}

16041

}

16042

/** @method flags=dynamic */

16043

-public static final native void _gtk_combo_box_insert_text(int /*long*/ combo_box, int position, byte[] text);

16044

-public static final void gtk_combo_box_insert_text(int /*long*/ combo_box, int position, byte[] text) {

16045

+public static final native void _gtk_combo_box_insert_text(long /*int*/ combo_box, int position, byte[] text);

16046

+public static final void gtk_combo_box_insert_text(long /*int*/ combo_box, int position, byte[] text) {

16047

lock.lock();

16048

try {

16049

_gtk_combo_box_insert_text(combo_box, position, text);

16050

@@ -5670,8 +5670,8 @@

16051

}

16052

}

16053

/** @method flags=dynamic */

16054

-public static final native void _gtk_combo_box_remove_text(int /*long*/ combo_box, int position);

16055

-public static final void gtk_combo_box_remove_text(int /*long*/ combo_box, int position) {

16056

+public static final native void _gtk_combo_box_remove_text(long /*int*/ combo_box, int position);

16057

+public static final void gtk_combo_box_remove_text(long /*int*/ combo_box, int position) {

16058

lock.lock();

16059

try {

16060

_gtk_combo_box_remove_text(combo_box, position);

16061

@@ -5680,8 +5680,8 @@

16062

}

16063

}

16064

/** @method flags=dynamic */

16065

-public static final native int _gtk_combo_box_get_active(int /*long*/ combo_box);

16066

-public static final int gtk_combo_box_get_active(int /*long*/ combo_box) {

16067

+public static final native int _gtk_combo_box_get_active(long /*int*/ combo_box);

16068

+public static final int gtk_combo_box_get_active(long /*int*/ combo_box) {

16069

lock.lock();

16070

try {

16071

return _gtk_combo_box_get_active(combo_box);

16072

@@ -5690,8 +5690,8 @@

16073

}

16074

}

16075

/** @method flags=dynamic */

16076

-public static final native int /*long*/ _gtk_combo_box_get_model(int /*long*/ combo_box);

16077

-public static final int /*long*/ gtk_combo_box_get_model(int /*long*/ combo_box) {

16078

+public static final native long /*int*/ _gtk_combo_box_get_model(long /*int*/ combo_box);

16079

+public static final long /*int*/ gtk_combo_box_get_model(long /*int*/ combo_box) {

16080

lock.lock();

16081

try {

16082

return _gtk_combo_box_get_model(combo_box);

16083

@@ -5700,8 +5700,8 @@

16084

}

16085

}

16086

/** @method flags=dynamic */

16087

-public static final native void _gtk_combo_box_set_active(int /*long*/ combo_box, int index);

16088

-public static final void gtk_combo_box_set_active(int /*long*/ combo_box, int index) {

16089

+public static final native void _gtk_combo_box_set_active(long /*int*/ combo_box, int index);

16090

+public static final void gtk_combo_box_set_active(long /*int*/ combo_box, int index) {

16091

lock.lock();

16092

try {

16093

_gtk_combo_box_set_active(combo_box, index);

16094

@@ -5710,8 +5710,8 @@

16095

}

16096

}

16097

/** @method flags=dynamic */

16098

-public static final native void _gtk_combo_box_popup(int /*long*/ combo_box);

16099

-public static final void gtk_combo_box_popup(int /*long*/ combo_box) {

16100

+public static final native void _gtk_combo_box_popup(long /*int*/ combo_box);

16101

+public static final void gtk_combo_box_popup(long /*int*/ combo_box) {

16102

lock.lock();

16103

try {

16104

_gtk_combo_box_popup(combo_box);

16105

@@ -5720,8 +5720,8 @@

16106

}

16107

}

16108

/** @method flags=dynamic */

16109

-public static final native void _gtk_combo_box_popdown(int /*long*/ combo_box);

16110

-public static final void gtk_combo_box_popdown(int /*long*/ combo_box) {

16111

+public static final native void _gtk_combo_box_popdown(long /*int*/ combo_box);

16112

+public static final void gtk_combo_box_popdown(long /*int*/ combo_box) {

16113

lock.lock();

16114

try {

16115

_gtk_combo_box_popdown(combo_box);

16116

@@ -5733,8 +5733,8 @@

16117

* @param container cast=(GtkContainer *)

16118

* @param widget cast=(GtkWidget *)

16119

*/

16120

-public static final native void _gtk_container_add(int /*long*/ container, int /*long*/ widget);

16121

-public static final void gtk_container_add(int /*long*/ container, int /*long*/ widget) {

16122

+public static final native void _gtk_container_add(long /*int*/ container, long /*int*/ widget);

16123

+public static final void gtk_container_add(long /*int*/ container, long /*int*/ widget) {

16124

lock.lock();

16125

try {

16126

_gtk_container_add(container, widget);

16127

@@ -5747,8 +5747,8 @@

16128

* @param callback cast=(GtkCallback)

16129

* @param callback_data cast=(gpointer)

16130

*/

16131

-public static final native void _gtk_container_forall(int /*long*/ container, int /*long*/ callback, int /*long*/ callback_data);

16132

-public static final void gtk_container_forall(int /*long*/ container, int /*long*/ callback, int /*long*/ callback_data) {

16133

+public static final native void _gtk_container_forall(long /*int*/ container, long /*int*/ callback, long /*int*/ callback_data);

16134

+public static final void gtk_container_forall(long /*int*/ container, long /*int*/ callback, long /*int*/ callback_data) {

16135

lock.lock();

16136

try {

16137

_gtk_container_forall(container, callback, callback_data);

16138

@@ -5757,8 +5757,8 @@

16139

}

16140

}

16141

/** @param container cast=(GtkContainer *) */

16142

-public static final native int _gtk_container_get_border_width(int /*long*/ container);

16143

-public static final int gtk_container_get_border_width(int /*long*/ container) {

16144

+public static final native int _gtk_container_get_border_width(long /*int*/ container);

16145

+public static final int gtk_container_get_border_width(long /*int*/ container) {

16146

lock.lock();

16147

try {

16148

return _gtk_container_get_border_width(container);

16149

@@ -5767,8 +5767,8 @@

16150

}

16151

}

16152

/** @param container cast=(GtkContainer *) */

16153

-public static final native int /*long*/ _gtk_container_get_children(int /*long*/ container);

16154

-public static final int /*long*/ gtk_container_get_children(int /*long*/ container) {

16155

+public static final native long /*int*/ _gtk_container_get_children(long /*int*/ container);

16156

+public static final long /*int*/ gtk_container_get_children(long /*int*/ container) {

16157

lock.lock();

16158

try {

16159

return _gtk_container_get_children(container);

16160

@@ -5780,8 +5780,8 @@

16161

* @param container cast=(GtkContainer *)

16162

* @param widget cast=(GtkWidget *)

16163

*/

16164

-public static final native void _gtk_container_remove(int /*long*/ container, int /*long*/ widget);

16165

-public static final void gtk_container_remove(int /*long*/ container, int /*long*/ widget) {

16166

+public static final native void _gtk_container_remove(long /*int*/ container, long /*int*/ widget);

16167

+public static final void gtk_container_remove(long /*int*/ container, long /*int*/ widget) {

16168

lock.lock();

16169

try {

16170

_gtk_container_remove(container, widget);

16171

@@ -5790,8 +5790,8 @@

16172

}

16173

}

16174

/** @param container cast=(GtkContainer *) */

16175

-public static final native void _gtk_container_resize_children(int /*long*/ container);

16176

-public static final void gtk_container_resize_children(int /*long*/ container) {

16177

+public static final native void _gtk_container_resize_children(long /*int*/ container);

16178

+public static final void gtk_container_resize_children(long /*int*/ container) {

16179

lock.lock();

16180

try {

16181

_gtk_container_resize_children(container);

16182

@@ -5803,8 +5803,8 @@

16183

* @param container cast=(GtkContainer *)

16184

* @param border_width cast=(guint)

16185

*/

16186

-public static final native void _gtk_container_set_border_width(int /*long*/ container, int border_width);

16187

-public static final void gtk_container_set_border_width(int /*long*/ container, int border_width) {

16188

+public static final native void _gtk_container_set_border_width(long /*int*/ container, int border_width);

16189

+public static final void gtk_container_set_border_width(long /*int*/ container, int border_width) {

16190

lock.lock();

16191

try {

16192

_gtk_container_set_border_width(container, border_width);

16193

@@ -5817,8 +5817,8 @@

16194

* @param button_text cast=(const gchar *)

16195

* @param response_id cast=(gint)

16196

*/

16197

-public static final native int /*long*/ _gtk_dialog_add_button(int /*long*/ dialog, byte[] button_text, int response_id);

16198

-public static final int /*long*/ gtk_dialog_add_button(int /*long*/ dialog, byte[] button_text, int response_id) {

16199

+public static final native long /*int*/ _gtk_dialog_add_button(long /*int*/ dialog, byte[] button_text, int response_id);

16200

+public static final long /*int*/ gtk_dialog_add_button(long /*int*/ dialog, byte[] button_text, int response_id) {

16201

lock.lock();

16202

try {

16203

return _gtk_dialog_add_button(dialog, button_text, response_id);

16204

@@ -5827,8 +5827,8 @@

16205

}

16206

}

16207

/** @param dialog cast=(GtkDialog *) */

16208

-public static final native int _gtk_dialog_run(int /*long*/ dialog);

16209

-public static final int gtk_dialog_run(int /*long*/ dialog) {

16210

+public static final native int _gtk_dialog_run(long /*int*/ dialog);

16211

+public static final int gtk_dialog_run(long /*int*/ dialog) {

16212

lock.lock();

16213

try {

16214

return _gtk_dialog_run(dialog);

16215

@@ -5843,8 +5843,8 @@

16216

* @param button cast=(gint)

16217

* @param event cast=(GdkEvent *)

16218

*/

16219

-public static final native int /*long*/ _gtk_drag_begin(int /*long*/ widget, int /*long*/ targets, int actions, int button, int /*long*/ event);

16220

-public static final int /*long*/ gtk_drag_begin(int /*long*/ widget, int /*long*/ targets, int actions, int button, int /*long*/ event) {

16221

+public static final native long /*int*/ _gtk_drag_begin(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event);

16222

+public static final long /*int*/ gtk_drag_begin(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event) {

16223

lock.lock();

16224

try {

16225

return _gtk_drag_begin(widget, targets, actions, button, event);

16226

@@ -5859,8 +5859,8 @@

16227

* @param current_x cast=(gint)

16228

* @param current_y cast=(gint)

16229

*/

16230

-public static final native boolean _gtk_drag_check_threshold(int /*long*/ widget, int start_x, int start_y, int current_x, int current_y);

16231

-public static final boolean gtk_drag_check_threshold(int /*long*/ widget, int start_x, int start_y, int current_x, int current_y) {

16232

+public static final native boolean _gtk_drag_check_threshold(long /*int*/ widget, int start_x, int start_y, int current_x, int current_y);

16233

+public static final boolean gtk_drag_check_threshold(long /*int*/ widget, int start_x, int start_y, int current_x, int current_y) {

16234

lock.lock();

16235

try {

16236

return _gtk_drag_check_threshold(widget, start_x, start_y, current_x, current_y);

16237

@@ -5873,8 +5873,8 @@

16238

* @param context cast=(GdkDragContext *)

16239

* @param target_list cast=(GtkTargetList *)

16240

*/

16241

-public static final native int /*long*/ _gtk_drag_dest_find_target(int /*long*/ widget, int /*long*/ context, int /*long*/ target_list);

16242

-public static final int /*long*/ gtk_drag_dest_find_target(int /*long*/ widget, int /*long*/ context, int /*long*/ target_list) {

16243

+public static final native long /*int*/ _gtk_drag_dest_find_target(long /*int*/ widget, long /*int*/ context, long /*int*/ target_list);

16244

+public static final long /*int*/ gtk_drag_dest_find_target(long /*int*/ widget, long /*int*/ context, long /*int*/ target_list) {

16245

lock.lock();

16246

try {

16247

return _gtk_drag_dest_find_target(widget, context, target_list);

16248

@@ -5889,8 +5889,8 @@

16249

* @param n_targets cast=(gint)

16250

* @param actions cast=(GdkDragAction)

16251

*/

16252

-public static final native void _gtk_drag_dest_set(int /*long*/ widget, int flags, int /*long*/ targets, int n_targets, int actions);

16253

-public static final void gtk_drag_dest_set(int /*long*/ widget, int flags, int /*long*/ targets, int n_targets, int actions) {

16254

+public static final native void _gtk_drag_dest_set(long /*int*/ widget, int flags, long /*int*/ targets, int n_targets, int actions);

16255

+public static final void gtk_drag_dest_set(long /*int*/ widget, int flags, long /*int*/ targets, int n_targets, int actions) {

16256

lock.lock();

16257

try {

16258

_gtk_drag_dest_set(widget, flags, targets, n_targets, actions);

16259

@@ -5899,8 +5899,8 @@

16260

}

16261

}

16262

/** @param widget cast=(GtkWidget *) */

16263

-public static final native void _gtk_drag_dest_unset(int /*long*/ widget);

16264

-public static final void gtk_drag_dest_unset(int /*long*/ widget) {

16265

+public static final native void _gtk_drag_dest_unset(long /*int*/ widget);

16266

+public static final void gtk_drag_dest_unset(long /*int*/ widget) {

16267

lock.lock();

16268

try {

16269

_gtk_drag_dest_unset(widget);

16270

@@ -5914,8 +5914,8 @@

16271

* @param delete cast=(gboolean)

16272

* @param time cast=(guint32)

16273

*/

16274

-public static final native void _gtk_drag_finish(int /*long*/ context, boolean success, boolean delete, int time);

16275

-public static final void gtk_drag_finish(int /*long*/ context, boolean success, boolean delete, int time) {

16276

+public static final native void _gtk_drag_finish(long /*int*/ context, boolean success, boolean delete, int time);

16277

+public static final void gtk_drag_finish(long /*int*/ context, boolean success, boolean delete, int time) {

16278

lock.lock();

16279

try {

16280

_gtk_drag_finish(context, success, delete, time);

16281

@@ -5929,8 +5929,8 @@

16282

* @param target cast=(GdkAtom)

16283

* @param time cast=(guint32)

16284

*/

16285

-public static final native void _gtk_drag_get_data(int /*long*/ widget, int /*long*/ context, int /*long*/ target, int time);

16286

-public static final void gtk_drag_get_data(int /*long*/ widget, int /*long*/ context, int /*long*/ target, int time) {

16287

+public static final native void _gtk_drag_get_data(long /*int*/ widget, long /*int*/ context, long /*int*/ target, int time);

16288

+public static final void gtk_drag_get_data(long /*int*/ widget, long /*int*/ context, long /*int*/ target, int time) {

16289

lock.lock();

16290

try {

16291

_gtk_drag_get_data(widget, context, target, time);

16292

@@ -5942,8 +5942,8 @@

16293

* @param context cast=(GdkDragContext *)

16294

* @param pixbuf cast=(GdkPixbuf *)

16295

*/

16296

-public static final native void _gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*long*/ pixbuf, int hot_x, int hot_y);

16297

-public static final void gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*long*/ pixbuf, int hot_x, int hot_y) {

16298

+public static final native void _gtk_drag_set_icon_pixbuf(long /*int*/ context, long /*int*/ pixbuf, int hot_x, int hot_y);

16299

+public static final void gtk_drag_set_icon_pixbuf(long /*int*/ context, long /*int*/ pixbuf, int hot_x, int hot_y) {

16300

lock.lock();

16301

try {

16302

_gtk_drag_set_icon_pixbuf(context, pixbuf, hot_x, hot_y);

16303

@@ -5951,8 +5951,8 @@

16304

lock.unlock();

16305

}

16306

}

16307

-public static final native int /*long*/ _gtk_drawing_area_new();

16308

-public static final int /*long*/ gtk_drawing_area_new() {

16309

+public static final native long /*int*/ _gtk_drawing_area_new();

16310

+public static final long /*int*/ gtk_drawing_area_new() {

16311

lock.lock();

16312

try {

16313

return _gtk_drawing_area_new();

16314

@@ -5961,8 +5961,8 @@

16315

}

16316

}

16317

/** @param editable cast=(GtkEditable *) */

16318

-public static final native void _gtk_editable_copy_clipboard(int /*long*/ editable);

16319

-public static final void gtk_editable_copy_clipboard(int /*long*/ editable) {

16320

+public static final native void _gtk_editable_copy_clipboard(long /*int*/ editable);

16321

+public static final void gtk_editable_copy_clipboard(long /*int*/ editable) {

16322

lock.lock();

16323

try {

16324

_gtk_editable_copy_clipboard(editable);

16325

@@ -5971,8 +5971,8 @@

16326

}

16327

}

16328

/** @param editable cast=(GtkEditable *) */

16329

-public static final native void _gtk_editable_cut_clipboard(int /*long*/ editable);

16330

-public static final void gtk_editable_cut_clipboard(int /*long*/ editable) {

16331

+public static final native void _gtk_editable_cut_clipboard(long /*int*/ editable);

16332

+public static final void gtk_editable_cut_clipboard(long /*int*/ editable) {

16333

lock.lock();

16334

try {

16335

_gtk_editable_cut_clipboard(editable);

16336

@@ -5981,8 +5981,8 @@

16337

}

16338

}

16339

/** @param editable cast=(GtkEditable *) */

16340

-public static final native void _gtk_editable_delete_selection(int /*long*/ editable);

16341

-public static final void gtk_editable_delete_selection(int /*long*/ editable) {

16342

+public static final native void _gtk_editable_delete_selection(long /*int*/ editable);

16343

+public static final void gtk_editable_delete_selection(long /*int*/ editable) {

16344

lock.lock();

16345

try {

16346

_gtk_editable_delete_selection(editable);

16347

@@ -5995,8 +5995,8 @@

16348

* @param start_pos cast=(gint)

16349

* @param end_pos cast=(gint)

16350

*/

16351

-public static final native void _gtk_editable_delete_text(int /*long*/ editable, int start_pos, int end_pos);

16352

-public static final void gtk_editable_delete_text(int /*long*/ editable, int start_pos, int end_pos) {

16353

+public static final native void _gtk_editable_delete_text(long /*int*/ editable, int start_pos, int end_pos);

16354

+public static final void gtk_editable_delete_text(long /*int*/ editable, int start_pos, int end_pos) {

16355

lock.lock();

16356

try {

16357

_gtk_editable_delete_text(editable, start_pos, end_pos);

16358

@@ -6009,8 +6009,8 @@

16359

* @param start_pos cast=(gint)

16360

* @param end_pos cast=(gint)

16361

*/

16362

-public static final native int /*long*/ _gtk_editable_get_chars(int /*long*/ editable, int start_pos, int end_pos);

16363

-public static final int /*long*/ gtk_editable_get_chars(int /*long*/ editable, int start_pos, int end_pos) {

16364

+public static final native long /*int*/ _gtk_editable_get_chars(long /*int*/ editable, int start_pos, int end_pos);

16365

+public static final long /*int*/ gtk_editable_get_chars(long /*int*/ editable, int start_pos, int end_pos) {

16366

lock.lock();

16367

try {

16368

return _gtk_editable_get_chars(editable, start_pos, end_pos);

16369

@@ -6019,8 +6019,8 @@

16370

}

16371

}

16372

/** @param editable cast=(GtkEditable *) */

16373

-public static final native boolean _gtk_editable_get_editable(int /*long*/ editable);

16374

-public static final boolean gtk_editable_get_editable(int /*long*/ editable) {

16375

+public static final native boolean _gtk_editable_get_editable(long /*int*/ editable);

16376

+public static final boolean gtk_editable_get_editable(long /*int*/ editable) {

16377

lock.lock();

16378

try {

16379

return _gtk_editable_get_editable(editable);

16380

@@ -6029,8 +6029,8 @@

16381

}

16382

}

16383

/** @param editable cast=(GtkEditable *) */

16384

-public static final native int _gtk_editable_get_position(int /*long*/ editable);

16385

-public static final int gtk_editable_get_position(int /*long*/ editable) {

16386

+public static final native int _gtk_editable_get_position(long /*int*/ editable);

16387

+public static final int gtk_editable_get_position(long /*int*/ editable) {

16388

lock.lock();

16389

try {

16390

return _gtk_editable_get_position(editable);

16391

@@ -6043,8 +6043,8 @@

16392

* @param start cast=(gint *)

16393

* @param end cast=(gint *)

16394

*/

16395

-public static final native boolean _gtk_editable_get_selection_bounds(int /*long*/ editable, int[] start, int[] end);

16396

-public static final boolean gtk_editable_get_selection_bounds(int /*long*/ editable, int[] start, int[] end) {

16397

+public static final native boolean _gtk_editable_get_selection_bounds(long /*int*/ editable, int[] start, int[] end);

16398

+public static final boolean gtk_editable_get_selection_bounds(long /*int*/ editable, int[] start, int[] end) {

16399

lock.lock();

16400

try {

16401

return _gtk_editable_get_selection_bounds(editable, start, end);

16402

@@ -6058,8 +6058,8 @@

16403

* @param new_text_length cast=(gint)

16404

* @param position cast=(gint *)

16405

*/

16406

-public static final native void _gtk_editable_insert_text(int /*long*/ editable, byte[] new_text, int new_text_length, int[] position);

16407

-public static final void gtk_editable_insert_text(int /*long*/ editable, byte[] new_text, int new_text_length, int[] position) {

16408

+public static final native void _gtk_editable_insert_text(long /*int*/ editable, byte[] new_text, int new_text_length, int[] position);

16409

+public static final void gtk_editable_insert_text(long /*int*/ editable, byte[] new_text, int new_text_length, int[] position) {

16410

lock.lock();

16411

try {

16412

_gtk_editable_insert_text(editable, new_text, new_text_length, position);

16413

@@ -6068,8 +6068,8 @@

16414

}

16415

}

16416

/** @param editable cast=(GtkEditable *) */

16417

-public static final native void _gtk_editable_paste_clipboard(int /*long*/ editable);

16418

-public static final void gtk_editable_paste_clipboard(int /*long*/ editable) {

16419

+public static final native void _gtk_editable_paste_clipboard(long /*int*/ editable);

16420

+public static final void gtk_editable_paste_clipboard(long /*int*/ editable) {

16421

lock.lock();

16422

try {

16423

_gtk_editable_paste_clipboard(editable);

16424

@@ -6082,8 +6082,8 @@

16425

* @param start cast=(gint)

16426

* @param end cast=(gint)

16427

*/

16428

-public static final native void _gtk_editable_select_region(int /*long*/ editable, int start, int end);

16429

-public static final void gtk_editable_select_region(int /*long*/ editable, int start, int end) {

16430

+public static final native void _gtk_editable_select_region(long /*int*/ editable, int start, int end);

16431

+public static final void gtk_editable_select_region(long /*int*/ editable, int start, int end) {

16432

lock.lock();

16433

try {

16434

_gtk_editable_select_region(editable, start, end);

16435

@@ -6095,8 +6095,8 @@

16436

* @param entry cast=(GtkEditable *)

16437

* @param editable cast=(gboolean)

16438

*/

16439

-public static final native void _gtk_editable_set_editable(int /*long*/ entry, boolean editable);

16440

-public static final void gtk_editable_set_editable(int /*long*/ entry, boolean editable) {

16441

+public static final native void _gtk_editable_set_editable(long /*int*/ entry, boolean editable);

16442

+public static final void gtk_editable_set_editable(long /*int*/ entry, boolean editable) {

16443

lock.lock();

16444

try {

16445

_gtk_editable_set_editable(entry, editable);

16446

@@ -6108,8 +6108,8 @@

16447

* @param editable cast=(GtkEditable *)

16448

* @param position cast=(gint)

16449

*/

16450

-public static final native void _gtk_editable_set_position(int /*long*/ editable, int position);

16451

-public static final void gtk_editable_set_position(int /*long*/ editable, int position) {

16452

+public static final native void _gtk_editable_set_position(long /*int*/ editable, int position);

16453

+public static final void gtk_editable_set_position(long /*int*/ editable, int position) {

16454

lock.lock();

16455

try {

16456

_gtk_editable_set_position(editable, position);

16457

@@ -6118,8 +6118,8 @@

16458

}

16459

}

16460

/** @method flags=dynamic */

16461

-public static final native int /*long*/ _gtk_entry_get_inner_border (int /*long*/ entry);

16462

-public static final int /*long*/ gtk_entry_get_inner_border (int /*long*/ entry) {

16463

+public static final native long /*int*/ _gtk_entry_get_inner_border (long /*int*/ entry);

16464

+public static final long /*int*/ gtk_entry_get_inner_border (long /*int*/ entry) {

16465

lock.lock();

16466

try {

16467

return _gtk_entry_get_inner_border(entry);

16468

@@ -6128,8 +6128,8 @@

16469

}

16470

}

16471

/** @param entry cast=(GtkEntry *) */

16472

-public static final native char _gtk_entry_get_invisible_char(int /*long*/ entry);

16473

-public static final char gtk_entry_get_invisible_char(int /*long*/ entry) {

16474

+public static final native char _gtk_entry_get_invisible_char(long /*int*/ entry);

16475

+public static final char gtk_entry_get_invisible_char(long /*int*/ entry) {

16476

lock.lock();

16477

try {

16478

return _gtk_entry_get_invisible_char(entry);

16479

@@ -6138,8 +6138,8 @@

16480

}

16481

}

16482

/** @param entry cast=(GtkEntry *) */

16483

-public static final native int /*long*/ _gtk_entry_get_layout (int /*long*/ entry);

16484

-public static final int /*long*/ gtk_entry_get_layout (int /*long*/ entry) {

16485

+public static final native long /*int*/ _gtk_entry_get_layout (long /*int*/ entry);

16486

+public static final long /*int*/ gtk_entry_get_layout (long /*int*/ entry) {

16487

lock.lock();

16488

try {

16489

return _gtk_entry_get_layout(entry);

16490

@@ -6148,8 +6148,8 @@

16491

}

16492

}

16493

/** @param entry cast=(GtkEntry *) */

16494

-public static final native void _gtk_entry_get_layout_offsets (int /*long*/ entry, int[] x, int[] y);

16495

-public static final void gtk_entry_get_layout_offsets (int /*long*/ entry, int[] x, int[] y) {

16496

+public static final native void _gtk_entry_get_layout_offsets (long /*int*/ entry, int[] x, int[] y);

16497

+public static final void gtk_entry_get_layout_offsets (long /*int*/ entry, int[] x, int[] y) {

16498

lock.lock();

16499

try {

16500

_gtk_entry_get_layout_offsets(entry, x, y);

16501

@@ -6158,8 +6158,8 @@

16502

}

16503

}

16504

/** @method flags=dynamic */

16505

-public static final native int _gtk_entry_text_index_to_layout_index (int /*long*/ entry, int index);

16506

-public static final int gtk_entry_text_index_to_layout_index (int /*long*/ entry, int index) {

16507

+public static final native int _gtk_entry_text_index_to_layout_index (long /*int*/ entry, int index);

16508

+public static final int gtk_entry_text_index_to_layout_index (long /*int*/ entry, int index) {

16509

lock.lock();

16510

try {

16511

return _gtk_entry_text_index_to_layout_index(entry, index);

16512

@@ -6168,8 +6168,8 @@

16513

}

16514

}

16515

/** @param entry cast=(GtkEntry *) */

16516

-public static final native int _gtk_entry_get_max_length(int /*long*/ entry);

16517

-public static final int gtk_entry_get_max_length(int /*long*/ entry) {

16518

+public static final native int _gtk_entry_get_max_length(long /*int*/ entry);

16519

+public static final int gtk_entry_get_max_length(long /*int*/ entry) {

16520

lock.lock();

16521

try {

16522

return _gtk_entry_get_max_length(entry);

16523

@@ -6178,8 +6178,8 @@

16524

}

16525

}

16526

/** @param entry cast=(GtkEntry *) */

16527

-public static final native int /*long*/ _gtk_entry_get_text(int /*long*/ entry);

16528

-public static final int /*long*/ gtk_entry_get_text(int /*long*/ entry) {

16529

+public static final native long /*int*/ _gtk_entry_get_text(long /*int*/ entry);

16530

+public static final long /*int*/ gtk_entry_get_text(long /*int*/ entry) {

16531

lock.lock();

16532

try {

16533

return _gtk_entry_get_text(entry);

16534

@@ -6188,8 +6188,8 @@

16535

}

16536

}

16537

/** @method flags=dynamic */

16538

-public static final native boolean _FcConfigAppFontAddFile(int /*long*/ config, byte[] file);

16539

-public static final boolean FcConfigAppFontAddFile(int /*long*/ config, byte[] file) {

16540

+public static final native boolean _FcConfigAppFontAddFile(long /*int*/ config, byte[] file);

16541

+public static final boolean FcConfigAppFontAddFile(long /*int*/ config, byte[] file) {

16542

lock.lock();

16543

try {

16544

return _FcConfigAppFontAddFile(config, file);

16545

@@ -6198,8 +6198,8 @@

16546

}

16547

}

16548

/** @param entry cast=(GtkEntry *) */

16549

-public static final native boolean _gtk_entry_get_visibility(int /*long*/ entry);

16550

-public static final boolean gtk_entry_get_visibility(int /*long*/ entry) {

16551

+public static final native boolean _gtk_entry_get_visibility(long /*int*/ entry);

16552

+public static final boolean gtk_entry_get_visibility(long /*int*/ entry) {

16553

lock.lock();

16554

try {

16555

return _gtk_entry_get_visibility(entry);

16556

@@ -6207,8 +6207,8 @@

16557

lock.unlock();

16558

}

16559

}

16560

-public static final native int /*long*/ _gtk_entry_new();

16561

-public static final int /*long*/ gtk_entry_new() {

16562

+public static final native long /*int*/ _gtk_entry_new();

16563

+public static final long /*int*/ gtk_entry_new() {

16564

lock.lock();

16565

try {

16566

return _gtk_entry_new();

16567

@@ -6220,8 +6220,8 @@

16568

* @param entry cast=(GtkEntry *)

16569

* @param setting cast=(gboolean)

16570

*/

16571

-public static final native void _gtk_entry_set_activates_default(int /*long*/ entry, boolean setting);

16572

-public static final void gtk_entry_set_activates_default(int /*long*/ entry, boolean setting) {

16573

+public static final native void _gtk_entry_set_activates_default(long /*int*/ entry, boolean setting);

16574

+public static final void gtk_entry_set_activates_default(long /*int*/ entry, boolean setting) {

16575

lock.lock();

16576

try {

16577

_gtk_entry_set_activates_default(entry, setting);

16578

@@ -6234,8 +6234,8 @@

16579

* @param entry cast=(GtkEntry *)

16580

* @param xalign cast=(gfloat)

16581

*/

16582

-public static final native void _gtk_entry_set_alignment(int /*long*/ entry, float xalign);

16583

-public static final void gtk_entry_set_alignment(int /*long*/ entry, float xalign) {

16584

+public static final native void _gtk_entry_set_alignment(long /*int*/ entry, float xalign);

16585

+public static final void gtk_entry_set_alignment(long /*int*/ entry, float xalign) {

16586

lock.lock();

16587

try {

16588

_gtk_entry_set_alignment(entry, xalign);

16589

@@ -6247,8 +6247,8 @@

16590

* @param entry cast=(GtkEntry *)

16591

* @param setting cast=(gboolean)

16592

*/

16593

-public static final native void _gtk_entry_set_has_frame(int /*long*/ entry, boolean setting);

16594

-public static final void gtk_entry_set_has_frame(int /*long*/ entry, boolean setting) {

16595

+public static final native void _gtk_entry_set_has_frame(long /*int*/ entry, boolean setting);

16596

+public static final void gtk_entry_set_has_frame(long /*int*/ entry, boolean setting) {

16597

lock.lock();

16598

try {

16599

_gtk_entry_set_has_frame(entry, setting);

16600

@@ -6260,8 +6260,8 @@

16601

* @param entry cast=(GtkEntry *)

16602

* @param ch cast=(gint)

16603

*/

16604

-public static final native void _gtk_entry_set_invisible_char(int /*long*/ entry, char ch);

16605

-public static final void gtk_entry_set_invisible_char(int /*long*/ entry, char ch) {

16606

+public static final native void _gtk_entry_set_invisible_char(long /*int*/ entry, char ch);

16607

+public static final void gtk_entry_set_invisible_char(long /*int*/ entry, char ch) {

16608

lock.lock();

16609

try {

16610

_gtk_entry_set_invisible_char(entry, ch);

16611

@@ -6273,8 +6273,8 @@

16612

* @param entry cast=(GtkEntry *)

16613

* @param max cast=(gint)

16614

*/

16615

-public static final native void _gtk_entry_set_max_length(int /*long*/ entry, int max);

16616

-public static final void gtk_entry_set_max_length(int /*long*/ entry, int max) {

16617

+public static final native void _gtk_entry_set_max_length(long /*int*/ entry, int max);

16618

+public static final void gtk_entry_set_max_length(long /*int*/ entry, int max) {

16619

lock.lock();

16620

try {

16621

_gtk_entry_set_max_length(entry, max);

16622

@@ -6286,8 +6286,8 @@

16623

* @param entry cast=(GtkEntry *)

16624

* @param text cast=(const gchar *)

16625

*/

16626

-public static final native void _gtk_entry_set_text(int /*long*/ entry, byte[] text);

16627

-public static final void gtk_entry_set_text(int /*long*/ entry, byte[] text) {

16628

+public static final native void _gtk_entry_set_text(long /*int*/ entry, byte[] text);

16629

+public static final void gtk_entry_set_text(long /*int*/ entry, byte[] text) {

16630

lock.lock();

16631

try {

16632

_gtk_entry_set_text(entry, text);

16633

@@ -6299,8 +6299,8 @@

16634

* @param entry cast=(GtkEntry *)

16635

* @param visible cast=(gboolean)

16636

*/

16637

-public static final native void _gtk_entry_set_visibility(int /*long*/ entry, boolean visible);

16638

-public static final void gtk_entry_set_visibility(int /*long*/ entry, boolean visible) {

16639

+public static final native void _gtk_entry_set_visibility(long /*int*/ entry, boolean visible);

16640

+public static final void gtk_entry_set_visibility(long /*int*/ entry, boolean visible) {

16641

lock.lock();

16642

try {

16643

_gtk_entry_set_visibility(entry, visible);

16644

@@ -6318,8 +6318,8 @@

16645

}

16646

}

16647

/** @method flags=dynamic */

16648

-public static final native boolean _gtk_expander_get_expanded(int /*long*/ expander);

16649

-public static final boolean gtk_expander_get_expanded(int /*long*/ expander) {

16650

+public static final native boolean _gtk_expander_get_expanded(long /*int*/ expander);

16651

+public static final boolean gtk_expander_get_expanded(long /*int*/ expander) {

16652

lock.lock();

16653

try {

16654

return _gtk_expander_get_expanded(expander);

16655

@@ -6328,8 +6328,8 @@

16656

}

16657

}

16658

/** @method flags=dynamic */

16659

-public static final native int /*long*/ _gtk_expander_get_label_widget(int /*long*/ expander);

16660

-public static final int /*long*/ gtk_expander_get_label_widget(int /*long*/ expander) {

16661

+public static final native long /*int*/ _gtk_expander_get_label_widget(long /*int*/ expander);

16662

+public static final long /*int*/ gtk_expander_get_label_widget(long /*int*/ expander) {

16663

lock.lock();

16664

try {

16665

return _gtk_expander_get_label_widget(expander);

16666

@@ -6341,8 +6341,8 @@

16667

* @method flags=dynamic

16668

* @param label cast=(const gchar *)

16669

*/

16670

-public static final native int /*long*/ _gtk_expander_new(byte[] label);

16671

-public static final int /*long*/ gtk_expander_new(byte[] label) {

16672

+public static final native long /*int*/ _gtk_expander_new(byte[] label);

16673

+public static final long /*int*/ gtk_expander_new(byte[] label) {

16674

lock.lock();

16675

try {

16676

return _gtk_expander_new(label);

16677

@@ -6351,8 +6351,8 @@

16678

}

16679

}

16680

/** @method flags=dynamic */

16681

-public static final native void _gtk_expander_set_expanded(int /*long*/ expander, boolean expanded);

16682

-public static final void gtk_expander_set_expanded(int /*long*/ expander, boolean expanded) {

16683

+public static final native void _gtk_expander_set_expanded(long /*int*/ expander, boolean expanded);

16684

+public static final void gtk_expander_set_expanded(long /*int*/ expander, boolean expanded) {

16685

lock.lock();

16686

try {

16687

_gtk_expander_set_expanded(expander, expanded);

16688

@@ -6364,8 +6364,8 @@

16689

* @method flags=dynamic

16690

* @param label cast=(const gchar *)

16691

*/

16692

-public static final native void _gtk_expander_set_label(int /*long*/ expander, byte[] label);

16693

-public static final void gtk_expander_set_label(int /*long*/ expander, byte[] label) {

16694

+public static final native void _gtk_expander_set_label(long /*int*/ expander, byte[] label);

16695

+public static final void gtk_expander_set_label(long /*int*/ expander, byte[] label) {

16696

lock.lock();

16697

try {

16698

_gtk_expander_set_label(expander, label);

16699

@@ -6374,8 +6374,8 @@

16700

}

16701

}

16702

/** @method flags=dynamic */

16703

-public static final native void _gtk_expander_set_label_widget(int /*long*/ expander, int /*long*/ label_widget);

16704

-public static final void gtk_expander_set_label_widget(int /*long*/ expander, int /*long*/ label_widget) {

16705

+public static final native void _gtk_expander_set_label_widget(long /*int*/ expander, long /*int*/ label_widget);

16706

+public static final void gtk_expander_set_label_widget(long /*int*/ expander, long /*int*/ label_widget) {

16707

lock.lock();

16708

try {

16709

_gtk_expander_set_label_widget(expander, label_widget);

16710

@@ -6384,8 +6384,8 @@

16711

}

16712

}

16713

/** @method flags=dynamic */

16714

-public static final native void _gtk_file_chooser_add_filter(int /*long*/ chooser, int /*long*/ filter);

16715

-public static final void gtk_file_chooser_add_filter(int /*long*/ chooser, int /*long*/ filter) {

16716

+public static final native void _gtk_file_chooser_add_filter(long /*int*/ chooser, long /*int*/ filter);

16717

+public static final void gtk_file_chooser_add_filter(long /*int*/ chooser, long /*int*/ filter) {

16718

lock.lock();

16719

try {

16720

_gtk_file_chooser_add_filter(chooser, filter);

16721

@@ -6394,8 +6394,8 @@

16722

}

16723

}

16724

/** @method flags=no_gen */

16725

-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);

16726

-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) {

16727

+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);

16728

+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) {

16729

lock.lock();

16730

try {

16731

return _gtk_file_chooser_dialog_new(title, parent, action, first_button_text, first_button_id, second_button_text, second_button_id, terminator);

16732

@@ -6404,8 +6404,8 @@

16733

}

16734

}

16735

/** @method flags=dynamic */

16736

-public static final native int /*long*/ _gtk_file_chooser_get_current_folder(int /*long*/ chooser);

16737

-public static final int /*long*/ gtk_file_chooser_get_current_folder(int /*long*/ chooser) {

16738

+public static final native long /*int*/ _gtk_file_chooser_get_current_folder(long /*int*/ chooser);

16739

+public static final long /*int*/ gtk_file_chooser_get_current_folder(long /*int*/ chooser) {

16740

lock.lock();

16741

try {

16742

return _gtk_file_chooser_get_current_folder(chooser);

16743

@@ -6414,8 +6414,8 @@

16744

}

16745

}

16746

/** @method flags=dynamic */

16747

-public static final native int /*long*/ _gtk_file_chooser_get_filename(int /*long*/ chooser);

16748

-public static final int /*long*/ gtk_file_chooser_get_filename(int /*long*/ chooser) {

16749

+public static final native long /*int*/ _gtk_file_chooser_get_filename(long /*int*/ chooser);

16750

+public static final long /*int*/ gtk_file_chooser_get_filename(long /*int*/ chooser) {

16751

lock.lock();

16752

try {

16753

return _gtk_file_chooser_get_filename(chooser);

16754

@@ -6424,8 +6424,8 @@

16755

}

16756

}

16757

/** @method flags=dynamic */

16758

-public static final native int /*long*/ _gtk_file_chooser_get_filenames(int /*long*/ chooser);

16759

-public static final int /*long*/ gtk_file_chooser_get_filenames(int /*long*/ chooser) {

16760

+public static final native long /*int*/ _gtk_file_chooser_get_filenames(long /*int*/ chooser);

16761

+public static final long /*int*/ gtk_file_chooser_get_filenames(long /*int*/ chooser) {

16762

lock.lock();

16763

try {

16764

return _gtk_file_chooser_get_filenames(chooser);

16765

@@ -6434,8 +6434,8 @@

16766

}

16767

}

16768

/** @method flags=dynamic */

16769

-public static final native int /*long*/ _gtk_file_chooser_get_uri(int /*long*/ chooser);

16770

-public static final int /*long*/ gtk_file_chooser_get_uri(int /*long*/ chooser) {

16771

+public static final native long /*int*/ _gtk_file_chooser_get_uri(long /*int*/ chooser);

16772

+public static final long /*int*/ gtk_file_chooser_get_uri(long /*int*/ chooser) {

16773

lock.lock();

16774

try {

16775

return _gtk_file_chooser_get_uri(chooser);

16776

@@ -6444,8 +6444,8 @@

16777

}

16778

}

16779

/** @method flags=dynamic */

16780

-public static final native int /*long*/ _gtk_file_chooser_get_uris(int /*long*/ chooser);

16781

-public static final int /*long*/ gtk_file_chooser_get_uris(int /*long*/ chooser) {

16782

+public static final native long /*int*/ _gtk_file_chooser_get_uris(long /*int*/ chooser);

16783

+public static final long /*int*/ gtk_file_chooser_get_uris(long /*int*/ chooser) {

16784

lock.lock();

16785

try {

16786

return _gtk_file_chooser_get_uris(chooser);

16787

@@ -6454,8 +6454,8 @@

16788

}

16789

}

16790

/** @method flags=dynamic */

16791

-public static final native int /*long*/ _gtk_file_chooser_get_filter(int /*long*/ chooser);

16792

-public static final int /*long*/ gtk_file_chooser_get_filter(int /*long*/ chooser) {

16793

+public static final native long /*int*/ _gtk_file_chooser_get_filter(long /*int*/ chooser);

16794

+public static final long /*int*/ gtk_file_chooser_get_filter(long /*int*/ chooser) {

16795

lock.lock();

16796

try {

16797

return _gtk_file_chooser_get_filter(chooser);

16798

@@ -6464,8 +6464,8 @@

16799

}

16800

}

16801

/** @method flags=dynamic */

16802

-public static final native void _gtk_file_chooser_set_current_folder(int /*long*/ chooser, int /*long*/ filename);

16803

-public static final void gtk_file_chooser_set_current_folder(int /*long*/ chooser, int /*long*/ filename) {

16804

+public static final native void _gtk_file_chooser_set_current_folder(long /*int*/ chooser, long /*int*/ filename);

16805

+public static final void gtk_file_chooser_set_current_folder(long /*int*/ chooser, long /*int*/ filename) {

16806

lock.lock();

16807

try {

16808

_gtk_file_chooser_set_current_folder(chooser, filename);

16809

@@ -6474,8 +6474,8 @@

16810

}

16811

}

16812

/** @method flags=dynamic */

16813

-public static final native void _gtk_file_chooser_set_current_folder_uri(int /*long*/ chooser, byte [] uri);

16814

-public static final void gtk_file_chooser_set_current_folder_uri(int /*long*/ chooser, byte [] uri) {

16815

+public static final native void _gtk_file_chooser_set_current_folder_uri(long /*int*/ chooser, byte [] uri);

16816

+public static final void gtk_file_chooser_set_current_folder_uri(long /*int*/ chooser, byte [] uri) {

16817

lock.lock();

16818

try {

16819

_gtk_file_chooser_set_current_folder_uri(chooser, uri);

16820

@@ -6484,8 +6484,8 @@

16821

}

16822

}

16823

/** @method flags=dynamic */

16824

-public static final native void _gtk_file_chooser_set_current_name(int /*long*/ chooser, byte[] name);

16825

-public static final void gtk_file_chooser_set_current_name(int /*long*/ chooser, byte[] name) {

16826

+public static final native void _gtk_file_chooser_set_current_name(long /*int*/ chooser, byte[] name);

16827

+public static final void gtk_file_chooser_set_current_name(long /*int*/ chooser, byte[] name) {

16828

lock.lock();

16829

try {

16830

_gtk_file_chooser_set_current_name(chooser, name);

16831

@@ -6494,8 +6494,8 @@

16832

}

16833

}

16834

/** @method flags=dynamic */

16835

-public static final native void _gtk_file_chooser_set_local_only(int /*long*/ chooser, boolean local_only);

16836

-public static final void gtk_file_chooser_set_local_only(int /*long*/ chooser, boolean local_only) {

16837

+public static final native void _gtk_file_chooser_set_local_only(long /*int*/ chooser, boolean local_only);

16838

+public static final void gtk_file_chooser_set_local_only(long /*int*/ chooser, boolean local_only) {

16839

lock.lock();

16840

try {

16841

_gtk_file_chooser_set_local_only(chooser, local_only);

16842

@@ -6504,8 +6504,8 @@

16843

}

16844

}

16845

/** @method flags=dynamic */

16846

-public static final native void _gtk_file_chooser_set_do_overwrite_confirmation(int /*long*/ chooser, boolean do_overwrite_confirmation);

16847

-public static final void gtk_file_chooser_set_do_overwrite_confirmation(int /*long*/ chooser, boolean do_overwrite_confirmation) {

16848

+public static final native void _gtk_file_chooser_set_do_overwrite_confirmation(long /*int*/ chooser, boolean do_overwrite_confirmation);

16849

+public static final void gtk_file_chooser_set_do_overwrite_confirmation(long /*int*/ chooser, boolean do_overwrite_confirmation) {

16850

lock.lock();

16851

try {

16852

_gtk_file_chooser_set_do_overwrite_confirmation(chooser, do_overwrite_confirmation);

16853

@@ -6514,8 +6514,8 @@

16854

}

16855

}

16856

/** @method flags=dynamic */

16857

-public static final native void _gtk_file_chooser_set_extra_widget(int /*long*/ chooser, int /*long*/ extra_widget);

16858

-public static final void gtk_file_chooser_set_extra_widget(int /*long*/ chooser, int /*long*/ extra_widget) {

16859

+public static final native void _gtk_file_chooser_set_extra_widget(long /*int*/ chooser, long /*int*/ extra_widget);

16860

+public static final void gtk_file_chooser_set_extra_widget(long /*int*/ chooser, long /*int*/ extra_widget) {

16861

lock.lock();

16862

try {

16863

_gtk_file_chooser_set_extra_widget(chooser, extra_widget);

16864

@@ -6524,8 +6524,8 @@

16865

}

16866

}

16867

/** @method flags=dynamic */

16868

-public static final native void _gtk_file_chooser_set_filename(int /*long*/ chooser, int /*long*/ name);

16869

-public static final void gtk_file_chooser_set_filename(int /*long*/ chooser, int /*long*/ name) {

16870

+public static final native void _gtk_file_chooser_set_filename(long /*int*/ chooser, long /*int*/ name);

16871

+public static final void gtk_file_chooser_set_filename(long /*int*/ chooser, long /*int*/ name) {

16872

lock.lock();

16873

try {

16874

_gtk_file_chooser_set_filename(chooser, name);

16875

@@ -6534,8 +6534,8 @@

16876

}

16877

}

16878

/** @method flags=dynamic */

16879

-public static final native void _gtk_file_chooser_set_filter(int /*long*/ chooser, int /*long*/ filter);

16880

-public static final void gtk_file_chooser_set_filter(int /*long*/ chooser, int /*long*/ filter) {

16881

+public static final native void _gtk_file_chooser_set_filter(long /*int*/ chooser, long /*int*/ filter);

16882

+public static final void gtk_file_chooser_set_filter(long /*int*/ chooser, long /*int*/ filter) {

16883

lock.lock();

16884

try {

16885

_gtk_file_chooser_set_filter(chooser, filter);

16886

@@ -6544,8 +6544,8 @@

16887

}

16888

}

16889

/** @method flags=dynamic */

16890

-public static final native void _gtk_file_chooser_set_uri(int /*long*/ chooser, byte [] uri);

16891

-public static final void gtk_file_chooser_set_uri(int /*long*/ chooser, byte [] uri) {

16892

+public static final native void _gtk_file_chooser_set_uri(long /*int*/ chooser, byte [] uri);

16893

+public static final void gtk_file_chooser_set_uri(long /*int*/ chooser, byte [] uri) {

16894

lock.lock();

16895

try {

16896

_gtk_file_chooser_set_uri(chooser, uri);

16897

@@ -6554,8 +6554,8 @@

16898

}

16899

}

16900

/** @method flags=dynamic */

16901

-public static final native void _gtk_file_chooser_set_select_multiple(int /*long*/ chooser, boolean select_multiple);

16902

-public static final void gtk_file_chooser_set_select_multiple(int /*long*/ chooser, boolean select_multiple) {

16903

+public static final native void _gtk_file_chooser_set_select_multiple(long /*int*/ chooser, boolean select_multiple);

16904

+public static final void gtk_file_chooser_set_select_multiple(long /*int*/ chooser, boolean select_multiple) {

16905

lock.lock();

16906

try {

16907

_gtk_file_chooser_set_select_multiple(chooser, select_multiple);

16908

@@ -6564,8 +6564,8 @@

16909

}

16910

}

16911

/** @method flags=dynamic */

16912

-public static final native void _gtk_file_filter_add_pattern(int /*long*/ filter, byte[] pattern);

16913

-public static final void gtk_file_filter_add_pattern(int /*long*/ filter, byte[] pattern) {

16914

+public static final native void _gtk_file_filter_add_pattern(long /*int*/ filter, byte[] pattern);

16915

+public static final void gtk_file_filter_add_pattern(long /*int*/ filter, byte[] pattern) {

16916

lock.lock();

16917

try {

16918

_gtk_file_filter_add_pattern(filter, pattern);

16919

@@ -6574,8 +6574,8 @@

16920

}

16921

}

16922

/** @method flags=dynamic */

16923

-public static final native int /*long*/ _gtk_file_filter_new();

16924

-public static final int /*long*/ gtk_file_filter_new() {

16925

+public static final native long /*int*/ _gtk_file_filter_new();

16926

+public static final long /*int*/ gtk_file_filter_new() {

16927

lock.lock();

16928

try {

16929

return _gtk_file_filter_new();

16930

@@ -6584,8 +6584,8 @@

16931

}

16932

}

16933

/** @method flags=dynamic */

16934

-public static final native int /*long*/ _gtk_file_filter_get_name(int /*long*/ filter);

16935

-public static final int /*long*/ gtk_file_filter_get_name(int /*long*/ filter) {

16936

+public static final native long /*int*/ _gtk_file_filter_get_name(long /*int*/ filter);

16937

+public static final long /*int*/ gtk_file_filter_get_name(long /*int*/ filter) {

16938

lock.lock();

16939

try {

16940

return _gtk_file_filter_get_name(filter);

16941

@@ -6594,8 +6594,8 @@

16942

}

16943

}

16944

/** @method flags=dynamic */

16945

-public static final native void _gtk_file_filter_set_name(int /*long*/ filter, byte[] name);

16946

-public static final void gtk_file_filter_set_name(int /*long*/ filter, byte[] name) {

16947

+public static final native void _gtk_file_filter_set_name(long /*int*/ filter, byte[] name);

16948

+public static final void gtk_file_filter_set_name(long /*int*/ filter, byte[] name) {

16949

lock.lock();

16950

try {

16951

_gtk_file_filter_set_name(filter, name);

16952

@@ -6604,8 +6604,8 @@

16953

}

16954

}

16955

/** @param filesel cast=(GtkFileSelection *) */

16956

-public static final native int /*long*/ _gtk_file_selection_get_filename(int /*long*/ filesel);

16957

-public static final int /*long*/ gtk_file_selection_get_filename(int /*long*/ filesel) {

16958

+public static final native long /*int*/ _gtk_file_selection_get_filename(long /*int*/ filesel);

16959

+public static final long /*int*/ gtk_file_selection_get_filename(long /*int*/ filesel) {

16960

lock.lock();

16961

try {

16962

return _gtk_file_selection_get_filename(filesel);

16963

@@ -6614,8 +6614,8 @@

16964

}

16965

}

16966

/** @param filesel cast=(GtkFileSelection *) */

16967

-public static final native int /*long*/ _gtk_file_selection_get_selections(int /*long*/ filesel);

16968

-public static final int /*long*/ gtk_file_selection_get_selections(int /*long*/ filesel) {

16969

+public static final native long /*int*/ _gtk_file_selection_get_selections(long /*int*/ filesel);

16970

+public static final long /*int*/ gtk_file_selection_get_selections(long /*int*/ filesel) {

16971

lock.lock();

16972

try {

16973

return _gtk_file_selection_get_selections(filesel);

16974

@@ -6624,8 +6624,8 @@

16975

}

16976

}

16977

/** @param filesel cast=(GtkFileSelection *) */

16978

-public static final native void _gtk_file_selection_hide_fileop_buttons(int /*long*/ filesel);

16979

-public static final void gtk_file_selection_hide_fileop_buttons(int /*long*/ filesel) {

16980

+public static final native void _gtk_file_selection_hide_fileop_buttons(long /*int*/ filesel);

16981

+public static final void gtk_file_selection_hide_fileop_buttons(long /*int*/ filesel) {

16982

lock.lock();

16983

try {

16984

_gtk_file_selection_hide_fileop_buttons(filesel);

16985

@@ -6634,8 +6634,8 @@

16986

}

16987

}

16988

/** @param title cast=(const gchar *) */

16989

-public static final native int /*long*/ _gtk_file_selection_new(byte[] title);

16990

-public static final int /*long*/ gtk_file_selection_new(byte[] title) {

16991

+public static final native long /*int*/ _gtk_file_selection_new(byte[] title);

16992

+public static final long /*int*/ gtk_file_selection_new(byte[] title) {

16993

lock.lock();

16994

try {

16995

return _gtk_file_selection_new(title);

16996

@@ -6647,8 +6647,8 @@

16997

* @param filesel cast=(GtkFileSelection *)

16998

* @param filename cast=(const gchar *)

16999

*/

17000

-public static final native void _gtk_file_selection_set_filename(int /*long*/ filesel, int /*long*/ filename);

17001

-public static final void gtk_file_selection_set_filename(int /*long*/ filesel, int /*long*/ filename) {

17002

+public static final native void _gtk_file_selection_set_filename(long /*int*/ filesel, long /*int*/ filename);

17003

+public static final void gtk_file_selection_set_filename(long /*int*/ filesel, long /*int*/ filename) {

17004

lock.lock();

17005

try {

17006

_gtk_file_selection_set_filename(filesel, filename);

17007

@@ -6660,8 +6660,8 @@

17008

* @param filesel cast=(GtkFileSelection *)

17009

* @param select_multiple cast=(gboolean)

17010

*/

17011

-public static final native void _gtk_file_selection_set_select_multiple(int /*long*/ filesel, boolean select_multiple);

17012

-public static final void gtk_file_selection_set_select_multiple(int /*long*/ filesel, boolean select_multiple) {

17013

+public static final native void _gtk_file_selection_set_select_multiple(long /*int*/ filesel, boolean select_multiple);

17014

+public static final void gtk_file_selection_set_select_multiple(long /*int*/ filesel, boolean select_multiple) {

17015

lock.lock();

17016

try {

17017

_gtk_file_selection_set_select_multiple(filesel, select_multiple);

17018

@@ -6675,8 +6675,8 @@

17019

* @param x cast=(gint)

17020

* @param y cast=(gint)

17021

*/

17022

-public static final native void _gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget, int x, int y);

17023

-public static final void gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget, int x, int y) {

17024

+public static final native void _gtk_fixed_move(long /*int*/ fixed, long /*int*/ widget, int x, int y);

17025

+public static final void gtk_fixed_move(long /*int*/ fixed, long /*int*/ widget, int x, int y) {

17026

lock.lock();

17027

try {

17028

_gtk_fixed_move(fixed, widget, x, y);

17029

@@ -6684,8 +6684,8 @@

17030

lock.unlock();

17031

}

17032

}

17033

-public static final native int /*long*/ _gtk_fixed_new();

17034

-public static final int /*long*/ gtk_fixed_new() {

17035

+public static final native long /*int*/ _gtk_fixed_new();

17036

+public static final long /*int*/ gtk_fixed_new() {

17037

lock.lock();

17038

try {

17039

return _gtk_fixed_new();

17040

@@ -6697,8 +6697,8 @@

17041

* @param fixed cast=(GtkFixed *)

17042

* @param has_window cast=(gboolean)

17043

*/

17044

-public static final native void _gtk_fixed_set_has_window(int /*long*/ fixed, boolean has_window);

17045

-public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean has_window) {

17046

+public static final native void _gtk_fixed_set_has_window(long /*int*/ fixed, boolean has_window);

17047

+public static final void gtk_fixed_set_has_window(long /*int*/ fixed, boolean has_window) {

17048

lock.lock();

17049

try {

17050

_gtk_fixed_set_has_window(fixed, has_window);

17051

@@ -6707,8 +6707,8 @@

17052

}

17053

}

17054

/** @param fsd cast=(GtkFontSelectionDialog *) */

17055

-public static final native int /*long*/ _gtk_font_selection_dialog_get_font_name(int /*long*/ fsd);

17056

-public static final int /*long*/ gtk_font_selection_dialog_get_font_name(int /*long*/ fsd) {

17057

+public static final native long /*int*/ _gtk_font_selection_dialog_get_font_name(long /*int*/ fsd);

17058

+public static final long /*int*/ gtk_font_selection_dialog_get_font_name(long /*int*/ fsd) {

17059

lock.lock();

17060

try {

17061

return _gtk_font_selection_dialog_get_font_name(fsd);

17062

@@ -6717,8 +6717,8 @@

17063

}

17064

}

17065

/** @param title cast=(const gchar *) */

17066

-public static final native int /*long*/ _gtk_font_selection_dialog_new(byte[] title);

17067

-public static final int /*long*/ gtk_font_selection_dialog_new(byte[] title) {

17068

+public static final native long /*int*/ _gtk_font_selection_dialog_new(byte[] title);

17069

+public static final long /*int*/ gtk_font_selection_dialog_new(byte[] title) {

17070

lock.lock();

17071

try {

17072

return _gtk_font_selection_dialog_new(title);

17073

@@ -6730,8 +6730,8 @@

17074

* @param fsd cast=(GtkFontSelectionDialog *)

17075

* @param fontname cast=(const gchar *)

17076

*/

17077

-public static final native boolean _gtk_font_selection_dialog_set_font_name(int /*long*/ fsd, byte[] fontname);

17078

-public static final boolean gtk_font_selection_dialog_set_font_name(int /*long*/ fsd, byte[] fontname) {

17079

+public static final native boolean _gtk_font_selection_dialog_set_font_name(long /*int*/ fsd, byte[] fontname);

17080

+public static final boolean gtk_font_selection_dialog_set_font_name(long /*int*/ fsd, byte[] fontname) {

17081

lock.lock();

17082

try {

17083

return _gtk_font_selection_dialog_set_font_name(fsd, fontname);

17084

@@ -6740,8 +6740,8 @@

17085

}

17086

}

17087

/** @param label cast=(const gchar *) */

17088

-public static final native int /*long*/ _gtk_frame_new(byte[] label);

17089

-public static final int /*long*/ gtk_frame_new(byte[] label) {

17090

+public static final native long /*int*/ _gtk_frame_new(byte[] label);

17091

+public static final long /*int*/ gtk_frame_new(byte[] label) {

17092

lock.lock();

17093

try {

17094

return _gtk_frame_new(label);

17095

@@ -6750,8 +6750,8 @@

17096

}

17097

}

17098

/** @param frame cast=(GtkFrame *) */

17099

-public static final native int /*long*/ _gtk_frame_get_label_widget(int /*long*/ frame);

17100

-public static final int /*long*/ gtk_frame_get_label_widget(int /*long*/ frame) {

17101

+public static final native long /*int*/ _gtk_frame_get_label_widget(long /*int*/ frame);

17102

+public static final long /*int*/ gtk_frame_get_label_widget(long /*int*/ frame) {

17103

lock.lock();

17104

try {

17105

return _gtk_frame_get_label_widget(frame);

17106

@@ -6763,8 +6763,8 @@

17107

* @param frame cast=(GtkFrame *)

17108

* @param label cast=(const gchar *)

17109

*/

17110

-public static final native void _gtk_frame_set_label(int /*long*/ frame, byte[] label);

17111

-public static final void gtk_frame_set_label(int /*long*/ frame, byte[] label) {

17112

+public static final native void _gtk_frame_set_label(long /*int*/ frame, byte[] label);

17113

+public static final void gtk_frame_set_label(long /*int*/ frame, byte[] label) {

17114

lock.lock();

17115

try {

17116

_gtk_frame_set_label(frame, label);

17117

@@ -6776,8 +6776,8 @@

17118

* @param frame cast=(GtkFrame *)

17119

* @param label_widget cast=(GtkWidget *)

17120

*/

17121

-public static final native void _gtk_frame_set_label_widget(int /*long*/ frame, int /*long*/ label_widget);

17122

-public static final void gtk_frame_set_label_widget(int /*long*/ frame, int /*long*/ label_widget) {

17123

+public static final native void _gtk_frame_set_label_widget(long /*int*/ frame, long /*int*/ label_widget);

17124

+public static final void gtk_frame_set_label_widget(long /*int*/ frame, long /*int*/ label_widget) {

17125

lock.lock();

17126

try {

17127

_gtk_frame_set_label_widget(frame, label_widget);

17128

@@ -6789,8 +6789,8 @@

17129

* @param frame cast=(GtkFrame *)

17130

* @param type cast=(GtkShadowType)

17131

*/

17132

-public static final native void _gtk_frame_set_shadow_type(int /*long*/ frame, int type);

17133

-public static final void gtk_frame_set_shadow_type(int /*long*/ frame, int type) {

17134

+public static final native void _gtk_frame_set_shadow_type(long /*int*/ frame, int type);

17135

+public static final void gtk_frame_set_shadow_type(long /*int*/ frame, int type) {

17136

lock.lock();

17137

try {

17138

_gtk_frame_set_shadow_type(frame, type);

17139

@@ -6798,8 +6798,8 @@

17140

lock.unlock();

17141

}

17142

}

17143

-public static final native int /*long*/ _gtk_get_current_event();

17144

-public static final int /*long*/ gtk_get_current_event() {

17145

+public static final native long /*int*/ _gtk_get_current_event();

17146

+public static final long /*int*/ gtk_get_current_event() {

17147

lock.lock();

17148

try {

17149

return _gtk_get_current_event();

17150

@@ -6826,8 +6826,8 @@

17151

lock.unlock();

17152

}

17153

}

17154

-public static final native int /*long*/ _gtk_get_default_language();

17155

-public static final int /*long*/ gtk_get_default_language() {

17156

+public static final native long /*int*/ _gtk_get_default_language();

17157

+public static final long /*int*/ gtk_get_default_language() {

17158

lock.lock();

17159

try {

17160

return _gtk_get_default_language();

17161

@@ -6836,8 +6836,8 @@

17162

}

17163

}

17164

/** @param event cast=(GdkEvent *) */

17165

-public static final native int /*long*/ _gtk_get_event_widget(int /*long*/ event);

17166

-public static final int /*long*/ gtk_get_event_widget(int /*long*/ event) {

17167

+public static final native long /*int*/ _gtk_get_event_widget(long /*int*/ event);

17168

+public static final long /*int*/ gtk_get_event_widget(long /*int*/ event) {

17169

lock.lock();

17170

try {

17171

return _gtk_get_event_widget(event);

17172

@@ -6846,8 +6846,8 @@

17173

}

17174

}

17175

/** @param widget cast=(GtkWidget *) */

17176

-public static final native void _gtk_grab_add(int /*long*/ widget);

17177

-public static final void gtk_grab_add(int /*long*/ widget) {

17178

+public static final native void _gtk_grab_add(long /*int*/ widget);

17179

+public static final void gtk_grab_add(long /*int*/ widget) {

17180

lock.lock();

17181

try {

17182

_gtk_grab_add(widget);

17183

@@ -6855,8 +6855,8 @@

17184

lock.unlock();

17185

}

17186

}

17187

-public static final native int /*long*/ _gtk_grab_get_current();

17188

-public static final int /*long*/ gtk_grab_get_current() {

17189

+public static final native long /*int*/ _gtk_grab_get_current();

17190

+public static final long /*int*/ gtk_grab_get_current() {

17191

lock.lock();

17192

try {

17193

return _gtk_grab_get_current();

17194

@@ -6865,8 +6865,8 @@

17195

}

17196

}

17197

/** @param widget cast=(GtkWidget *) */

17198

-public static final native void _gtk_grab_remove(int /*long*/ widget);

17199

-public static final void gtk_grab_remove(int /*long*/ widget) {

17200

+public static final native void _gtk_grab_remove(long /*int*/ widget);

17201

+public static final void gtk_grab_remove(long /*int*/ widget) {

17202

lock.lock();

17203

try {

17204

_gtk_grab_remove(widget);

17205

@@ -6878,8 +6878,8 @@

17206

* @param homogeneous cast=(gboolean)

17207

* @param spacing cast=(gint)

17208

*/

17209

-public static final native int /*long*/ _gtk_hbox_new(boolean homogeneous, int spacing);

17210

-public static final int /*long*/ gtk_hbox_new(boolean homogeneous, int spacing) {

17211

+public static final native long /*int*/ _gtk_hbox_new(boolean homogeneous, int spacing);

17212

+public static final long /*int*/ gtk_hbox_new(boolean homogeneous, int spacing) {

17213

lock.lock();

17214

try {

17215

return _gtk_hbox_new(homogeneous, spacing);

17216

@@ -6888,8 +6888,8 @@

17217

}

17218

}

17219

/** @param adjustment cast=(GtkAdjustment *) */

17220

-public static final native int /*long*/ _gtk_hscale_new(int /*long*/ adjustment);

17221

-public static final int /*long*/ gtk_hscale_new(int /*long*/ adjustment) {

17222

+public static final native long /*int*/ _gtk_hscale_new(long /*int*/ adjustment);

17223

+public static final long /*int*/ gtk_hscale_new(long /*int*/ adjustment) {

17224

lock.lock();

17225

try {

17226

return _gtk_hscale_new(adjustment);

17227

@@ -6898,8 +6898,8 @@

17228

}

17229

}

17230

/** @param adjustment cast=(GtkAdjustment *) */

17231

-public static final native int /*long*/ _gtk_hscrollbar_new(int /*long*/ adjustment);

17232

-public static final int /*long*/ gtk_hscrollbar_new(int /*long*/ adjustment) {

17233

+public static final native long /*int*/ _gtk_hscrollbar_new(long /*int*/ adjustment);

17234

+public static final long /*int*/ gtk_hscrollbar_new(long /*int*/ adjustment) {

17235

lock.lock();

17236

try {

17237

return _gtk_hscrollbar_new(adjustment);

17238

@@ -6907,8 +6907,8 @@

17239

lock.unlock();

17240

}

17241

}

17242

-public static final native int /*long*/ _gtk_hseparator_new();

17243

-public static final int /*long*/ gtk_hseparator_new() {

17244

+public static final native long /*int*/ _gtk_hseparator_new();

17245

+public static final long /*int*/ gtk_hseparator_new() {

17246

lock.lock();

17247

try {

17248

return _gtk_hseparator_new();

17249

@@ -6917,8 +6917,8 @@

17250

}

17251

}

17252

/** @param stock_id cast=(const gchar *) */

17253

-public static final native int /*long*/ _gtk_icon_factory_lookup_default(byte[] stock_id);

17254

-public static final int /*long*/ gtk_icon_factory_lookup_default(byte[] stock_id) {

17255

+public static final native long /*int*/ _gtk_icon_factory_lookup_default(byte[] stock_id);

17256

+public static final long /*int*/ gtk_icon_factory_lookup_default(byte[] stock_id) {

17257

lock.lock();

17258

try {

17259

return _gtk_icon_factory_lookup_default(stock_id);

17260

@@ -6927,8 +6927,8 @@

17261

}

17262

}

17263

/** @param source cast=(GtkIconSource *) */

17264

-public static final native void _gtk_icon_source_free(int /*long*/ source);

17265

-public static final void gtk_icon_source_free(int /*long*/ source) {

17266

+public static final native void _gtk_icon_source_free(long /*int*/ source);

17267

+public static final void gtk_icon_source_free(long /*int*/ source) {

17268

lock.lock();

17269

try {

17270

_gtk_icon_source_free(source);

17271

@@ -6936,8 +6936,8 @@

17272

lock.unlock();

17273

}

17274

}

17275

-public static final native int /*long*/ _gtk_icon_source_new();

17276

-public static final int /*long*/ gtk_icon_source_new() {

17277

+public static final native long /*int*/ _gtk_icon_source_new();

17278

+public static final long /*int*/ gtk_icon_source_new() {

17279

lock.lock();

17280

try {

17281

return _gtk_icon_source_new();

17282

@@ -6949,8 +6949,8 @@

17283

* @param source cast=(GtkIconSource *)

17284

* @param pixbuf cast=(GdkPixbuf *)

17285

*/

17286

-public static final native void _gtk_icon_source_set_pixbuf(int /*long*/ source, int /*long*/ pixbuf);

17287

-public static final void gtk_icon_source_set_pixbuf(int /*long*/ source, int /*long*/ pixbuf) {

17288

+public static final native void _gtk_icon_source_set_pixbuf(long /*int*/ source, long /*int*/ pixbuf);

17289

+public static final void gtk_icon_source_set_pixbuf(long /*int*/ source, long /*int*/ pixbuf) {

17290

lock.lock();

17291

try {

17292

_gtk_icon_source_set_pixbuf(source, pixbuf);

17293

@@ -6967,8 +6967,8 @@

17294

* @param widget cast=(GtkWidget *)

17295

* @param detail cast=(const char *)

17296

*/

17297

-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);

17298

-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) {

17299

+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);

17300

+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) {

17301

lock.lock();

17302

try {

17303

return _gtk_icon_set_render_icon(icon_set, style, direction, state, size, widget, detail);

17304

@@ -6980,8 +6980,8 @@

17305

* @param context cast=(GtkIMContext *)

17306

* @param event cast=(GdkEventKey *)

17307

*/

17308

-public static final native boolean _gtk_im_context_filter_keypress(int /*long*/ context, int /*long*/ event);

17309

-public static final boolean gtk_im_context_filter_keypress(int /*long*/ context, int /*long*/ event) {

17310

+public static final native boolean _gtk_im_context_filter_keypress(long /*int*/ context, long /*int*/ event);

17311

+public static final boolean gtk_im_context_filter_keypress(long /*int*/ context, long /*int*/ event) {

17312

lock.lock();

17313

try {

17314

return _gtk_im_context_filter_keypress(context, event);

17315

@@ -6990,8 +6990,8 @@

17316

}

17317

}

17318

/** @param context cast=(GtkIMContext *) */

17319

-public static final native void _gtk_im_context_focus_in(int /*long*/ context);

17320

-public static final void gtk_im_context_focus_in(int /*long*/ context) {

17321

+public static final native void _gtk_im_context_focus_in(long /*int*/ context);

17322

+public static final void gtk_im_context_focus_in(long /*int*/ context) {

17323

lock.lock();

17324

try {

17325

_gtk_im_context_focus_in(context);

17326

@@ -7000,8 +7000,8 @@

17327

}

17328

}

17329

/** @param context cast=(GtkIMContext *) */

17330

-public static final native void _gtk_im_context_focus_out(int /*long*/ context);

17331

-public static final void gtk_im_context_focus_out(int /*long*/ context) {

17332

+public static final native void _gtk_im_context_focus_out(long /*int*/ context);

17333

+public static final void gtk_im_context_focus_out(long /*int*/ context) {

17334

lock.lock();

17335

try {

17336

_gtk_im_context_focus_out(context);

17337

@@ -7015,8 +7015,8 @@

17338

* @param attrs cast=(PangoAttrList **)

17339

* @param cursor_pos cast=(gint *)

17340

*/

17341

-public static final native void _gtk_im_context_get_preedit_string(int /*long*/ context, int /*long*/[] str, int /*long*/[] attrs, int[] cursor_pos);

17342

-public static final void gtk_im_context_get_preedit_string(int /*long*/ context, int /*long*/[] str, int /*long*/[] attrs, int[] cursor_pos) {

17343

+public static final native void _gtk_im_context_get_preedit_string(long /*int*/ context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos);

17344

+public static final void gtk_im_context_get_preedit_string(long /*int*/ context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos) {

17345

lock.lock();

17346

try {

17347

_gtk_im_context_get_preedit_string(context, str, attrs, cursor_pos);

17348

@@ -7024,8 +7024,8 @@

17349

lock.unlock();

17350

}

17351

}

17352

-public static final native int /*long*/ _gtk_im_context_get_type();

17353

-public static final int /*long*/ gtk_im_context_get_type() {

17354

+public static final native long /*int*/ _gtk_im_context_get_type();

17355

+public static final long /*int*/ gtk_im_context_get_type() {

17356

lock.lock();

17357

try {

17358

return _gtk_im_context_get_type();

17359

@@ -7034,8 +7034,8 @@

17360

}

17361

}

17362

/** @param context cast=(GtkIMContext *) */

17363

-public static final native void _gtk_im_context_reset(int /*long*/ context);

17364

-public static final void gtk_im_context_reset(int /*long*/ context) {

17365

+public static final native void _gtk_im_context_reset(long /*int*/ context);

17366

+public static final void gtk_im_context_reset(long /*int*/ context) {

17367

lock.lock();

17368

try {

17369

_gtk_im_context_reset(context);

17370

@@ -7047,8 +7047,8 @@

17371

* @param context cast=(GtkIMContext *)

17372

* @param window cast=(GdkWindow *)

17373

*/

17374

-public static final native void _gtk_im_context_set_client_window(int /*long*/ context, int /*long*/ window);

17375

-public static final void gtk_im_context_set_client_window(int /*long*/ context, int /*long*/ window) {

17376

+public static final native void _gtk_im_context_set_client_window(long /*int*/ context, long /*int*/ window);

17377

+public static final void gtk_im_context_set_client_window(long /*int*/ context, long /*int*/ window) {

17378

lock.lock();

17379

try {

17380

_gtk_im_context_set_client_window(context, window);

17381

@@ -7060,8 +7060,8 @@

17382

* @param context cast=(GtkIMContext *)

17383

* @param area cast=(GdkRectangle *),flags=no_out

17384

*/

17385

-public static final native void _gtk_im_context_set_cursor_location(int /*long*/ context, GdkRectangle area);

17386

-public static final void gtk_im_context_set_cursor_location(int /*long*/ context, GdkRectangle area) {

17387

+public static final native void _gtk_im_context_set_cursor_location(long /*int*/ context, GdkRectangle area);

17388

+public static final void gtk_im_context_set_cursor_location(long /*int*/ context, GdkRectangle area) {

17389

lock.lock();

17390

try {

17391

_gtk_im_context_set_cursor_location(context, area);

17392

@@ -7073,8 +7073,8 @@

17393

* @param context cast=(GtkIMMulticontext *)

17394

* @param menushell cast=(GtkMenuShell *)

17395

*/

17396

-public static final native void _gtk_im_multicontext_append_menuitems (int /*long*/ context, int /*long*/ menushell);

17397

-public static final void gtk_im_multicontext_append_menuitems (int /*long*/ context, int /*long*/ menushell) {

17398

+public static final native void _gtk_im_multicontext_append_menuitems (long /*int*/ context, long /*int*/ menushell);

17399

+public static final void gtk_im_multicontext_append_menuitems (long /*int*/ context, long /*int*/ menushell) {

17400

lock.lock();

17401

try {

17402

_gtk_im_multicontext_append_menuitems(context, menushell);

17403

@@ -7082,8 +7082,8 @@

17404

lock.unlock();

17405

}

17406

}

17407

-public static final native int /*long*/ _gtk_im_multicontext_new();

17408

-public static final int /*long*/ gtk_im_multicontext_new() {

17409

+public static final native long /*int*/ _gtk_im_multicontext_new();

17410

+public static final long /*int*/ gtk_im_multicontext_new() {

17411

lock.lock();

17412

try {

17413

return _gtk_im_multicontext_new();

17414

@@ -7092,8 +7092,8 @@

17415

}

17416

}

17417

/** @param label cast=(const gchar *) */

17418

-public static final native int /*long*/ _gtk_image_menu_item_new_with_label(byte[] label);

17419

-public static final int /*long*/ gtk_image_menu_item_new_with_label(byte[] label) {

17420

+public static final native long /*int*/ _gtk_image_menu_item_new_with_label(byte[] label);

17421

+public static final long /*int*/ gtk_image_menu_item_new_with_label(byte[] label) {

17422

lock.lock();

17423

try {

17424

return _gtk_image_menu_item_new_with_label(label);

17425

@@ -7105,8 +7105,8 @@

17426

* @param menu_item cast=(GtkImageMenuItem *)

17427

* @param image cast=(GtkWidget *)

17428

*/

17429

-public static final native void _gtk_image_menu_item_set_image(int /*long*/ menu_item, int /*long*/ image);

17430

-public static final void gtk_image_menu_item_set_image(int /*long*/ menu_item, int /*long*/ image) {

17431

+public static final native void _gtk_image_menu_item_set_image(long /*int*/ menu_item, long /*int*/ image);

17432

+public static final void gtk_image_menu_item_set_image(long /*int*/ menu_item, long /*int*/ image) {

17433

lock.lock();

17434

try {

17435

_gtk_image_menu_item_set_image(menu_item, image);

17436

@@ -7114,8 +7114,8 @@

17437

lock.unlock();

17438

}

17439

}

17440

-public static final native int /*long*/ _gtk_image_new();

17441

-public static final int /*long*/ gtk_image_new() {

17442

+public static final native long /*int*/ _gtk_image_new();

17443

+public static final long /*int*/ gtk_image_new() {

17444

lock.lock();

17445

try {

17446

return _gtk_image_new();

17447

@@ -7124,8 +7124,8 @@

17448

}

17449

}

17450

/** @param pixbuf cast=(GdkPixbuf *) */

17451

-public static final native int /*long*/ _gtk_image_new_from_pixbuf(int /*long*/ pixbuf);

17452

-public static final int /*long*/ gtk_image_new_from_pixbuf(int /*long*/ pixbuf) {

17453

+public static final native long /*int*/ _gtk_image_new_from_pixbuf(long /*int*/ pixbuf);

17454

+public static final long /*int*/ gtk_image_new_from_pixbuf(long /*int*/ pixbuf) {

17455

lock.lock();

17456

try {

17457

return _gtk_image_new_from_pixbuf(pixbuf);

17458

@@ -7137,8 +7137,8 @@

17459

* @param pixmap cast=(GdkPixmap *)

17460

* @param mask cast=(GdkBitmap *)

17461

*/

17462

-public static final native int /*long*/ _gtk_image_new_from_pixmap(int /*long*/ pixmap, int /*long*/ mask);

17463

-public static final int /*long*/ gtk_image_new_from_pixmap(int /*long*/ pixmap, int /*long*/ mask) {

17464

+public static final native long /*int*/ _gtk_image_new_from_pixmap(long /*int*/ pixmap, long /*int*/ mask);

17465

+public static final long /*int*/ gtk_image_new_from_pixmap(long /*int*/ pixmap, long /*int*/ mask) {

17466

lock.lock();

17467

try {

17468

return _gtk_image_new_from_pixmap(pixmap, mask);

17469

@@ -7150,8 +7150,8 @@

17470

* @param image cast=(GtkImage *)

17471

* @param pixbuf cast=(GdkPixbuf *)

17472

*/

17473

-public static final native void _gtk_image_set_from_pixbuf(int /*long*/ image, int /*long*/ pixbuf);

17474

-public static final void gtk_image_set_from_pixbuf(int /*long*/ image, int /*long*/ pixbuf) {

17475

+public static final native void _gtk_image_set_from_pixbuf(long /*int*/ image, long /*int*/ pixbuf);

17476

+public static final void gtk_image_set_from_pixbuf(long /*int*/ image, long /*int*/ pixbuf) {

17477

lock.lock();

17478

try {

17479

_gtk_image_set_from_pixbuf(image, pixbuf);

17480

@@ -7164,8 +7164,8 @@

17481

* @param pixmap cast=(GdkBitmap *)

17482

* @param mask cast=(GdkBitmap *)

17483

*/

17484

-public static final native void _gtk_image_set_from_pixmap(int /*long*/ image, int /*long*/ pixmap, int /*long*/ mask);

17485

-public static final void gtk_image_set_from_pixmap(int /*long*/ image, int /*long*/ pixmap, int /*long*/ mask) {

17486

+public static final native void _gtk_image_set_from_pixmap(long /*int*/ image, long /*int*/ pixmap, long /*int*/ mask);

17487

+public static final void gtk_image_set_from_pixmap(long /*int*/ image, long /*int*/ pixmap, long /*int*/ mask) {

17488

lock.lock();

17489

try {

17490

_gtk_image_set_from_pixmap(image, pixmap, mask);

17491

@@ -7177,8 +7177,8 @@

17492

* @param argc cast=(int *)

17493

* @param argv cast=(char ***)

17494

*/

17495

-public static final native boolean _gtk_init_check(int /*long*/[] argc, int /*long*/[] argv);

17496

-public static final boolean gtk_init_check(int /*long*/[] argc, int /*long*/[] argv) {

17497

+public static final native boolean _gtk_init_check(long /*int*/[] argc, long /*int*/[] argv);

17498

+public static final boolean gtk_init_check(long /*int*/[] argc, long /*int*/[] argv) {

17499

lock.lock();

17500

try {

17501

return _gtk_init_check(argc, argv);

17502

@@ -7187,8 +7187,8 @@

17503

}

17504

}

17505

/** @param label cast=(GtkLabel *) */

17506

-public static final native int /*long*/ _gtk_label_get_layout(int /*long*/ label);

17507

-public static final int /*long*/ gtk_label_get_layout(int /*long*/ label) {

17508

+public static final native long /*int*/ _gtk_label_get_layout(long /*int*/ label);

17509

+public static final long /*int*/ gtk_label_get_layout(long /*int*/ label) {

17510

lock.lock();

17511

try {

17512

return _gtk_label_get_layout(label);

17513

@@ -7197,8 +7197,8 @@

17514

}

17515

}

17516

/** @param label cast=(GtkLabel *) */

17517

-public static final native int _gtk_label_get_mnemonic_keyval(int /*long*/ label);

17518

-public static final int gtk_label_get_mnemonic_keyval(int /*long*/ label) {

17519

+public static final native int _gtk_label_get_mnemonic_keyval(long /*int*/ label);

17520

+public static final int gtk_label_get_mnemonic_keyval(long /*int*/ label) {

17521

lock.lock();

17522

try {

17523

return _gtk_label_get_mnemonic_keyval(label);

17524

@@ -7207,8 +7207,8 @@

17525

}

17526

}

17527

/** @param label cast=(const gchar *) */

17528

-public static final native int /*long*/ _gtk_label_new(byte[] label);

17529

-public static final int /*long*/ gtk_label_new(byte[] label) {

17530

+public static final native long /*int*/ _gtk_label_new(byte[] label);

17531

+public static final long /*int*/ gtk_label_new(byte[] label) {

17532

lock.lock();

17533

try {

17534

return _gtk_label_new(label);

17535

@@ -7217,8 +7217,8 @@

17536

}

17537

}

17538

/** @param str cast=(const gchar *) */

17539

-public static final native int /*long*/ _gtk_label_new_with_mnemonic(byte[] str);

17540

-public static final int /*long*/ gtk_label_new_with_mnemonic(byte[] str) {

17541

+public static final native long /*int*/ _gtk_label_new_with_mnemonic(byte[] str);

17542

+public static final long /*int*/ gtk_label_new_with_mnemonic(byte[] str) {

17543

lock.lock();

17544

try {

17545

return _gtk_label_new_with_mnemonic(str);

17546

@@ -7230,8 +7230,8 @@

17547

* @param label cast=(GtkLabel *)

17548

* @param attrs cast=(PangoAttrList *)

17549

*/

17550

-public static final native void _gtk_label_set_attributes(int /*long*/ label, int /*long*/ attrs);

17551

-public static final void gtk_label_set_attributes(int /*long*/ label, int /*long*/ attrs) {

17552

+public static final native void _gtk_label_set_attributes(long /*int*/ label, long /*int*/ attrs);

17553

+public static final void gtk_label_set_attributes(long /*int*/ label, long /*int*/ attrs) {

17554

lock.lock();

17555

try {

17556

_gtk_label_set_attributes(label, attrs);

17557

@@ -7243,8 +7243,8 @@

17558

* @param label cast=(GtkLabel *)

17559

* @param jtype cast=(GtkJustification)

17560

*/

17561

-public static final native void _gtk_label_set_justify(int /*long*/ label, int jtype);

17562

-public static final void gtk_label_set_justify(int /*long*/ label, int jtype) {

17563

+public static final native void _gtk_label_set_justify(long /*int*/ label, int jtype);

17564

+public static final void gtk_label_set_justify(long /*int*/ label, int jtype) {

17565

lock.lock();

17566

try {

17567

_gtk_label_set_justify(label, jtype);

17568

@@ -7256,8 +7256,8 @@

17569

* @param label cast=(GtkLabel *)

17570

* @param wrap cast=(gboolean)

17571

*/

17572

-public static final native void _gtk_label_set_line_wrap(int /*long*/ label, boolean wrap);

17573

-public static final void gtk_label_set_line_wrap(int /*long*/ label, boolean wrap) {

17574

+public static final native void _gtk_label_set_line_wrap(long /*int*/ label, boolean wrap);

17575

+public static final void gtk_label_set_line_wrap(long /*int*/ label, boolean wrap) {

17576

lock.lock();

17577

try {

17578

_gtk_label_set_line_wrap(label, wrap);

17579

@@ -7266,8 +7266,8 @@

17580

}

17581

}

17582

/** @method flags=dynamic */

17583

-public static final native void _gtk_label_set_line_wrap_mode(int /*long*/ label, int wrap_mode);

17584

-public static final void gtk_label_set_line_wrap_mode(int /*long*/ label, int wrap_mode) {

17585

+public static final native void _gtk_label_set_line_wrap_mode(long /*int*/ label, int wrap_mode);

17586

+public static final void gtk_label_set_line_wrap_mode(long /*int*/ label, int wrap_mode) {

17587

lock.lock();

17588

try {

17589

_gtk_label_set_line_wrap_mode(label, wrap_mode);

17590

@@ -7279,8 +7279,8 @@

17591

* @param label cast=(GtkLabel *)

17592

* @param str cast=(const gchar *)

17593

*/

17594

-public static final native void _gtk_label_set_text(int /*long*/ label, int /*long*/ str);

17595

-public static final void gtk_label_set_text(int /*long*/ label, int /*long*/ str) {

17596

+public static final native void _gtk_label_set_text(long /*int*/ label, long /*int*/ str);

17597

+public static final void gtk_label_set_text(long /*int*/ label, long /*int*/ str) {

17598

lock.lock();

17599

try {

17600

_gtk_label_set_text(label, str);

17601

@@ -7292,8 +7292,8 @@

17602

* @param label cast=(GtkLabel *)

17603

* @param str cast=(const gchar *)

17604

*/

17605

-public static final native void _gtk_label_set_text(int /*long*/ label, byte[] str);

17606

-public static final void gtk_label_set_text(int /*long*/ label, byte[] str) {

17607

+public static final native void _gtk_label_set_text(long /*int*/ label, byte[] str);

17608

+public static final void gtk_label_set_text(long /*int*/ label, byte[] str) {

17609

lock.lock();

17610

try {

17611

_gtk_label_set_text(label, str);

17612

@@ -7305,8 +7305,8 @@

17613

* @param label cast=(GtkLabel *)

17614

* @param str cast=(const gchar *)

17615

*/

17616

-public static final native void _gtk_label_set_text_with_mnemonic(int /*long*/ label, byte[] str);

17617

-public static final void gtk_label_set_text_with_mnemonic(int /*long*/ label, byte[] str) {

17618

+public static final native void _gtk_label_set_text_with_mnemonic(long /*int*/ label, byte[] str);

17619

+public static final void gtk_label_set_text_with_mnemonic(long /*int*/ label, byte[] str) {

17620

lock.lock();

17621

try {

17622

_gtk_label_set_text_with_mnemonic(label, str);

17623

@@ -7318,8 +7318,8 @@

17624

* @param list cast=(GtkList *)

17625

* @param items cast=(GList *)

17626

*/

17627

-public static final native void _gtk_list_append_items(int /*long*/ list, int /*long*/ items);

17628

-public static final void gtk_list_append_items(int /*long*/ list, int /*long*/ items) {

17629

+public static final native void _gtk_list_append_items(long /*int*/ list, long /*int*/ items);

17630

+public static final void gtk_list_append_items(long /*int*/ list, long /*int*/ items) {

17631

lock.lock();

17632

try {

17633

_gtk_list_append_items(list, items);

17634

@@ -7328,8 +7328,8 @@

17635

}

17636

}

17637

/** @param list cast=(GtkList *) */

17638

-public static final native void _gtk_list_clear_items(int /*long*/ list, int start, int end);

17639

-public static final void gtk_list_clear_items(int /*long*/ list, int start, int end) {

17640

+public static final native void _gtk_list_clear_items(long /*int*/ list, int start, int end);

17641

+public static final void gtk_list_clear_items(long /*int*/ list, int start, int end) {

17642

lock.lock();

17643

try {

17644

_gtk_list_clear_items(list, start, end);

17645

@@ -7341,8 +7341,8 @@

17646

* @param list cast=(GtkList *)

17647

* @param items cast=(GList *)

17648

*/

17649

-public static final native void _gtk_list_insert_items(int /*long*/ list, int /*long*/ items, int position);

17650

-public static final void gtk_list_insert_items(int /*long*/ list, int /*long*/ items, int position) {

17651

+public static final native void _gtk_list_insert_items(long /*int*/ list, long /*int*/ items, int position);

17652

+public static final void gtk_list_insert_items(long /*int*/ list, long /*int*/ items, int position) {

17653

lock.lock();

17654

try {

17655

_gtk_list_insert_items(list, items, position);

17656

@@ -7351,8 +7351,8 @@

17657

}

17658

}

17659

/** @param label cast=(const gchar *) */

17660

-public static final native int /*long*/ _gtk_list_item_new_with_label(byte[] label);

17661

-public static final int /*long*/ gtk_list_item_new_with_label(byte[] label) {

17662

+public static final native long /*int*/ _gtk_list_item_new_with_label(byte[] label);

17663

+public static final long /*int*/ gtk_list_item_new_with_label(byte[] label) {

17664

lock.lock();

17665

try {

17666

return _gtk_list_item_new_with_label(label);

17667

@@ -7364,8 +7364,8 @@

17668

* @param list cast=(GtkList *)

17669

* @param items cast=(GList *)

17670

*/

17671

-public static final native void _gtk_list_remove_items(int /*long*/ list, int /*long*/ items);

17672

-public static final void gtk_list_remove_items(int /*long*/ list, int /*long*/ items) {

17673

+public static final native void _gtk_list_remove_items(long /*int*/ list, long /*int*/ items);

17674

+public static final void gtk_list_remove_items(long /*int*/ list, long /*int*/ items) {

17675

lock.lock();

17676

try {

17677

_gtk_list_remove_items(list, items);

17678

@@ -7374,8 +7374,8 @@

17679

}

17680

}

17681

/** @param list cast=(GtkList *) */

17682

-public static final native void _gtk_list_select_item(int /*long*/ list, int item);

17683

-public static final void gtk_list_select_item(int /*long*/ list, int item) {

17684

+public static final native void _gtk_list_select_item(long /*int*/ list, int item);

17685

+public static final void gtk_list_select_item(long /*int*/ list, int item) {

17686

lock.lock();

17687

try {

17688

_gtk_list_select_item(list, item);

17689

@@ -7384,8 +7384,8 @@

17690

}

17691

}

17692

/** @param list cast=(GtkList *) */

17693

-public static final native void _gtk_list_unselect_all(int /*long*/ list);

17694

-public static final void gtk_list_unselect_all(int /*long*/ list) {

17695

+public static final native void _gtk_list_unselect_all(long /*int*/ list);

17696

+public static final void gtk_list_unselect_all(long /*int*/ list) {

17697

lock.lock();

17698

try {

17699

_gtk_list_unselect_all(list);

17700

@@ -7394,8 +7394,8 @@

17701

}

17702

}

17703

/** @param list cast=(GtkList *) */

17704

-public static final native void _gtk_list_unselect_item(int /*long*/ list, int item);

17705

-public static final void gtk_list_unselect_item(int /*long*/ list, int item) {

17706

+public static final native void _gtk_list_unselect_item(long /*int*/ list, int item);

17707

+public static final void gtk_list_unselect_item(long /*int*/ list, int item) {

17708

lock.lock();

17709

try {

17710

_gtk_list_unselect_item(list, item);

17711

@@ -7407,8 +7407,8 @@

17712

* @param list_store cast=(GtkListStore *)

17713

* @param iter cast=(GtkTreeIter *)

17714

*/

17715

-public static final native void _gtk_list_store_append(int /*long*/ list_store, int /*long*/ iter);

17716

-public static final void gtk_list_store_append(int /*long*/ list_store, int /*long*/ iter) {

17717

+public static final native void _gtk_list_store_append(long /*int*/ list_store, long /*int*/ iter);

17718

+public static final void gtk_list_store_append(long /*int*/ list_store, long /*int*/ iter) {

17719

lock.lock();

17720

try {

17721

_gtk_list_store_append(list_store, iter);

17722

@@ -7417,8 +7417,8 @@

17723

}

17724

}

17725

/** @param store cast=(GtkListStore *) */

17726

-public static final native void _gtk_list_store_clear(int /*long*/ store);

17727

-public static final void gtk_list_store_clear(int /*long*/ store) {

17728

+public static final native void _gtk_list_store_clear(long /*int*/ store);

17729

+public static final void gtk_list_store_clear(long /*int*/ store) {

17730

lock.lock();

17731

try {

17732

_gtk_list_store_clear(store);

17733

@@ -7431,8 +7431,8 @@

17734

* @param iter cast=(GtkTreeIter *)

17735

* @param position cast=(gint)

17736

*/

17737

-public static final native void _gtk_list_store_insert(int /*long*/ list_store, int /*long*/ iter, int position);

17738

-public static final void gtk_list_store_insert(int /*long*/ list_store, int /*long*/ iter, int position) {

17739

+public static final native void _gtk_list_store_insert(long /*int*/ list_store, long /*int*/ iter, int position);

17740

+public static final void gtk_list_store_insert(long /*int*/ list_store, long /*int*/ iter, int position) {

17741

lock.lock();

17742

try {

17743

_gtk_list_store_insert(list_store, iter, position);

17744

@@ -7444,8 +7444,8 @@

17745

* @param numColumns cast=(gint)

17746

* @param types cast=(GType *)

17747

*/

17748

-public static final native int /*long*/ _gtk_list_store_newv(int numColumns, int /*long*/[] types);

17749

-public static final int /*long*/ gtk_list_store_newv(int numColumns, int /*long*/[] types) {

17750

+public static final native long /*int*/ _gtk_list_store_newv(int numColumns, long /*int*/[] types);

17751

+public static final long /*int*/ gtk_list_store_newv(int numColumns, long /*int*/[] types) {

17752

lock.lock();

17753

try {

17754

return _gtk_list_store_newv(numColumns, types);

17755

@@ -7457,8 +7457,8 @@

17756

* @param list_store cast=(GtkListStore *)

17757

* @param iter cast=(GtkTreeIter *)

17758

*/

17759

-public static final native void _gtk_list_store_remove(int /*long*/ list_store, int /*long*/ iter);

17760

-public static final void gtk_list_store_remove(int /*long*/ list_store, int /*long*/ iter) {

17761

+public static final native void _gtk_list_store_remove(long /*int*/ list_store, long /*int*/ iter);

17762

+public static final void gtk_list_store_remove(long /*int*/ list_store, long /*int*/ iter) {

17763

lock.lock();

17764

try {

17765

_gtk_list_store_remove(list_store, iter);

17766

@@ -7470,8 +7470,8 @@

17767

* @param store cast=(GtkListStore *)

17768

* @param iter cast=(GtkTreeIter *)

17769

*/

17770

-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int /*long*/ terminator);

17771

-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int /*long*/ terminator) {

17772

+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, long /*int*/ terminator);

17773

+public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, long /*int*/ terminator) {

17774

lock.lock();

17775

try {

17776

_gtk_list_store_set(store, iter, column, value, terminator);

17777

@@ -7483,8 +7483,8 @@

17778

* @param store cast=(GtkListStore *)

17779

* @param iter cast=(GtkTreeIter *)

17780

*/

17781

-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int /*long*/ terminator);

17782

-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int /*long*/ terminator) {

17783

+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, long /*int*/ terminator);

17784

+public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, long /*int*/ terminator) {

17785

lock.lock();

17786

try {

17787

_gtk_list_store_set(store, iter, column, value, terminator);

17788

@@ -7496,8 +7496,8 @@

17789

* @param store cast=(GtkListStore *)

17790

* @param iter cast=(GtkTreeIter *)

17791

*/

17792

-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int /*long*/ terminator);

17793

-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int /*long*/ terminator) {

17794

+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, long /*int*/ terminator);

17795

+public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, long /*int*/ terminator) {

17796

lock.lock();

17797

try {

17798

_gtk_list_store_set(store, iter, column, value, terminator);

17799

@@ -7510,8 +7510,8 @@

17800

* @param iter cast=(GtkTreeIter *)

17801

* @param value flags=no_out

17802

*/

17803

-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int /*long*/ terminator);

17804

-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int /*long*/ terminator) {

17805

+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, long /*int*/ terminator);

17806

+public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, long /*int*/ terminator) {

17807

lock.lock();

17808

try {

17809

_gtk_list_store_set(store, iter, column, value, terminator);

17810

@@ -7523,8 +7523,8 @@

17811

* @param store cast=(GtkListStore *)

17812

* @param iter cast=(GtkTreeIter *)

17813

*/

17814

-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int /*long*/ terminator);

17815

-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int /*long*/ terminator) {

17816

+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, long /*int*/ terminator);

17817

+public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, long /*int*/ terminator) {

17818

lock.lock();

17819

try {

17820

_gtk_list_store_set(store, iter, column, value, terminator);

17821

@@ -7581,8 +7581,8 @@

17822

}

17823

}

17824

/** @param event cast=(GdkEvent *) */

17825

-public static final native void _gtk_main_do_event(int /*long*/ event);

17826

-public static final void gtk_main_do_event(int /*long*/ event) {

17827

+public static final native void _gtk_main_do_event(long /*int*/ event);

17828

+public static final void gtk_main_do_event(long /*int*/ event) {

17829

lock.lock();

17830

try {

17831

_gtk_main_do_event(event);

17832

@@ -7590,8 +7590,8 @@

17833

lock.unlock();

17834

}

17835

}

17836

-public static final native int /*long*/ _gtk_menu_bar_new();

17837

-public static final int /*long*/ gtk_menu_bar_new() {

17838

+public static final native long /*int*/ _gtk_menu_bar_new();

17839

+public static final long /*int*/ gtk_menu_bar_new() {

17840

lock.lock();

17841

try {

17842

return _gtk_menu_bar_new();

17843

@@ -7600,8 +7600,8 @@

17844

}

17845

}

17846

/** @param menu cast=(GtkMenu *) */

17847

-public static final native int /*long*/ _gtk_menu_get_attach_widget(int /*long*/ menu);

17848

-public static final int /*long*/ gtk_menu_get_attach_widget(int /*long*/ menu) {

17849

+public static final native long /*int*/ _gtk_menu_get_attach_widget(long /*int*/ menu);

17850

+public static final long /*int*/ gtk_menu_get_attach_widget(long /*int*/ menu) {

17851

lock.lock();

17852

try {

17853

return _gtk_menu_get_attach_widget(menu);

17854

@@ -7610,8 +7610,8 @@

17855

}

17856

}

17857

/** @param menu_item cast=(GtkMenuItem *) */

17858

-public static final native void _gtk_menu_item_remove_submenu(int /*long*/ menu_item);

17859

-public static final void gtk_menu_item_remove_submenu(int /*long*/ menu_item) {

17860

+public static final native void _gtk_menu_item_remove_submenu(long /*int*/ menu_item);

17861

+public static final void gtk_menu_item_remove_submenu(long /*int*/ menu_item) {

17862

lock.lock();

17863

try {

17864

_gtk_menu_item_remove_submenu(menu_item);

17865

@@ -7620,8 +7620,8 @@

17866

}

17867

}

17868

/** @param menu_item cast=(GtkMenuItem *) */

17869

-public static final native int /*long*/ _gtk_menu_item_get_submenu(int /*long*/ menu_item);

17870

-public static final int /*long*/ gtk_menu_item_get_submenu(int /*long*/ menu_item) {

17871

+public static final native long /*int*/ _gtk_menu_item_get_submenu(long /*int*/ menu_item);

17872

+public static final long /*int*/ gtk_menu_item_get_submenu(long /*int*/ menu_item) {

17873

lock.lock();

17874

try {

17875

return _gtk_menu_item_get_submenu(menu_item);

17876

@@ -7633,8 +7633,8 @@

17877

* @param menu_item cast=(GtkMenuItem *)

17878

* @param submenu cast=(GtkWidget *)

17879

*/

17880

-public static final native void _gtk_menu_item_set_submenu(int /*long*/ menu_item, int /*long*/ submenu);

17881

-public static final void gtk_menu_item_set_submenu(int /*long*/ menu_item, int /*long*/ submenu) {

17882

+public static final native void _gtk_menu_item_set_submenu(long /*int*/ menu_item, long /*int*/ submenu);

17883

+public static final void gtk_menu_item_set_submenu(long /*int*/ menu_item, long /*int*/ submenu) {

17884

lock.lock();

17885

try {

17886

_gtk_menu_item_set_submenu(menu_item, submenu);

17887

@@ -7642,8 +7642,8 @@

17888

lock.unlock();

17889

}

17890

}

17891

-public static final native int /*long*/ _gtk_menu_new();

17892

-public static final int /*long*/ gtk_menu_new() {

17893

+public static final native long /*int*/ _gtk_menu_new();

17894

+public static final long /*int*/ gtk_menu_new() {

17895

lock.lock();

17896

try {

17897

return _gtk_menu_new();

17898

@@ -7652,8 +7652,8 @@

17899

}

17900

}

17901

/** @param menu cast=(GtkMenu *) */

17902

-public static final native void _gtk_menu_popdown(int /*long*/ menu);

17903

-public static final void gtk_menu_popdown(int /*long*/ menu) {

17904

+public static final native void _gtk_menu_popdown(long /*int*/ menu);

17905

+public static final void gtk_menu_popdown(long /*int*/ menu) {

17906

lock.lock();

17907

try {

17908

_gtk_menu_popdown(menu);

17909

@@ -7670,8 +7670,8 @@

17910

* @param button cast=(guint)

17911

* @param activate_time cast=(guint32)

17912

*/

17913

-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);

17914

-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) {

17915

+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);

17916

+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) {

17917

lock.lock();

17918

try {

17919

_gtk_menu_popup(menu, parent_menu_shell, parent_menu_item, func, data, button, activate_time);

17920

@@ -7680,8 +7680,8 @@

17921

}

17922

}

17923

/** @param menu_shell cast=(GtkMenuShell *) */

17924

-public static final native void _gtk_menu_shell_deactivate(int /*long*/ menu_shell);

17925

-public static final void gtk_menu_shell_deactivate(int /*long*/ menu_shell) {

17926

+public static final native void _gtk_menu_shell_deactivate(long /*int*/ menu_shell);

17927

+public static final void gtk_menu_shell_deactivate(long /*int*/ menu_shell) {

17928

lock.lock();

17929

try {

17930

_gtk_menu_shell_deactivate(menu_shell);

17931

@@ -7694,8 +7694,8 @@

17932

* @param child cast=(GtkWidget *)

17933

* @param position cast=(gint)

17934

*/

17935

-public static final native void _gtk_menu_shell_insert(int /*long*/ menu_shell, int /*long*/ child, int position);

17936

-public static final void gtk_menu_shell_insert(int /*long*/ menu_shell, int /*long*/ child, int position) {

17937

+public static final native void _gtk_menu_shell_insert(long /*int*/ menu_shell, long /*int*/ child, int position);

17938

+public static final void gtk_menu_shell_insert(long /*int*/ menu_shell, long /*int*/ child, int position) {

17939

lock.lock();

17940

try {

17941

_gtk_menu_shell_insert(menu_shell, child, position);

17942

@@ -7707,8 +7707,8 @@

17943

* @param menu_shell cast=(GtkMenuShell *)

17944

* @param menu_item cast=(GtkWidget *)

17945

*/

17946

-public static final native void _gtk_menu_shell_select_item(int /*long*/ menu_shell, int /*long*/ menu_item);

17947

-public static final void gtk_menu_shell_select_item(int /*long*/ menu_shell, int /*long*/ menu_item) {

17948

+public static final native void _gtk_menu_shell_select_item(long /*int*/ menu_shell, long /*int*/ menu_item);

17949

+public static final void gtk_menu_shell_select_item(long /*int*/ menu_shell, long /*int*/ menu_item) {

17950

lock.lock();

17951

try {

17952

_gtk_menu_shell_select_item(menu_shell, menu_item);

17953

@@ -7721,8 +7721,8 @@

17954

* @param menu_shell cast=(GtkMenuShell *)

17955

* @param take_focus cast=(gboolean)

17956

*/

17957

-public static final native void _gtk_menu_shell_set_take_focus(int /*long*/ menu_shell, boolean take_focus);

17958

-public static final void gtk_menu_shell_set_take_focus(int /*long*/ menu_shell, boolean take_focus) {

17959

+public static final native void _gtk_menu_shell_set_take_focus(long /*int*/ menu_shell, boolean take_focus);

17960

+public static final void gtk_menu_shell_set_take_focus(long /*int*/ menu_shell, boolean take_focus) {

17961

lock.lock();

17962

try {

17963

_gtk_menu_shell_set_take_focus(menu_shell, take_focus);

17964

@@ -7737,8 +7737,8 @@

17965

* @param buttons cast=(GtkButtonsType)

17966

* @param message_format cast=(const gchar *)

17967

*/

17968

-public static final native int /*long*/ _gtk_message_dialog_new(int /*long*/ parent, int flags, int type, int buttons, byte[] message_format);

17969

-public static final int /*long*/ gtk_message_dialog_new(int /*long*/ parent, int flags, int type, int buttons, byte[] message_format) {

17970

+public static final native long /*int*/ _gtk_message_dialog_new(long /*int*/ parent, int flags, int type, int buttons, byte[] message_format);

17971

+public static final long /*int*/ gtk_message_dialog_new(long /*int*/ parent, int flags, int type, int buttons, byte[] message_format) {

17972

lock.lock();

17973

try {

17974

return _gtk_message_dialog_new(parent, flags, type, buttons, message_format);

17975

@@ -7751,8 +7751,8 @@

17976

* @param xalign cast=(gfloat)

17977

* @param yalign cast=(gfloat)

17978

*/

17979

-public static final native void _gtk_misc_set_alignment(int /*long*/ misc, float xalign, float yalign);

17980

-public static final void gtk_misc_set_alignment(int /*long*/ misc, float xalign, float yalign) {

17981

+public static final native void _gtk_misc_set_alignment(long /*int*/ misc, float xalign, float yalign);

17982

+public static final void gtk_misc_set_alignment(long /*int*/ misc, float xalign, float yalign) {

17983

lock.lock();

17984

try {

17985

_gtk_misc_set_alignment(misc, xalign, yalign);

17986

@@ -7761,8 +7761,8 @@

17987

}

17988

}

17989

/** @param notebook cast=(GtkNotebook *) */

17990

-public static final native int _gtk_notebook_get_current_page(int /*long*/ notebook);

17991

-public static final int gtk_notebook_get_current_page(int /*long*/ notebook) {

17992

+public static final native int _gtk_notebook_get_current_page(long /*int*/ notebook);

17993

+public static final int gtk_notebook_get_current_page(long /*int*/ notebook) {

17994

lock.lock();

17995

try {

17996

return _gtk_notebook_get_current_page(notebook);

17997

@@ -7771,8 +7771,8 @@

17998

}

17999

}

18000

/** @param notebook cast=(GtkNotebook *) */

18001

-public static final native boolean _gtk_notebook_get_scrollable(int /*long*/ notebook);

18002

-public static final boolean gtk_notebook_get_scrollable(int /*long*/ notebook) {

18003

+public static final native boolean _gtk_notebook_get_scrollable(long /*int*/ notebook);

18004

+public static final boolean gtk_notebook_get_scrollable(long /*int*/ notebook) {

18005

lock.lock();

18006

try {

18007

return _gtk_notebook_get_scrollable(notebook);

18008

@@ -7786,8 +7786,8 @@

18009

* @param tab_label cast=(GtkWidget *)

18010

* @param position cast=(gint)

18011

*/

18012

-public static final native void _gtk_notebook_insert_page(int /*long*/ notebook, int /*long*/ child, int /*long*/ tab_label, int position);

18013

-public static final void gtk_notebook_insert_page(int /*long*/ notebook, int /*long*/ child, int /*long*/ tab_label, int position) {

18014

+public static final native void _gtk_notebook_insert_page(long /*int*/ notebook, long /*int*/ child, long /*int*/ tab_label, int position);

18015

+public static final void gtk_notebook_insert_page(long /*int*/ notebook, long /*int*/ child, long /*int*/ tab_label, int position) {

18016

lock.lock();

18017

try {

18018

_gtk_notebook_insert_page(notebook, child, tab_label, position);

18019

@@ -7795,8 +7795,8 @@

18020

lock.unlock();

18021

}

18022

}

18023

-public static final native int /*long*/ _gtk_notebook_new();

18024

-public static final int /*long*/ gtk_notebook_new() {

18025

+public static final native long /*int*/ _gtk_notebook_new();

18026

+public static final long /*int*/ gtk_notebook_new() {

18027

lock.lock();

18028

try {

18029

return _gtk_notebook_new();

18030

@@ -7805,8 +7805,8 @@

18031

}

18032

}

18033

/** @param notebook cast=(GtkNotebook *) */

18034

-public static final native void _gtk_notebook_next_page(int /*long*/ notebook);

18035

-public static final void gtk_notebook_next_page(int /*long*/ notebook) {

18036

+public static final native void _gtk_notebook_next_page(long /*int*/ notebook);

18037

+public static final void gtk_notebook_next_page(long /*int*/ notebook) {

18038

lock.lock();

18039

try {

18040

_gtk_notebook_next_page(notebook);

18041

@@ -7815,8 +7815,8 @@

18042

}

18043

}

18044

/** @param notebook cast=(GtkNotebook *) */

18045

-public static final native void _gtk_notebook_prev_page(int /*long*/ notebook);

18046

-public static final void gtk_notebook_prev_page(int /*long*/ notebook) {

18047

+public static final native void _gtk_notebook_prev_page(long /*int*/ notebook);

18048

+public static final void gtk_notebook_prev_page(long /*int*/ notebook) {

18049

lock.lock();

18050

try {

18051

_gtk_notebook_prev_page(notebook);

18052

@@ -7828,8 +7828,8 @@

18053

* @param notebook cast=(GtkNotebook *)

18054

* @param page_num cast=(gint)

18055

*/

18056

-public static final native void _gtk_notebook_remove_page(int /*long*/ notebook, int page_num);

18057

-public static final void gtk_notebook_remove_page(int /*long*/ notebook, int page_num) {

18058

+public static final native void _gtk_notebook_remove_page(long /*int*/ notebook, int page_num);

18059

+public static final void gtk_notebook_remove_page(long /*int*/ notebook, int page_num) {

18060

lock.lock();

18061

try {

18062

_gtk_notebook_remove_page(notebook, page_num);

18063

@@ -7841,8 +7841,8 @@

18064

* @param notebook cast=(GtkNotebook *)

18065

* @param page_num cast=(gint)

18066

*/

18067

-public static final native void _gtk_notebook_set_current_page(int /*long*/ notebook, int page_num);

18068

-public static final void gtk_notebook_set_current_page(int /*long*/ notebook, int page_num) {

18069

+public static final native void _gtk_notebook_set_current_page(long /*int*/ notebook, int page_num);

18070

+public static final void gtk_notebook_set_current_page(long /*int*/ notebook, int page_num) {

18071

lock.lock();

18072

try {

18073

_gtk_notebook_set_current_page(notebook, page_num);

18074

@@ -7854,8 +7854,8 @@

18075

* @param notebook cast=(GtkNotebook *)

18076

* @param scrollable cast=(gboolean)

18077

*/

18078

-public static final native void _gtk_notebook_set_scrollable(int /*long*/ notebook, boolean scrollable);

18079

-public static final void gtk_notebook_set_scrollable(int /*long*/ notebook, boolean scrollable) {

18080

+public static final native void _gtk_notebook_set_scrollable(long /*int*/ notebook, boolean scrollable);

18081

+public static final void gtk_notebook_set_scrollable(long /*int*/ notebook, boolean scrollable) {

18082

lock.lock();

18083

try {

18084

_gtk_notebook_set_scrollable(notebook, scrollable);

18085

@@ -7867,8 +7867,8 @@

18086

* @param notebook cast=(GtkNotebook *)

18087

* @param show_tabs cast=(gboolean)

18088

*/

18089

-public static final native void _gtk_notebook_set_show_tabs(int /*long*/ notebook, boolean show_tabs);

18090

-public static final void gtk_notebook_set_show_tabs(int /*long*/ notebook, boolean show_tabs) {

18091

+public static final native void _gtk_notebook_set_show_tabs(long /*int*/ notebook, boolean show_tabs);

18092

+public static final void gtk_notebook_set_show_tabs(long /*int*/ notebook, boolean show_tabs) {

18093

lock.lock();

18094

try {

18095

_gtk_notebook_set_show_tabs(notebook, show_tabs);

18096

@@ -7880,8 +7880,8 @@

18097

* @param notebook cast=(GtkNotebook *)

18098

* @param pos cast=(GtkPositionType)

18099

*/

18100

-public static final native void _gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos);

18101

-public static final void gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos) {

18102

+public static final native void _gtk_notebook_set_tab_pos(long /*int*/ notebook, int pos);

18103

+public static final void gtk_notebook_set_tab_pos(long /*int*/ notebook, int pos) {

18104

lock.lock();

18105

try {

18106

_gtk_notebook_set_tab_pos(notebook, pos);

18107

@@ -7890,8 +7890,8 @@

18108

}

18109

}

18110

/** @param object cast=(GtkObject *) */

18111

-public static final native void _gtk_object_sink(int /*long*/ object);

18112

-public static final void gtk_object_sink(int /*long*/ object) {

18113

+public static final native void _gtk_object_sink(long /*int*/ object);

18114

+public static final void gtk_object_sink(long /*int*/ object) {

18115

lock.lock();

18116

try {

18117

_gtk_object_sink(object);

18118

@@ -7900,8 +7900,8 @@

18119

}

18120

}

18121

/** @method flags=dynamic */

18122

-public static final native int /*long*/ _gtk_page_setup_new ();

18123

-public static final int /*long*/ gtk_page_setup_new () {

18124

+public static final native long /*int*/ _gtk_page_setup_new ();

18125

+public static final long /*int*/ gtk_page_setup_new () {

18126

lock.lock();

18127

try {

18128

return _gtk_page_setup_new ();

18129

@@ -7910,8 +7910,8 @@

18130

}

18131

}

18132

/** @method flags=dynamic */

18133

-public static final native int _gtk_page_setup_get_orientation(int /*long*/ setup);

18134

-public static final int gtk_page_setup_get_orientation(int /*long*/ setup) {

18135

+public static final native int _gtk_page_setup_get_orientation(long /*int*/ setup);

18136

+public static final int gtk_page_setup_get_orientation(long /*int*/ setup) {

18137

lock.lock();

18138

try {

18139

return _gtk_page_setup_get_orientation(setup);

18140

@@ -7920,8 +7920,8 @@

18141

}

18142

}

18143

/** @method flags=dynamic */

18144

-public static final native void _gtk_page_setup_set_orientation(int /*long*/ setup, int orientation);

18145

-public static final void gtk_page_setup_set_orientation(int /*long*/ setup, int orientation) {

18146

+public static final native void _gtk_page_setup_set_orientation(long /*int*/ setup, int orientation);

18147

+public static final void gtk_page_setup_set_orientation(long /*int*/ setup, int orientation) {

18148

lock.lock();

18149

try {

18150

_gtk_page_setup_set_orientation(setup, orientation);

18151

@@ -7930,8 +7930,8 @@

18152

}

18153

}

18154

/** @method flags=dynamic */

18155

-public static final native int /*long*/ _gtk_page_setup_get_paper_size(int /*long*/ setup);

18156

-public static final int /*long*/ gtk_page_setup_get_paper_size(int /*long*/ setup) {

18157

+public static final native long /*int*/ _gtk_page_setup_get_paper_size(long /*int*/ setup);

18158

+public static final long /*int*/ gtk_page_setup_get_paper_size(long /*int*/ setup) {

18159

lock.lock();

18160

try {

18161

return _gtk_page_setup_get_paper_size(setup);

18162

@@ -7940,8 +7940,8 @@

18163

}

18164

}

18165

/** @method flags=dynamic */

18166

-public static final native void _gtk_page_setup_set_paper_size(int /*long*/ setup, int /*long*/ size);

18167

-public static final void gtk_page_setup_set_paper_size(int /*long*/ setup, int /*long*/ size) {

18168

+public static final native void _gtk_page_setup_set_paper_size(long /*int*/ setup, long /*int*/ size);

18169

+public static final void gtk_page_setup_set_paper_size(long /*int*/ setup, long /*int*/ size) {

18170

lock.lock();

18171

try {

18172

_gtk_page_setup_set_paper_size(setup, size);

18173

@@ -7950,8 +7950,8 @@

18174

}

18175

}

18176

/** @method flags=dynamic */

18177

-public static final native double _gtk_page_setup_get_top_margin(int /*long*/ setup, int unit);

18178

-public static final double gtk_page_setup_get_top_margin(int /*long*/ setup, int unit) {

18179

+public static final native double _gtk_page_setup_get_top_margin(long /*int*/ setup, int unit);

18180

+public static final double gtk_page_setup_get_top_margin(long /*int*/ setup, int unit) {

18181

lock.lock();

18182

try {

18183

return _gtk_page_setup_get_top_margin(setup, unit);

18184

@@ -7960,8 +7960,8 @@

18185

}

18186

}

18187

/** @method flags=dynamic */

18188

-public static final native void _gtk_page_setup_set_top_margin(int /*long*/ setup, double margin, int unit);

18189

-public static final void gtk_page_setup_set_top_margin(int /*long*/ setup, double margin, int unit) {

18190

+public static final native void _gtk_page_setup_set_top_margin(long /*int*/ setup, double margin, int unit);

18191

+public static final void gtk_page_setup_set_top_margin(long /*int*/ setup, double margin, int unit) {

18192

lock.lock();

18193

try {

18194

_gtk_page_setup_set_top_margin(setup, margin, unit);

18195

@@ -7970,8 +7970,8 @@

18196

}

18197

}

18198

/** @method flags=dynamic */

18199

-public static final native double _gtk_page_setup_get_bottom_margin(int /*long*/ setup, int unit);

18200

-public static final double gtk_page_setup_get_bottom_margin(int /*long*/ setup, int unit) {

18201

+public static final native double _gtk_page_setup_get_bottom_margin(long /*int*/ setup, int unit);

18202

+public static final double gtk_page_setup_get_bottom_margin(long /*int*/ setup, int unit) {

18203

lock.lock();

18204

try {

18205

return _gtk_page_setup_get_bottom_margin(setup, unit);

18206

@@ -7980,8 +7980,8 @@

18207

}

18208

}

18209

/** @method flags=dynamic */

18210

-public static final native void _gtk_page_setup_set_bottom_margin(int /*long*/ setup, double margin, int unit);

18211

-public static final void gtk_page_setup_set_bottom_margin(int /*long*/ setup, double margin, int unit) {

18212

+public static final native void _gtk_page_setup_set_bottom_margin(long /*int*/ setup, double margin, int unit);

18213

+public static final void gtk_page_setup_set_bottom_margin(long /*int*/ setup, double margin, int unit) {

18214

lock.lock();

18215

try {

18216

_gtk_page_setup_set_bottom_margin(setup, margin, unit);

18217

@@ -7990,8 +7990,8 @@

18218

}

18219

}

18220

/** @method flags=dynamic */

18221

-public static final native double _gtk_page_setup_get_left_margin(int /*long*/ setup, int unit);

18222

-public static final double gtk_page_setup_get_left_margin(int /*long*/ setup, int unit) {

18223

+public static final native double _gtk_page_setup_get_left_margin(long /*int*/ setup, int unit);

18224

+public static final double gtk_page_setup_get_left_margin(long /*int*/ setup, int unit) {

18225

lock.lock();

18226

try {

18227

return _gtk_page_setup_get_left_margin(setup, unit);

18228

@@ -8000,8 +8000,8 @@

18229

}

18230

}

18231

/** @method flags=dynamic */

18232

-public static final native void _gtk_page_setup_set_left_margin(int /*long*/ setup, double margin, int unit);

18233

-public static final void gtk_page_setup_set_left_margin(int /*long*/ setup, double margin, int unit) {

18234

+public static final native void _gtk_page_setup_set_left_margin(long /*int*/ setup, double margin, int unit);

18235

+public static final void gtk_page_setup_set_left_margin(long /*int*/ setup, double margin, int unit) {

18236

lock.lock();

18237

try {

18238

_gtk_page_setup_set_left_margin(setup, margin, unit);

18239

@@ -8010,8 +8010,8 @@

18240

}

18241

}

18242

/** @method flags=dynamic */

18243

-public static final native double _gtk_page_setup_get_right_margin(int /*long*/ setup, int unit);

18244

-public static final double gtk_page_setup_get_right_margin(int /*long*/ setup, int unit) {

18245

+public static final native double _gtk_page_setup_get_right_margin(long /*int*/ setup, int unit);

18246

+public static final double gtk_page_setup_get_right_margin(long /*int*/ setup, int unit) {

18247

lock.lock();

18248

try {

18249

return _gtk_page_setup_get_right_margin(setup, unit);

18250

@@ -8020,8 +8020,8 @@

18251

}

18252

}

18253

/** @method flags=dynamic */

18254

-public static final native void _gtk_page_setup_set_right_margin(int /*long*/ setup, double margin, int unit);

18255

-public static final void gtk_page_setup_set_right_margin(int /*long*/ setup, double margin, int unit) {

18256

+public static final native void _gtk_page_setup_set_right_margin(long /*int*/ setup, double margin, int unit);

18257

+public static final void gtk_page_setup_set_right_margin(long /*int*/ setup, double margin, int unit) {

18258

lock.lock();

18259

try {

18260

_gtk_page_setup_set_right_margin(setup, margin, unit);

18261

@@ -8030,8 +8030,8 @@

18262

}

18263

}

18264

/** @method flags=dynamic */

18265

-public static final native double _gtk_page_setup_get_paper_width(int /*long*/ setup, int unit);

18266

-public static final double gtk_page_setup_get_paper_width(int /*long*/ setup, int unit) {

18267

+public static final native double _gtk_page_setup_get_paper_width(long /*int*/ setup, int unit);

18268

+public static final double gtk_page_setup_get_paper_width(long /*int*/ setup, int unit) {

18269

lock.lock();

18270

try {

18271

return _gtk_page_setup_get_paper_width(setup, unit);

18272

@@ -8040,8 +8040,8 @@

18273

}

18274

}

18275

/** @method flags=dynamic */

18276

-public static final native double _gtk_page_setup_get_paper_height(int /*long*/ setup, int unit);

18277

-public static final double gtk_page_setup_get_paper_height(int /*long*/ setup, int unit) {

18278

+public static final native double _gtk_page_setup_get_paper_height(long /*int*/ setup, int unit);

18279

+public static final double gtk_page_setup_get_paper_height(long /*int*/ setup, int unit) {

18280

lock.lock();

18281

try {

18282

return _gtk_page_setup_get_paper_height(setup, unit);

18283

@@ -8050,8 +8050,8 @@

18284

}

18285

}

18286

/** @method flags=dynamic */

18287

-public static final native double _gtk_page_setup_get_page_width(int /*long*/ setup, int unit);

18288

-public static final double gtk_page_setup_get_page_width(int /*long*/ setup, int unit) {

18289

+public static final native double _gtk_page_setup_get_page_width(long /*int*/ setup, int unit);

18290

+public static final double gtk_page_setup_get_page_width(long /*int*/ setup, int unit) {

18291

lock.lock();

18292

try {

18293

return _gtk_page_setup_get_page_width(setup, unit);

18294

@@ -8060,8 +8060,8 @@

18295

}

18296

}

18297

/** @method flags=dynamic */

18298

-public static final native double _gtk_page_setup_get_page_height(int /*long*/ setup, int unit);

18299

-public static final double gtk_page_setup_get_page_height(int /*long*/ setup, int unit) {

18300

+public static final native double _gtk_page_setup_get_page_height(long /*int*/ setup, int unit);

18301

+public static final double gtk_page_setup_get_page_height(long /*int*/ setup, int unit) {

18302

lock.lock();

18303

try {

18304

return _gtk_page_setup_get_page_height(setup, unit);

18305

@@ -8076,8 +8076,8 @@

18306

* @param widget cast=(GtkWidget *)

18307

* @param detail cast=(const gchar *)

18308

*/

18309

-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);

18310

-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) {

18311

+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);

18312

+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) {

18313

lock.lock();

18314

try {

18315

_gtk_paint_handle(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);

18316

@@ -8091,8 +8091,8 @@

18317

* @param widget cast=(GtkWidget *)

18318

* @param detail cast=(const gchar *)

18319

*/

18320

-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);

18321

-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) {

18322

+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);

18323

+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) {

18324

lock.lock();

18325

try {

18326

_gtk_paint_flat_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);

18327

@@ -8107,8 +8107,8 @@

18328

* @param widget cast=(GtkWidget *)

18329

* @param detail cast=(const gchar *)

18330

*/

18331

-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);

18332

-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) {

18333

+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);

18334

+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) {

18335

lock.lock();

18336

try {

18337

_gtk_paint_focus(style, window, state_type, area, widget, detail, x, y, width, height);

18338

@@ -8122,8 +8122,8 @@

18339

* @param widget cast=(GtkWidget *)

18340

* @param detail cast=(const gchar *)

18341

*/

18342

-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);

18343

-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) {

18344

+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);

18345

+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) {

18346

lock.lock();

18347

try {

18348

_gtk_paint_option(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);

18349

@@ -8137,8 +8137,8 @@

18350

* @param widget cast=(GtkWidget *)

18351

* @param detail cast=(const gchar *)

18352

*/

18353

-public static final native void _gtk_paint_slider(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);

18354

-public static final void gtk_paint_slider(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) {

18355

+public static final native void _gtk_paint_slider(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);

18356

+public static final void gtk_paint_slider(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) {

18357

lock.lock();

18358

try {

18359

_gtk_paint_slider(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);

18360

@@ -8152,8 +8152,8 @@

18361

* @param widget cast=(GtkWidget *)

18362

* @param detail cast=(const gchar *)

18363

*/

18364

-public static final native void _gtk_paint_tab(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);

18365

-public static final void gtk_paint_tab(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) {

18366

+public static final native void _gtk_paint_tab(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);

18367

+public static final void gtk_paint_tab(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) {

18368

lock.lock();

18369

try {

18370

_gtk_paint_tab(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);

18371

@@ -8167,8 +8167,8 @@

18372

* @param widget cast=(GtkWidget *)

18373

* @param detail cast=(const gchar *)

18374

*/

18375

-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);

18376

-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) {

18377

+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);

18378

+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) {

18379

lock.lock();

18380

try {

18381

_gtk_paint_arrow(style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);

18382

@@ -8183,8 +8183,8 @@

18383

* @param widget cast=(GtkWidget *)

18384

* @param detail cast=(const gchar *)

18385

*/

18386

-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);

18387

-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) {

18388

+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);

18389

+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) {

18390

lock.lock();

18391

try {

18392

_gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);

18393

@@ -8198,8 +8198,8 @@

18394

* @param widget cast=(GtkWidget *)

18395

* @param detail cast=(gchar *)

18396

*/

18397

-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);

18398

-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) {

18399

+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);

18400

+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) {

18401

lock.lock();

18402

try {

18403

_gtk_paint_box_gap(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);

18404

@@ -8213,8 +8213,8 @@

18405

* @param widget cast=(GtkWidget *)

18406

* @param detail cast=(const gchar *)

18407

*/

18408

-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);

18409

-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) {

18410

+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);

18411

+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) {

18412

lock.lock();

18413

try {

18414

_gtk_paint_check(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);

18415

@@ -8228,8 +8228,8 @@

18416

* @param widget cast=(GtkWidget *)

18417

* @param detail cast=(const gchar *)

18418

*/

18419

-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);

18420

-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) {

18421

+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);

18422

+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) {

18423

lock.lock();

18424

try {

18425

_gtk_paint_expander(style, window, state_type, area, widget, detail, x, y, expander_style);

18426

@@ -8243,8 +8243,8 @@

18427

* @param widget cast=(GtkWidget *)

18428

* @param detail cast=(gchar *)

18429

*/

18430

-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);

18431

-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) {

18432

+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);

18433

+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) {

18434

lock.lock();

18435

try {

18436

_gtk_paint_extension(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);

18437

@@ -8258,8 +8258,8 @@

18438

* @param widget cast=(GtkWidget *)

18439

* @param detail cast=(const gchar *)

18440

*/

18441

-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);

18442

-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) {

18443

+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);

18444

+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) {

18445

lock.lock();

18446

try {

18447

_gtk_paint_hline(style, window, state_type, area, widget, detail, x1, x2, y);

18448

@@ -8274,8 +8274,8 @@

18449

* @param detail cast=(const gchar *)

18450

* @param layout cast=(PangoLayout *)

18451

*/

18452

-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);

18453

-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) {

18454

+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);

18455

+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) {

18456

lock.lock();

18457

try {

18458

_gtk_paint_layout(style, window, state_type, use_text, area, widget, detail, x, y, layout);

18459

@@ -8289,8 +8289,8 @@

18460

* @param widget cast=(GtkWidget *)

18461

* @param detail cast=(gchar *)

18462

*/

18463

-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);

18464

-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) {

18465

+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);

18466

+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) {

18467

lock.lock();

18468

try {

18469

_gtk_paint_shadow_gap(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);

18470

@@ -8304,8 +8304,8 @@

18471

* @param widget cast=(GtkWidget *)

18472

* @param detail cast=(gchar *)

18473

*/

18474

-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);

18475

-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) {

18476

+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);

18477

+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) {

18478

lock.lock();

18479

try {

18480

_gtk_paint_shadow(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);

18481

@@ -8319,8 +8319,8 @@

18482

* @param widget cast=(GtkWidget *)

18483

* @param detail cast=(const gchar *)

18484

*/

18485

-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);

18486

-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) {

18487

+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);

18488

+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) {

18489

lock.lock();

18490

try {

18491

_gtk_paint_vline(style, window, state_type, area, widget, detail, y1, y2, x);

18492

@@ -8329,8 +8329,8 @@

18493

}

18494

}

18495

/** @method flags=dynamic */

18496

-public static final native void _gtk_paper_size_free(int /*long*/ size);

18497

-public static final void gtk_paper_size_free(int /*long*/ size) {

18498

+public static final native void _gtk_paper_size_free(long /*int*/ size);

18499

+public static final void gtk_paper_size_free(long /*int*/ size) {

18500

lock.lock();

18501

try {

18502

_gtk_paper_size_free(size);

18503

@@ -8339,8 +8339,8 @@

18504

}

18505

}

18506

/** @method flags=dynamic */

18507

-public static final native int /*long*/ _gtk_paper_size_new(byte [] name);

18508

-public static final int /*long*/ gtk_paper_size_new(byte [] name) {

18509

+public static final native long /*int*/ _gtk_paper_size_new(byte [] name);

18510

+public static final long /*int*/ gtk_paper_size_new(byte [] name) {

18511

lock.lock();

18512

try {

18513

return _gtk_paper_size_new(name);

18514

@@ -8349,8 +8349,8 @@

18515

}

18516

}

18517

/** @method flags=dynamic */

18518

-public static final native int /*long*/ _gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height);

18519

-public static final int /*long*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height) {

18520

+public static final native long /*int*/ _gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height);

18521

+public static final long /*int*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height) {

18522

lock.lock();

18523

try {

18524

return _gtk_paper_size_new_from_ppd(ppd_name, ppd_display_name, width, height);

18525

@@ -8359,8 +8359,8 @@

18526

}

18527

}

18528

/** @method flags=dynamic */

18529

-public static final native int /*long*/ _gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit);

18530

-public static final int /*long*/ gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit) {

18531

+public static final native long /*int*/ _gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit);

18532

+public static final long /*int*/ gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit) {

18533

lock.lock();

18534

try {

18535

return _gtk_paper_size_new_custom(name, display_name, width, height, unit);

18536

@@ -8369,8 +8369,8 @@

18537

}

18538

}

18539

/** @method flags=dynamic */

18540

-public static final native int /*long*/ _gtk_paper_size_get_name(int /*long*/ size);

18541

-public static final int /*long*/ gtk_paper_size_get_name(int /*long*/ size) {

18542

+public static final native long /*int*/ _gtk_paper_size_get_name(long /*int*/ size);

18543

+public static final long /*int*/ gtk_paper_size_get_name(long /*int*/ size) {

18544

lock.lock();

18545

try {

18546

return _gtk_paper_size_get_name(size);

18547

@@ -8379,8 +8379,8 @@

18548

}

18549

}

18550

/** @method flags=dynamic */

18551

-public static final native int /*long*/ _gtk_paper_size_get_display_name(int /*long*/ size);

18552

-public static final int /*long*/ gtk_paper_size_get_display_name(int /*long*/ size) {

18553

+public static final native long /*int*/ _gtk_paper_size_get_display_name(long /*int*/ size);

18554

+public static final long /*int*/ gtk_paper_size_get_display_name(long /*int*/ size) {

18555

lock.lock();

18556

try {

18557

return _gtk_paper_size_get_display_name(size);

18558

@@ -8389,8 +8389,8 @@

18559

}

18560

}

18561

/** @method flags=dynamic */

18562

-public static final native int /*long*/ _gtk_paper_size_get_ppd_name(int /*long*/ size);

18563

-public static final int /*long*/ gtk_paper_size_get_ppd_name(int /*long*/ size) {

18564

+public static final native long /*int*/ _gtk_paper_size_get_ppd_name(long /*int*/ size);

18565

+public static final long /*int*/ gtk_paper_size_get_ppd_name(long /*int*/ size) {

18566

lock.lock();

18567

try {

18568

return _gtk_paper_size_get_ppd_name(size);

18569

@@ -8399,8 +8399,8 @@

18570

}

18571

}

18572

/** @method flags=dynamic */

18573

-public static final native double _gtk_paper_size_get_width(int /*long*/ size, int unit);

18574

-public static final double gtk_paper_size_get_width(int /*long*/ size, int unit) {

18575

+public static final native double _gtk_paper_size_get_width(long /*int*/ size, int unit);

18576

+public static final double gtk_paper_size_get_width(long /*int*/ size, int unit) {

18577

lock.lock();

18578

try {

18579

return _gtk_paper_size_get_width(size, unit);

18580

@@ -8409,8 +8409,8 @@

18581

}

18582

}

18583

/** @method flags=dynamic */

18584

-public static final native double _gtk_paper_size_get_height(int /*long*/ size, int unit);

18585

-public static final double gtk_paper_size_get_height(int /*long*/ size, int unit) {

18586

+public static final native double _gtk_paper_size_get_height(long /*int*/ size, int unit);

18587

+public static final double gtk_paper_size_get_height(long /*int*/ size, int unit) {

18588

lock.lock();

18589

try {

18590

return _gtk_paper_size_get_height(size, unit);

18591

@@ -8419,8 +8419,8 @@

18592

}

18593

}

18594

/** @method flags=dynamic */

18595

-public static final native boolean _gtk_paper_size_is_custom(int /*long*/ size);

18596

-public static final boolean gtk_paper_size_is_custom(int /*long*/ size) {

18597

+public static final native boolean _gtk_paper_size_is_custom(long /*int*/ size);

18598

+public static final boolean gtk_paper_size_is_custom(long /*int*/ size) {

18599

lock.lock();

18600

try {

18601

return _gtk_paper_size_is_custom(size);

18602

@@ -8429,8 +8429,8 @@

18603

}

18604

}

18605

/** @param plug cast=(GtkPlug *) */

18606

-public static final native int /*long*/ _gtk_plug_get_id(int /*long*/ plug);

18607

-public static final int /*long*/ gtk_plug_get_id(int /*long*/ plug) {

18608

+public static final native long /*int*/ _gtk_plug_get_id(long /*int*/ plug);

18609

+public static final long /*int*/ gtk_plug_get_id(long /*int*/ plug) {

18610

lock.lock();

18611

try {

18612

return _gtk_plug_get_id(plug);

18613

@@ -8438,8 +8438,8 @@

18614

lock.unlock();

18615

}

18616

}

18617

-public static final native int /*long*/ _gtk_plug_new(int /*long*/ socket_id);

18618

-public static final int /*long*/ gtk_plug_new(int /*long*/ socket_id) {

18619

+public static final native long /*int*/ _gtk_plug_new(long /*int*/ socket_id);

18620

+public static final long /*int*/ gtk_plug_new(long /*int*/ socket_id) {

18621

lock.lock();

18622

try {

18623

return _gtk_plug_new(socket_id);

18624

@@ -8448,8 +8448,8 @@

18625

}

18626

}

18627

/** @method flags=dynamic */

18628

-public static final native int /*long*/ _gtk_printer_get_backend(int /*long*/ printer);

18629

-public static final int /*long*/ gtk_printer_get_backend(int /*long*/ printer) {

18630

+public static final native long /*int*/ _gtk_printer_get_backend(long /*int*/ printer);

18631

+public static final long /*int*/ gtk_printer_get_backend(long /*int*/ printer) {

18632

lock.lock();

18633

try {

18634

return _gtk_printer_get_backend(printer);

18635

@@ -8458,8 +8458,8 @@

18636

}

18637

}

18638

/** @method flags=dynamic */

18639

-public static final native int /*long*/ _gtk_printer_get_name(int /*long*/ printer);

18640

-public static final int /*long*/ gtk_printer_get_name(int /*long*/ printer) {

18641

+public static final native long /*int*/ _gtk_printer_get_name(long /*int*/ printer);

18642

+public static final long /*int*/ gtk_printer_get_name(long /*int*/ printer) {

18643

lock.lock();

18644

try {

18645

return _gtk_printer_get_name(printer);

18646

@@ -8468,8 +8468,8 @@

18647

}

18648

}

18649

/** @method flags=dynamic */

18650

-public static final native boolean _gtk_printer_is_default(int /*long*/ printer);

18651

-public static final boolean gtk_printer_is_default(int /*long*/ printer) {

18652

+public static final native boolean _gtk_printer_is_default(long /*int*/ printer);

18653

+public static final boolean gtk_printer_is_default(long /*int*/ printer) {

18654

lock.lock();

18655

try {

18656

return _gtk_printer_is_default(printer);

18657

@@ -8483,8 +8483,8 @@

18658

* @param destroy cast=(GDestroyNotify)

18659

* @param wait cast=(gboolean)

18660

*/

18661

-public static final native void _gtk_enumerate_printers(int /*long*/ func, int /*long*/data, int /*long*/ destroy, boolean wait);

18662

-public static final void gtk_enumerate_printers(int /*long*/ func, int /*long*/data, int /*long*/ destroy, boolean wait) {

18663

+public static final native void _gtk_enumerate_printers(long /*int*/ func, long /*int*/data, long /*int*/ destroy, boolean wait);

18664

+public static final void gtk_enumerate_printers(long /*int*/ func, long /*int*/data, long /*int*/ destroy, boolean wait) {

18665

lock.lock();

18666

try {

18667

_gtk_enumerate_printers(func, data, destroy, wait);

18668

@@ -8496,8 +8496,8 @@

18669

* @method flags=dynamic

18670

* @param title cast=(const gchar *)

18671

*/

18672

-public static final native int /*long*/ _gtk_print_job_new(byte[] title, int /*long*/ printer, int /*long*/ settings, int /*long*/ page_setup);

18673

-public static final int /*long*/ gtk_print_job_new(byte[] title, int /*long*/ printer, int /*long*/ settings, int /*long*/ page_setup) {

18674

+public static final native long /*int*/ _gtk_print_job_new(byte[] title, long /*int*/ printer, long /*int*/ settings, long /*int*/ page_setup);

18675

+public static final long /*int*/ gtk_print_job_new(byte[] title, long /*int*/ printer, long /*int*/ settings, long /*int*/ page_setup) {

18676

lock.lock();

18677

try {

18678

return _gtk_print_job_new(title, printer, settings, page_setup);

18679

@@ -8506,8 +8506,8 @@

18680

}

18681

}

18682

/** @method flags=dynamic */

18683

-public static final native int /*long*/ _gtk_print_job_get_settings(int /*long*/ job);

18684

-public static final int /*long*/ gtk_print_job_get_settings(int /*long*/ job) {

18685

+public static final native long /*int*/ _gtk_print_job_get_settings(long /*int*/ job);

18686

+public static final long /*int*/ gtk_print_job_get_settings(long /*int*/ job) {

18687

lock.lock();

18688

try {

18689

return _gtk_print_job_get_settings(job);

18690

@@ -8516,8 +8516,8 @@

18691

}

18692

}

18693

/** @method flags=dynamic */

18694

-public static final native int /*long*/ _gtk_print_job_get_printer(int /*long*/ job);

18695

-public static final int /*long*/ gtk_print_job_get_printer(int /*long*/ job) {

18696

+public static final native long /*int*/ _gtk_print_job_get_printer(long /*int*/ job);

18697

+public static final long /*int*/ gtk_print_job_get_printer(long /*int*/ job) {

18698

lock.lock();

18699

try {

18700

return _gtk_print_job_get_printer(job);

18701

@@ -8526,8 +8526,8 @@

18702

}

18703

}

18704

/** @method flags=dynamic */

18705

-public static final native int /*long*/ _gtk_print_job_get_title(int /*long*/ job);

18706

-public static final int /*long*/ gtk_print_job_get_title(int /*long*/ job) {

18707

+public static final native long /*int*/ _gtk_print_job_get_title(long /*int*/ job);

18708

+public static final long /*int*/ gtk_print_job_get_title(long /*int*/ job) {

18709

lock.lock();

18710

try {

18711

return _gtk_print_job_get_title(job);

18712

@@ -8536,8 +8536,8 @@

18713

}

18714

}

18715

/** @method flags=dynamic */

18716

-public static final native int _gtk_print_job_get_status(int /*long*/ job);

18717

-public static final int gtk_print_job_get_status(int /*long*/ job) {

18718

+public static final native int _gtk_print_job_get_status(long /*int*/ job);

18719

+public static final int gtk_print_job_get_status(long /*int*/ job) {

18720

lock.lock();

18721

try {

18722

return _gtk_print_job_get_status(job);

18723

@@ -8550,8 +8550,8 @@

18724

* @param filename cast=(const gchar *)

18725

* @param error cast=(GError **)

18726

*/

18727

-public static final native boolean _gtk_print_job_set_source_file(int /*long*/ job, byte[] filename, int /*long*/ error[]);

18728

-public static final boolean gtk_print_job_set_source_file(int /*long*/ job, byte[] filename, int /*long*/ error[]) {

18729

+public static final native boolean _gtk_print_job_set_source_file(long /*int*/ job, byte[] filename, long /*int*/ error[]);

18730

+public static final boolean gtk_print_job_set_source_file(long /*int*/ job, byte[] filename, long /*int*/ error[]) {

18731

lock.lock();

18732

try {

18733

return _gtk_print_job_set_source_file(job, filename, error);

18734

@@ -8563,8 +8563,8 @@

18735

* @method flags=dynamic

18736

* @param error cast=(GError **)

18737

*/

18738

-public static final native int /*long*/ _gtk_print_job_get_surface(int /*long*/ job, int /*long*/ error[]);

18739

-public static final int /*long*/ gtk_print_job_get_surface(int /*long*/ job, int /*long*/ error[]) {

18740

+public static final native long /*int*/ _gtk_print_job_get_surface(long /*int*/ job, long /*int*/ error[]);

18741

+public static final long /*int*/ gtk_print_job_get_surface(long /*int*/ job, long /*int*/ error[]) {

18742

lock.lock();

18743

try {

18744

return _gtk_print_job_get_surface(job, error);

18745

@@ -8577,8 +8577,8 @@

18746

* @param user_data cast=(gpointer)

18747

* @param dnotify cast=(GDestroyNotify)

18748

*/

18749

-public static final native void _gtk_print_job_send(int /*long*/ job, int /*long*/ callback, int /*long*/ user_data, int /*long*/ dnotify);

18750

-public static final void gtk_print_job_send(int /*long*/ job, int /*long*/ callback, int /*long*/ user_data, int /*long*/ dnotify) {

18751

+public static final native void _gtk_print_job_send(long /*int*/ job, long /*int*/ callback, long /*int*/ user_data, long /*int*/ dnotify);

18752

+public static final void gtk_print_job_send(long /*int*/ job, long /*int*/ callback, long /*int*/ user_data, long /*int*/ dnotify) {

18753

lock.lock();

18754

try {

18755

_gtk_print_job_send(job, callback, user_data, dnotify);

18756

@@ -8587,8 +8587,8 @@

18757

}

18758

}

18759

/** @method flags=dynamic */

18760

-public static final native int /*long*/ _gtk_print_settings_new();

18761

-public static final int /*long*/ gtk_print_settings_new() {

18762

+public static final native long /*int*/ _gtk_print_settings_new();

18763

+public static final long /*int*/ gtk_print_settings_new() {

18764

lock.lock();

18765

try {

18766

return _gtk_print_settings_new();

18767

@@ -8600,8 +8600,8 @@

18768

* @method flags=dynamic

18769

* @param data cast=(gpointer)

18770

*/

18771

-public static final native void _gtk_print_settings_foreach(int /*long*/ settings, int /*long*/ func, int /*long*/ data);

18772

-public static final void gtk_print_settings_foreach(int /*long*/ settings, int /*long*/ func, int /*long*/ data) {

18773

+public static final native void _gtk_print_settings_foreach(long /*int*/ settings, long /*int*/ func, long /*int*/ data);

18774

+public static final void gtk_print_settings_foreach(long /*int*/ settings, long /*int*/ func, long /*int*/ data) {

18775

lock.lock();

18776

try {

18777

_gtk_print_settings_foreach(settings, func, data);

18778

@@ -8613,8 +8613,8 @@

18779

* @method flags=dynamic

18780

* @param key cast=(const gchar *)

18781

*/

18782

-public static final native int /*long*/ _gtk_print_settings_get(int /*long*/ settings, byte [] key);

18783

-public static final int /*long*/ gtk_print_settings_get(int /*long*/ settings, byte [] key) {

18784

+public static final native long /*int*/ _gtk_print_settings_get(long /*int*/ settings, byte [] key);

18785

+public static final long /*int*/ gtk_print_settings_get(long /*int*/ settings, byte [] key) {

18786

lock.lock();

18787

try {

18788

return _gtk_print_settings_get(settings, key);

18789

@@ -8627,8 +8627,8 @@

18790

* @param key cast=(const gchar *)

18791

* @param value cast=(const gchar *)

18792

*/

18793

-public static final native void _gtk_print_settings_set(int /*long*/ settings, byte [] key, byte [] value);

18794

-public static final void gtk_print_settings_set(int /*long*/ settings, byte [] key, byte [] value) {

18795

+public static final native void _gtk_print_settings_set(long /*int*/ settings, byte [] key, byte [] value);

18796

+public static final void gtk_print_settings_set(long /*int*/ settings, byte [] key, byte [] value) {

18797

lock.lock();

18798

try {

18799

_gtk_print_settings_set(settings, key, value);

18800

@@ -8637,8 +8637,8 @@

18801

}

18802

}

18803

/** @method flags=dynamic */

18804

-public static final native int /*long*/ _gtk_print_settings_get_printer(int /*long*/ settings);

18805

-public static final int /*long*/ gtk_print_settings_get_printer(int /*long*/ settings) {

18806

+public static final native long /*int*/ _gtk_print_settings_get_printer(long /*int*/ settings);

18807

+public static final long /*int*/ gtk_print_settings_get_printer(long /*int*/ settings) {

18808

lock.lock();

18809

try {

18810

return _gtk_print_settings_get_printer(settings);

18811

@@ -8647,8 +8647,8 @@

18812

}

18813

}

18814

/** @method flags=dynamic */

18815

-public static final native void _gtk_print_settings_set_printer(int /*long*/ settings, byte[] printer);

18816

-public static final void gtk_print_settings_set_printer(int /*long*/ settings, byte[] printer) {

18817

+public static final native void _gtk_print_settings_set_printer(long /*int*/ settings, byte[] printer);

18818

+public static final void gtk_print_settings_set_printer(long /*int*/ settings, byte[] printer) {

18819

lock.lock();

18820

try {

18821

_gtk_print_settings_set_printer(settings, printer);

18822

@@ -8657,8 +8657,8 @@

18823

}

18824

}

18825

/** @method flags=dynamic */

18826

-public static final native int _gtk_print_settings_get_orientation(int /*long*/ settings);

18827

-public static final int gtk_print_settings_get_orientation(int /*long*/ settings) {

18828

+public static final native int _gtk_print_settings_get_orientation(long /*int*/ settings);

18829

+public static final int gtk_print_settings_get_orientation(long /*int*/ settings) {

18830

lock.lock();

18831

try {

18832

return _gtk_print_settings_get_orientation(settings);

18833

@@ -8667,8 +8667,8 @@

18834

}

18835

}

18836

/** @method flags=dynamic */

18837

-public static final native void _gtk_print_settings_set_orientation(int /*long*/ settings, int orientation);

18838

-public static final void gtk_print_settings_set_orientation(int /*long*/ settings, int orientation) {

18839

+public static final native void _gtk_print_settings_set_orientation(long /*int*/ settings, int orientation);

18840

+public static final void gtk_print_settings_set_orientation(long /*int*/ settings, int orientation) {

18841

lock.lock();

18842

try {

18843

_gtk_print_settings_set_orientation(settings, orientation);

18844

@@ -8677,8 +8677,8 @@

18845

}

18846

}

18847

/** @method flags=dynamic */

18848

-public static final native boolean _gtk_print_settings_get_collate(int /*long*/ settings);

18849

-public static final boolean gtk_print_settings_get_collate(int /*long*/ settings) {

18850

+public static final native boolean _gtk_print_settings_get_collate(long /*int*/ settings);

18851

+public static final boolean gtk_print_settings_get_collate(long /*int*/ settings) {

18852

lock.lock();

18853

try {

18854

return _gtk_print_settings_get_collate(settings);

18855

@@ -8690,8 +8690,8 @@

18856

* @method flags=dynamic

18857

* @param collate cast=(gboolean)

18858

*/

18859

-public static final native void _gtk_print_settings_set_collate(int /*long*/ settings, boolean collate);

18860

-public static final void gtk_print_settings_set_collate(int /*long*/ settings, boolean collate) {

18861

+public static final native void _gtk_print_settings_set_collate(long /*int*/ settings, boolean collate);

18862

+public static final void gtk_print_settings_set_collate(long /*int*/ settings, boolean collate) {

18863

lock.lock();

18864

try {

18865

_gtk_print_settings_set_collate(settings, collate);

18866

@@ -8700,8 +8700,8 @@

18867

}

18868

}

18869

/** @method flags=dynamic */

18870

-public static final native int _gtk_print_settings_get_n_copies(int /*long*/ settings);

18871

-public static final int gtk_print_settings_get_n_copies(int /*long*/ settings) {

18872

+public static final native int _gtk_print_settings_get_n_copies(long /*int*/ settings);

18873

+public static final int gtk_print_settings_get_n_copies(long /*int*/ settings) {

18874

lock.lock();

18875

try {

18876

return _gtk_print_settings_get_n_copies(settings);

18877

@@ -8713,8 +8713,8 @@

18878

* @method flags=dynamic

18879

* @param num_copies cast=(gint)

18880

*/

18881

-public static final native void _gtk_print_settings_set_n_copies(int /*long*/ settings, int num_copies);

18882

-public static final void gtk_print_settings_set_n_copies(int /*long*/ settings, int num_copies) {

18883

+public static final native void _gtk_print_settings_set_n_copies(long /*int*/ settings, int num_copies);

18884

+public static final void gtk_print_settings_set_n_copies(long /*int*/ settings, int num_copies) {

18885

lock.lock();

18886

try {

18887

_gtk_print_settings_set_n_copies(settings, num_copies);

18888

@@ -8723,8 +8723,8 @@

18889

}

18890

}

18891

/** @method flags=dynamic */

18892

-public static final native int _gtk_print_settings_get_print_pages(int /*long*/ settings);

18893

-public static final int gtk_print_settings_get_print_pages(int /*long*/ settings) {

18894

+public static final native int _gtk_print_settings_get_print_pages(long /*int*/ settings);

18895

+public static final int gtk_print_settings_get_print_pages(long /*int*/ settings) {

18896

lock.lock();

18897

try {

18898

return _gtk_print_settings_get_print_pages(settings);

18899

@@ -8733,8 +8733,8 @@

18900

}

18901

}

18902

/** @method flags=dynamic */

18903

-public static final native void _gtk_print_settings_set_print_pages(int /*long*/ settings, int pages);

18904

-public static final void gtk_print_settings_set_print_pages(int /*long*/ settings, int pages) {

18905

+public static final native void _gtk_print_settings_set_print_pages(long /*int*/ settings, int pages);

18906

+public static final void gtk_print_settings_set_print_pages(long /*int*/ settings, int pages) {

18907

lock.lock();

18908

try {

18909

_gtk_print_settings_set_print_pages(settings, pages);

18910

@@ -8746,8 +8746,8 @@

18911

* @method flags=dynamic

18912

* @param num_ranges cast=(gint *)

18913

*/

18914

-public static final native int /*long*/ _gtk_print_settings_get_page_ranges(int /*long*/ settings, int[] num_ranges);

18915

-public static final int /*long*/ gtk_print_settings_get_page_ranges(int /*long*/ settings, int[] num_ranges) {

18916

+public static final native long /*int*/ _gtk_print_settings_get_page_ranges(long /*int*/ settings, int[] num_ranges);

18917

+public static final long /*int*/ gtk_print_settings_get_page_ranges(long /*int*/ settings, int[] num_ranges) {

18918

lock.lock();

18919

try {

18920

return _gtk_print_settings_get_page_ranges(settings, num_ranges);

18921

@@ -8759,8 +8759,8 @@

18922

* @method flags=dynamic

18923

* @param num_ranges cast=(gint)

18924

*/

18925

-public static final native void _gtk_print_settings_set_page_ranges(int /*long*/ settings, int[] page_ranges, int num_ranges);

18926

-public static final void gtk_print_settings_set_page_ranges(int /*long*/ settings, int[] page_ranges, int num_ranges) {

18927

+public static final native void _gtk_print_settings_set_page_ranges(long /*int*/ settings, int[] page_ranges, int num_ranges);

18928

+public static final void gtk_print_settings_set_page_ranges(long /*int*/ settings, int[] page_ranges, int num_ranges) {

18929

lock.lock();

18930

try {

18931

_gtk_print_settings_set_page_ranges(settings, page_ranges, num_ranges);

18932

@@ -8769,8 +8769,8 @@

18933

}

18934

}

18935

/** @method flags=dynamic */

18936

-public static final native double _gtk_print_settings_get_paper_width(int /*long*/ settings, int unit);

18937

-public static final double gtk_print_settings_get_paper_width(int /*long*/ settings, int unit) {

18938

+public static final native double _gtk_print_settings_get_paper_width(long /*int*/ settings, int unit);

18939

+public static final double gtk_print_settings_get_paper_width(long /*int*/ settings, int unit) {

18940

lock.lock();

18941

try {

18942

return _gtk_print_settings_get_paper_width(settings, unit);

18943

@@ -8779,8 +8779,8 @@

18944

}

18945

}

18946

/** @method flags=dynamic */

18947

-public static final native double _gtk_print_settings_get_paper_height(int /*long*/ settings, int unit);

18948

-public static final double gtk_print_settings_get_paper_height(int /*long*/ settings, int unit) {

18949

+public static final native double _gtk_print_settings_get_paper_height(long /*int*/ settings, int unit);

18950

+public static final double gtk_print_settings_get_paper_height(long /*int*/ settings, int unit) {

18951

lock.lock();

18952

try {

18953

return _gtk_print_settings_get_paper_height(settings, unit);

18954

@@ -8789,8 +8789,8 @@

18955

}

18956

}

18957

/** @method flags=dynamic */

18958

-public static final native int _gtk_print_settings_get_resolution(int /*long*/ settings);

18959

-public static final int gtk_print_settings_get_resolution(int /*long*/ settings) {

18960

+public static final native int _gtk_print_settings_get_resolution(long /*int*/ settings);

18961

+public static final int gtk_print_settings_get_resolution(long /*int*/ settings) {

18962

lock.lock();

18963

try {

18964

return _gtk_print_settings_get_resolution(settings);

18965

@@ -8803,8 +8803,8 @@

18966

* @param title cast=(const gchar *)

18967

* @param parent cast=(GtkWindow *)

18968

*/

18969

-public static final native int /*long*/ _gtk_print_unix_dialog_new(byte[] title, int /*long*/ parent);

18970

-public static final int /*long*/ gtk_print_unix_dialog_new(byte[] title, int /*long*/ parent) {

18971

+public static final native long /*int*/ _gtk_print_unix_dialog_new(byte[] title, long /*int*/ parent);

18972

+public static final long /*int*/ gtk_print_unix_dialog_new(byte[] title, long /*int*/ parent) {

18973

lock.lock();

18974

try {

18975

return _gtk_print_unix_dialog_new(title, parent);

18976

@@ -8813,8 +8813,8 @@

18977

}

18978

}

18979

/** @method flags=dynamic */

18980

-public static final native void _gtk_print_unix_dialog_set_page_setup(int /*long*/ dialog, int /*long*/ page_setup);

18981

-public static final void gtk_print_unix_dialog_set_page_setup(int /*long*/ dialog, int /*long*/ page_setup) {

18982

+public static final native void _gtk_print_unix_dialog_set_page_setup(long /*int*/ dialog, long /*int*/ page_setup);

18983

+public static final void gtk_print_unix_dialog_set_page_setup(long /*int*/ dialog, long /*int*/ page_setup) {

18984

lock.lock();

18985

try {

18986

_gtk_print_unix_dialog_set_page_setup(dialog, page_setup);

18987

@@ -8823,8 +8823,8 @@

18988

}

18989

}

18990

/** @method flags=dynamic */

18991

-public static final native int /*long*/ _gtk_print_unix_dialog_get_page_setup(int /*long*/ dialog);

18992

-public static final int /*long*/ gtk_print_unix_dialog_get_page_setup(int /*long*/ dialog) {

18993

+public static final native long /*int*/ _gtk_print_unix_dialog_get_page_setup(long /*int*/ dialog);

18994

+public static final long /*int*/ gtk_print_unix_dialog_get_page_setup(long /*int*/ dialog) {

18995

lock.lock();

18996

try {

18997

return _gtk_print_unix_dialog_get_page_setup(dialog);

18998

@@ -8836,8 +8836,8 @@

18999

* @method flags=dynamic

19000

* @param current_page cast=(gint)

19001

*/

19002

-public static final native void _gtk_print_unix_dialog_set_current_page(int /*long*/ dialog, int current_page);

19003

-public static final void gtk_print_unix_dialog_set_current_page(int /*long*/ dialog, int current_page) {

19004

+public static final native void _gtk_print_unix_dialog_set_current_page(long /*int*/ dialog, int current_page);

19005

+public static final void gtk_print_unix_dialog_set_current_page(long /*int*/ dialog, int current_page) {

19006

lock.lock();

19007

try {

19008

_gtk_print_unix_dialog_set_current_page(dialog, current_page);

19009

@@ -8846,8 +8846,8 @@

19010

}

19011

}

19012

/** @method flags=dynamic */

19013

-public static final native int _gtk_print_unix_dialog_get_current_page(int /*long*/ dialog);

19014

-public static final int gtk_print_unix_dialog_get_current_page(int /*long*/ dialog) {

19015

+public static final native int _gtk_print_unix_dialog_get_current_page(long /*int*/ dialog);

19016

+public static final int gtk_print_unix_dialog_get_current_page(long /*int*/ dialog) {

19017

lock.lock();

19018

try {

19019

return _gtk_print_unix_dialog_get_current_page(dialog);

19020

@@ -8856,8 +8856,8 @@

19021

}

19022

}

19023

/** @method flags=dynamic */

19024

-public static final native void _gtk_print_unix_dialog_set_settings(int /*long*/ dialog, int /*long*/ settings);

19025

-public static final void gtk_print_unix_dialog_set_settings(int /*long*/ dialog, int /*long*/ settings) {

19026

+public static final native void _gtk_print_unix_dialog_set_settings(long /*int*/ dialog, long /*int*/ settings);

19027

+public static final void gtk_print_unix_dialog_set_settings(long /*int*/ dialog, long /*int*/ settings) {

19028

lock.lock();

19029

try {

19030

_gtk_print_unix_dialog_set_settings(dialog, settings);

19031

@@ -8866,8 +8866,8 @@

19032

}

19033

}

19034

/** @method flags=dynamic */

19035

-public static final native int /*long*/ _gtk_print_unix_dialog_get_settings(int /*long*/ dialog);

19036

-public static final int /*long*/ gtk_print_unix_dialog_get_settings(int /*long*/ dialog) {

19037

+public static final native long /*int*/ _gtk_print_unix_dialog_get_settings(long /*int*/ dialog);

19038

+public static final long /*int*/ gtk_print_unix_dialog_get_settings(long /*int*/ dialog) {

19039

lock.lock();

19040

try {

19041

return _gtk_print_unix_dialog_get_settings(dialog);

19042

@@ -8876,8 +8876,8 @@

19043

}

19044

}

19045

/** @method flags=dynamic */

19046

-public static final native int /*long*/ _gtk_print_unix_dialog_get_selected_printer(int /*long*/ dialog);

19047

-public static final int /*long*/ gtk_print_unix_dialog_get_selected_printer(int /*long*/ dialog) {

19048

+public static final native long /*int*/ _gtk_print_unix_dialog_get_selected_printer(long /*int*/ dialog);

19049

+public static final long /*int*/ gtk_print_unix_dialog_get_selected_printer(long /*int*/ dialog) {

19050

lock.lock();

19051

try {

19052

return _gtk_print_unix_dialog_get_selected_printer(dialog);

19053

@@ -8886,8 +8886,8 @@

19054

}

19055

}

19056

/** @method flags=dynamic */

19057

-public static final native void _gtk_print_unix_dialog_set_manual_capabilities(int /*long*/ dialog, int /*long*/ capabilities);

19058

-public static final void gtk_print_unix_dialog_set_manual_capabilities(int /*long*/ dialog, int /*long*/ capabilities) {

19059

+public static final native void _gtk_print_unix_dialog_set_manual_capabilities(long /*int*/ dialog, long /*int*/ capabilities);

19060

+public static final void gtk_print_unix_dialog_set_manual_capabilities(long /*int*/ dialog, long /*int*/ capabilities) {

19061

lock.lock();

19062

try {

19063

_gtk_print_unix_dialog_set_manual_capabilities(dialog, capabilities);

19064

@@ -8895,8 +8895,8 @@

19065

lock.unlock();

19066

}

19067

}

19068

-public static final native int /*long*/ _gtk_progress_bar_new();

19069

-public static final int /*long*/ gtk_progress_bar_new() {

19070

+public static final native long /*int*/ _gtk_progress_bar_new();

19071

+public static final long /*int*/ gtk_progress_bar_new() {

19072

lock.lock();

19073

try {

19074

return _gtk_progress_bar_new();

19075

@@ -8905,8 +8905,8 @@

19076

}

19077

}

19078

/** @param pbar cast=(GtkProgressBar *) */

19079

-public static final native void _gtk_progress_bar_pulse(int /*long*/ pbar);

19080

-public static final void gtk_progress_bar_pulse(int /*long*/ pbar) {

19081

+public static final native void _gtk_progress_bar_pulse(long /*int*/ pbar);

19082

+public static final void gtk_progress_bar_pulse(long /*int*/ pbar) {

19083

lock.lock();

19084

try {

19085

_gtk_progress_bar_pulse(pbar);

19086

@@ -8918,8 +8918,8 @@

19087

* @param pbar cast=(GtkProgressBar *)

19088

* @param fraction cast=(gdouble)

19089

*/

19090

-public static final native void _gtk_progress_bar_set_fraction(int /*long*/ pbar, double fraction);

19091

-public static final void gtk_progress_bar_set_fraction(int /*long*/ pbar, double fraction) {

19092

+public static final native void _gtk_progress_bar_set_fraction(long /*int*/ pbar, double fraction);

19093

+public static final void gtk_progress_bar_set_fraction(long /*int*/ pbar, double fraction) {

19094

lock.lock();

19095

try {

19096

_gtk_progress_bar_set_fraction(pbar, fraction);

19097

@@ -8931,8 +8931,8 @@

19098

* @param pbar cast=(GtkProgressBar *)

19099

* @param orientation cast=(GtkProgressBarOrientation)

19100

*/

19101

-public static final native void _gtk_progress_bar_set_orientation(int /*long*/ pbar, int orientation);

19102

-public static final void gtk_progress_bar_set_orientation(int /*long*/ pbar, int orientation) {

19103

+public static final native void _gtk_progress_bar_set_orientation(long /*int*/ pbar, int orientation);

19104

+public static final void gtk_progress_bar_set_orientation(long /*int*/ pbar, int orientation) {

19105

lock.lock();

19106

try {

19107

_gtk_progress_bar_set_orientation(pbar, orientation);

19108

@@ -8941,8 +8941,8 @@

19109

}

19110

}

19111

/** @param radio_button cast=(GtkRadioButton *) */

19112

-public static final native int /*long*/ _gtk_radio_button_get_group(int /*long*/ radio_button);

19113

-public static final int /*long*/ gtk_radio_button_get_group(int /*long*/ radio_button) {

19114

+public static final native long /*int*/ _gtk_radio_button_get_group(long /*int*/ radio_button);

19115

+public static final long /*int*/ gtk_radio_button_get_group(long /*int*/ radio_button) {

19116

lock.lock();

19117

try {

19118

return _gtk_radio_button_get_group(radio_button);

19119

@@ -8951,8 +8951,8 @@

19120

}

19121

}

19122

/** @param group cast=(GSList *) */

19123

-public static final native int /*long*/ _gtk_radio_button_new(int /*long*/ group);

19124

-public static final int /*long*/ gtk_radio_button_new(int /*long*/ group) {

19125

+public static final native long /*int*/ _gtk_radio_button_new(long /*int*/ group);

19126

+public static final long /*int*/ gtk_radio_button_new(long /*int*/ group) {

19127

lock.lock();

19128

try {

19129

return _gtk_radio_button_new(group);

19130

@@ -8961,8 +8961,8 @@

19131

}

19132

}

19133

/** @param radio_menu_item cast=(GtkRadioMenuItem *) */

19134

-public static final native int /*long*/ _gtk_radio_menu_item_get_group(int /*long*/ radio_menu_item);

19135

-public static final int /*long*/ gtk_radio_menu_item_get_group(int /*long*/ radio_menu_item) {

19136

+public static final native long /*int*/ _gtk_radio_menu_item_get_group(long /*int*/ radio_menu_item);

19137

+public static final long /*int*/ gtk_radio_menu_item_get_group(long /*int*/ radio_menu_item) {

19138

lock.lock();

19139

try {

19140

return _gtk_radio_menu_item_get_group(radio_menu_item);

19141

@@ -8971,8 +8971,8 @@

19142

}

19143

}

19144

/** @param group cast=(GSList *) */

19145

-public static final native int /*long*/ _gtk_radio_menu_item_new(int /*long*/ group);

19146

-public static final int /*long*/ gtk_radio_menu_item_new(int /*long*/ group) {

19147

+public static final native long /*int*/ _gtk_radio_menu_item_new(long /*int*/ group);

19148

+public static final long /*int*/ gtk_radio_menu_item_new(long /*int*/ group) {

19149

lock.lock();

19150

try {

19151

return _gtk_radio_menu_item_new(group);

19152

@@ -8984,8 +8984,8 @@

19153

* @param group cast=(GSList *)

19154

* @param label cast=(const gchar *)

19155

*/

19156

-public static final native int /*long*/ _gtk_radio_menu_item_new_with_label(int /*long*/ group, byte[] label);

19157

-public static final int /*long*/ gtk_radio_menu_item_new_with_label(int /*long*/ group, byte[] label) {

19158

+public static final native long /*int*/ _gtk_radio_menu_item_new_with_label(long /*int*/ group, byte[] label);

19159

+public static final long /*int*/ gtk_radio_menu_item_new_with_label(long /*int*/ group, byte[] label) {

19160

lock.lock();

19161

try {

19162

return _gtk_radio_menu_item_new_with_label(group, label);

19163

@@ -8994,8 +8994,8 @@

19164

}

19165

}

19166

/** @param range cast=(GtkRange *) */

19167

-public static final native int /*long*/ _gtk_range_get_adjustment(int /*long*/ range);

19168

-public static final int /*long*/ gtk_range_get_adjustment(int /*long*/ range) {

19169

+public static final native long /*int*/ _gtk_range_get_adjustment(long /*int*/ range);

19170

+public static final long /*int*/ gtk_range_get_adjustment(long /*int*/ range) {

19171

lock.lock();

19172

try {

19173

return _gtk_range_get_adjustment(range);

19174

@@ -9004,8 +9004,8 @@

19175

}

19176

}

19177

/** @param range cast=(GtkRange *) */

19178

-public static final native void _gtk_range_set_increments(int /*long*/ range, double step, double page);

19179

-public static final void gtk_range_set_increments(int /*long*/ range, double step, double page) {

19180

+public static final native void _gtk_range_set_increments(long /*int*/ range, double step, double page);

19181

+public static final void gtk_range_set_increments(long /*int*/ range, double step, double page) {

19182

lock.lock();

19183

try {

19184

_gtk_range_set_increments(range, step, page);

19185

@@ -9014,8 +9014,8 @@

19186

}

19187

}

19188

/** @param range cast=(GtkRange *) */

19189

-public static final native void _gtk_range_set_inverted(int /*long*/ range, boolean setting);

19190

-public static final void gtk_range_set_inverted(int /*long*/ range, boolean setting) {

19191

+public static final native void _gtk_range_set_inverted(long /*int*/ range, boolean setting);

19192

+public static final void gtk_range_set_inverted(long /*int*/ range, boolean setting) {

19193

lock.lock();

19194

try {

19195

_gtk_range_set_inverted(range, setting);

19196

@@ -9024,8 +9024,8 @@

19197

}

19198

}

19199

/** @param range cast=(GtkRange *) */

19200

-public static final native void _gtk_range_set_range(int /*long*/ range, double min, double max);

19201

-public static final void gtk_range_set_range(int /*long*/ range, double min, double max) {

19202

+public static final native void _gtk_range_set_range(long /*int*/ range, double min, double max);

19203

+public static final void gtk_range_set_range(long /*int*/ range, double min, double max) {

19204

lock.lock();

19205

try {

19206

_gtk_range_set_range(range, min, max);

19207

@@ -9034,8 +9034,8 @@

19208

}

19209

}

19210

/** @param range cast=(GtkRange *) */

19211

-public static final native void _gtk_range_set_value(int /*long*/ range, double value);

19212

-public static final void gtk_range_set_value(int /*long*/ range, double value) {

19213

+public static final native void _gtk_range_set_value(long /*int*/ range, double value);

19214

+public static final void gtk_range_set_value(long /*int*/ range, double value) {

19215

lock.lock();

19216

try {

19217

_gtk_range_set_value(range, value);

19218

@@ -9054,8 +9054,8 @@

19219

}

19220

}

19221

/** @param style cast=(GtkRcStyle *) */

19222

-public static final native int /*long*/ _gtk_rc_style_get_bg_pixmap_name(int /*long*/ style, int index);

19223

-public static final int /*long*/ gtk_rc_style_get_bg_pixmap_name(int /*long*/ style, int index) {

19224

+public static final native long /*int*/ _gtk_rc_style_get_bg_pixmap_name(long /*int*/ style, int index);

19225

+public static final long /*int*/ gtk_rc_style_get_bg_pixmap_name(long /*int*/ style, int index) {

19226

lock.lock();

19227

try {

19228

return _gtk_rc_style_get_bg_pixmap_name(style, index);

19229

@@ -9064,8 +9064,8 @@

19230

}

19231

}

19232

/** @param style cast=(GtkRcStyle *) */

19233

-public static final native int _gtk_rc_style_get_color_flags(int /*long*/ style, int index);

19234

-public static final int gtk_rc_style_get_color_flags(int /*long*/ style, int index) {

19235

+public static final native int _gtk_rc_style_get_color_flags(long /*int*/ style, int index);

19236

+public static final int gtk_rc_style_get_color_flags(long /*int*/ style, int index) {

19237

lock.lock();

19238

try {

19239

return _gtk_rc_style_get_color_flags(style, index);

19240

@@ -9077,8 +9077,8 @@

19241

* @param style cast=(GtkRcStyle *)

19242

* @param color flags=no_out

19243

*/

19244

-public static final native void _gtk_rc_style_set_bg(int /*long*/ style, int index, GdkColor color);

19245

-public static final void gtk_rc_style_set_bg(int /*long*/ style, int index, GdkColor color) {

19246

+public static final native void _gtk_rc_style_set_bg(long /*int*/ style, int index, GdkColor color);

19247

+public static final void gtk_rc_style_set_bg(long /*int*/ style, int index, GdkColor color) {

19248

lock.lock();

19249

try {

19250

_gtk_rc_style_set_bg(style, index, color);

19251

@@ -9090,8 +9090,8 @@

19252

* @param style cast=(GtkRcStyle *)

19253

* @param name cast=(char *)

19254

*/

19255

-public static final native void _gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int index, int /*long*/ name);

19256

-public static final void gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int index, int /*long*/ name) {

19257

+public static final native void _gtk_rc_style_set_bg_pixmap_name(long /*int*/ style, int index, long /*int*/ name);

19258

+public static final void gtk_rc_style_set_bg_pixmap_name(long /*int*/ style, int index, long /*int*/ name) {

19259

lock.lock();

19260

try {

19261

_gtk_rc_style_set_bg_pixmap_name(style, index, name);

19262

@@ -9100,8 +9100,8 @@

19263

}

19264

}

19265

/** @param style cast=(GtkRcStyle *) */

19266

-public static final native void _gtk_rc_style_set_color_flags(int /*long*/ style, int index, int flag);

19267

-public static final void gtk_rc_style_set_color_flags(int /*long*/ style, int index, int flag) {

19268

+public static final native void _gtk_rc_style_set_color_flags(long /*int*/ style, int index, int flag);

19269

+public static final void gtk_rc_style_set_color_flags(long /*int*/ style, int index, int flag) {

19270

lock.lock();

19271

try {

19272

_gtk_rc_style_set_color_flags(style, index, flag);

19273

@@ -9113,8 +9113,8 @@

19274

* @param scale cast=(GtkScale *)

19275

* @param digits cast=(gint)

19276

*/

19277

-public static final native void _gtk_scale_set_digits(int /*long*/ scale, int digits);

19278

-public static final void gtk_scale_set_digits(int /*long*/ scale, int digits) {

19279

+public static final native void _gtk_scale_set_digits(long /*int*/ scale, int digits);

19280

+public static final void gtk_scale_set_digits(long /*int*/ scale, int digits) {

19281

lock.lock();

19282

try {

19283

_gtk_scale_set_digits(scale, digits);

19284

@@ -9126,8 +9126,8 @@

19285

* @param scale cast=(GtkScale *)

19286

* @param draw_value cast=(gboolean)

19287

*/

19288

-public static final native void _gtk_scale_set_draw_value(int /*long*/ scale, boolean draw_value);

19289

-public static final void gtk_scale_set_draw_value(int /*long*/ scale, boolean draw_value) {

19290

+public static final native void _gtk_scale_set_draw_value(long /*int*/ scale, boolean draw_value);

19291

+public static final void gtk_scale_set_draw_value(long /*int*/ scale, boolean draw_value) {

19292

lock.lock();

19293

try {

19294

_gtk_scale_set_draw_value(scale, draw_value);

19295

@@ -9139,8 +9139,8 @@

19296

* @param style cast=(GtkRcStyle *)

19297

* @param color flags=no_out

19298

*/

19299

-public static final native void _gtk_rc_style_set_fg(int /*long*/ style, int index, GdkColor color);

19300

-public static final void gtk_rc_style_set_fg(int /*long*/ style, int index, GdkColor color) {

19301

+public static final native void _gtk_rc_style_set_fg(long /*int*/ style, int index, GdkColor color);

19302

+public static final void gtk_rc_style_set_fg(long /*int*/ style, int index, GdkColor color) {

19303

lock.lock();

19304

try {

19305

_gtk_rc_style_set_fg(style, index, color);

19306

@@ -9152,8 +9152,8 @@

19307

* @param style cast=(GtkRcStyle *)

19308

* @param color flags=no_out

19309

*/

19310

-public static final native void _gtk_rc_style_set_text(int /*long*/ style, int index, GdkColor color);

19311

-public static final void gtk_rc_style_set_text(int /*long*/ style, int index, GdkColor color) {

19312

+public static final native void _gtk_rc_style_set_text(long /*int*/ style, int index, GdkColor color);

19313

+public static final void gtk_rc_style_set_text(long /*int*/ style, int index, GdkColor color) {

19314

lock.lock();

19315

try {

19316

_gtk_rc_style_set_text(style, index, color);

19317

@@ -9165,8 +9165,8 @@

19318

* @param scrolled_window cast=(GtkScrolledWindow *)

19319

* @param child cast=(GtkWidget *)

19320

*/

19321

-public static final native void _gtk_scrolled_window_add_with_viewport(int /*long*/ scrolled_window, int /*long*/ child);

19322

-public static final void gtk_scrolled_window_add_with_viewport(int /*long*/ scrolled_window, int /*long*/ child) {

19323

+public static final native void _gtk_scrolled_window_add_with_viewport(long /*int*/ scrolled_window, long /*int*/ child);

19324

+public static final void gtk_scrolled_window_add_with_viewport(long /*int*/ scrolled_window, long /*int*/ child) {

19325

lock.lock();

19326

try {

19327

_gtk_scrolled_window_add_with_viewport(scrolled_window, child);

19328

@@ -9175,8 +9175,8 @@

19329

}

19330

}

19331

/** @param scrolled_window cast=(GtkScrolledWindow *) */

19332

-public static final native int /*long*/ _gtk_scrolled_window_get_hadjustment(int /*long*/ scrolled_window);

19333

-public static final int /*long*/ gtk_scrolled_window_get_hadjustment(int /*long*/ scrolled_window) {

19334

+public static final native long /*int*/ _gtk_scrolled_window_get_hadjustment(long /*int*/ scrolled_window);

19335

+public static final long /*int*/ gtk_scrolled_window_get_hadjustment(long /*int*/ scrolled_window) {

19336

lock.lock();

19337

try {

19338

return _gtk_scrolled_window_get_hadjustment(scrolled_window);

19339

@@ -9189,8 +9189,8 @@

19340

* @param hscrollbar_policy cast=(GtkPolicyType *)

19341

* @param vscrollbar_policy cast=(GtkPolicyType *)

19342

*/

19343

-public static final native void _gtk_scrolled_window_get_policy(int /*long*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy);

19344

-public static final void gtk_scrolled_window_get_policy(int /*long*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy) {

19345

+public static final native void _gtk_scrolled_window_get_policy(long /*int*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy);

19346

+public static final void gtk_scrolled_window_get_policy(long /*int*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy) {

19347

lock.lock();

19348

try {

19349

_gtk_scrolled_window_get_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);

19350

@@ -9199,8 +9199,8 @@

19351

}

19352

}

19353

/** @param scrolled_window cast=(GtkScrolledWindow *) */

19354

-public static final native int _gtk_scrolled_window_get_shadow_type(int /*long*/ scrolled_window);

19355

-public static final int gtk_scrolled_window_get_shadow_type(int /*long*/ scrolled_window) {

19356

+public static final native int _gtk_scrolled_window_get_shadow_type(long /*int*/ scrolled_window);

19357

+public static final int gtk_scrolled_window_get_shadow_type(long /*int*/ scrolled_window) {

19358

lock.lock();

19359

try {

19360

return _gtk_scrolled_window_get_shadow_type(scrolled_window);

19361

@@ -9209,8 +9209,8 @@

19362

}

19363

}

19364

/** @param scrolled_window cast=(GtkScrolledWindow *) */

19365

-public static final native int /*long*/ _gtk_scrolled_window_get_vadjustment(int /*long*/ scrolled_window);

19366

-public static final int /*long*/ gtk_scrolled_window_get_vadjustment(int /*long*/ scrolled_window) {

19367

+public static final native long /*int*/ _gtk_scrolled_window_get_vadjustment(long /*int*/ scrolled_window);

19368

+public static final long /*int*/ gtk_scrolled_window_get_vadjustment(long /*int*/ scrolled_window) {

19369

lock.lock();

19370

try {

19371

return _gtk_scrolled_window_get_vadjustment(scrolled_window);

19372

@@ -9222,8 +9222,8 @@

19373

* @param hadjustment cast=(GtkAdjustment *)

19374

* @param vadjustment cast=(GtkAdjustment *)

19375

*/

19376

-public static final native int /*long*/ _gtk_scrolled_window_new(int /*long*/ hadjustment, int /*long*/ vadjustment);

19377

-public static final int /*long*/ gtk_scrolled_window_new(int /*long*/ hadjustment, int /*long*/ vadjustment) {

19378

+public static final native long /*int*/ _gtk_scrolled_window_new(long /*int*/ hadjustment, long /*int*/ vadjustment);

19379

+public static final long /*int*/ gtk_scrolled_window_new(long /*int*/ hadjustment, long /*int*/ vadjustment) {

19380

lock.lock();

19381

try {

19382

return _gtk_scrolled_window_new(hadjustment, vadjustment);

19383

@@ -9235,8 +9235,8 @@

19384

* @param scrolled_window cast=(GtkScrolledWindow *)

19385

* @param placement cast=(GtkCornerType)

19386

*/

19387

-public static final native void _gtk_scrolled_window_set_placement(int /*long*/ scrolled_window, int placement);

19388

-public static final void gtk_scrolled_window_set_placement(int /*long*/ scrolled_window, int placement) {

19389

+public static final native void _gtk_scrolled_window_set_placement(long /*int*/ scrolled_window, int placement);

19390

+public static final void gtk_scrolled_window_set_placement(long /*int*/ scrolled_window, int placement) {

19391

lock.lock();

19392

try {

19393

_gtk_scrolled_window_set_placement(scrolled_window, placement);

19394

@@ -9249,8 +9249,8 @@

19395

* @param hscrollbar_policy cast=(GtkPolicyType)

19396

* @param vscrollbar_policy cast=(GtkPolicyType)

19397

*/

19398

-public static final native void _gtk_scrolled_window_set_policy(int /*long*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy);

19399

-public static final void gtk_scrolled_window_set_policy(int /*long*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy) {

19400

+public static final native void _gtk_scrolled_window_set_policy(long /*int*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy);

19401

+public static final void gtk_scrolled_window_set_policy(long /*int*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy) {

19402

lock.lock();

19403

try {

19404

_gtk_scrolled_window_set_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);

19405

@@ -9262,8 +9262,8 @@

19406

* @param scrolled_window cast=(GtkScrolledWindow *)

19407

* @param type cast=(GtkShadowType)

19408

*/

19409

-public static final native void _gtk_scrolled_window_set_shadow_type(int /*long*/ scrolled_window, int type);

19410

-public static final void gtk_scrolled_window_set_shadow_type(int /*long*/ scrolled_window, int type) {

19411

+public static final native void _gtk_scrolled_window_set_shadow_type(long /*int*/ scrolled_window, int type);

19412

+public static final void gtk_scrolled_window_set_shadow_type(long /*int*/ scrolled_window, int type) {

19413

lock.lock();

19414

try {

19415

_gtk_scrolled_window_set_shadow_type(scrolled_window, type);

19416

@@ -9271,8 +9271,8 @@

19417

lock.unlock();

19418

}

19419

}

19420

-public static final native int /*long*/ _gtk_settings_get_default();

19421

-public static final int /*long*/ gtk_settings_get_default() {

19422

+public static final native long /*int*/ _gtk_settings_get_default();

19423

+public static final long /*int*/ gtk_settings_get_default() {

19424

lock.lock();

19425

try {

19426

return _gtk_settings_get_default();

19427

@@ -9281,8 +9281,8 @@

19428

}

19429

}

19430

/** @param selection_data cast=(GtkSelectionData *) */

19431

-public static final native void _gtk_selection_data_free(int /*long*/ selection_data);

19432

-public static final void gtk_selection_data_free(int /*long*/ selection_data) {

19433

+public static final native void _gtk_selection_data_free(long /*int*/ selection_data);

19434

+public static final void gtk_selection_data_free(long /*int*/ selection_data) {

19435

lock.lock();

19436

try {

19437

_gtk_selection_data_free(selection_data);

19438

@@ -9297,8 +9297,8 @@

19439

* @param data cast=(const guchar *)

19440

* @param length cast=(gint)

19441

*/

19442

-public static final native void _gtk_selection_data_set(int /*long*/ selection_data, int /*long*/ type, int format, int /*long*/ data, int length);

19443

-public static final void gtk_selection_data_set(int /*long*/ selection_data, int /*long*/ type, int format, int /*long*/ data, int length) {

19444

+public static final native void _gtk_selection_data_set(long /*int*/ selection_data, long /*int*/ type, int format, long /*int*/ data, int length);

19445

+public static final void gtk_selection_data_set(long /*int*/ selection_data, long /*int*/ type, int format, long /*int*/ data, int length) {

19446

lock.lock();

19447

try {

19448

_gtk_selection_data_set(selection_data, type, format, data, length);

19449

@@ -9306,8 +9306,8 @@

19450

lock.unlock();

19451

}

19452

}

19453

-public static final native int /*long*/ _gtk_separator_menu_item_new();

19454

-public static final int /*long*/ gtk_separator_menu_item_new() {

19455

+public static final native long /*int*/ _gtk_separator_menu_item_new();

19456

+public static final long /*int*/ gtk_separator_menu_item_new() {

19457

lock.lock();

19458

try {

19459

return _gtk_separator_menu_item_new();

19460

@@ -9315,8 +9315,8 @@

19461

lock.unlock();

19462

}

19463

}

19464

-public static final native int /*long*/ _gtk_set_locale();

19465

-public static final int /*long*/ gtk_set_locale() {

19466

+public static final native long /*int*/ _gtk_set_locale();

19467

+public static final long /*int*/ gtk_set_locale() {

19468

lock.lock();

19469

try {

19470

return _gtk_set_locale();

19471

@@ -9325,8 +9325,8 @@

19472

}

19473

}

19474

/** @param socket cast=(GtkSocket *) */

19475

-public static final native int /*long*/ _gtk_socket_get_id(int /*long*/ socket);

19476

-public static final int /*long*/ gtk_socket_get_id(int /*long*/ socket) {

19477

+public static final native long /*int*/ _gtk_socket_get_id(long /*int*/ socket);

19478

+public static final long /*int*/ gtk_socket_get_id(long /*int*/ socket) {

19479

lock.lock();

19480

try {

19481

return _gtk_socket_get_id(socket);

19482

@@ -9334,8 +9334,8 @@

19483

lock.unlock();

19484

}

19485

}

19486

-public static final native int /*long*/ _gtk_socket_new();

19487

-public static final int /*long*/ gtk_socket_new() {

19488

+public static final native long /*int*/ _gtk_socket_new();

19489

+public static final long /*int*/ gtk_socket_new() {

19490

lock.lock();

19491

try {

19492

return _gtk_socket_new();

19493

@@ -9344,8 +9344,8 @@

19494

}

19495

}

19496

/** @param adjustment cast=(GtkAdjustment *) */

19497

-public static final native int /*long*/ _gtk_spin_button_new(int /*long*/ adjustment, double climb_rate, int digits);

19498

-public static final int /*long*/ gtk_spin_button_new(int /*long*/ adjustment, double climb_rate, int digits) {

19499

+public static final native long /*int*/ _gtk_spin_button_new(long /*int*/ adjustment, double climb_rate, int digits);

19500

+public static final long /*int*/ gtk_spin_button_new(long /*int*/ adjustment, double climb_rate, int digits) {

19501

lock.lock();

19502

try {

19503

return _gtk_spin_button_new(adjustment, climb_rate, digits);

19504

@@ -9354,8 +9354,8 @@

19505

}

19506

}

19507

/** @param spin_button cast=(GtkSpinButton*) */

19508

-public static final native int /*long*/ _gtk_spin_button_get_adjustment(int /*long*/ spin_button);

19509

-public static final int /*long*/ gtk_spin_button_get_adjustment(int /*long*/ spin_button) {

19510

+public static final native long /*int*/ _gtk_spin_button_get_adjustment(long /*int*/ spin_button);

19511

+public static final long /*int*/ gtk_spin_button_get_adjustment(long /*int*/ spin_button) {

19512

lock.lock();

19513

try {

19514

return _gtk_spin_button_get_adjustment(spin_button);

19515

@@ -9365,8 +9365,8 @@

19516

}

19517

19518

/** @param spin_button cast=(GtkSpinButton*) */

19519

-public static final native int _gtk_spin_button_get_digits(int /*long*/ spin_button);

19520

-public static final int gtk_spin_button_get_digits(int /*long*/ spin_button) {

19521

+public static final native int _gtk_spin_button_get_digits(long /*int*/ spin_button);

19522

+public static final int gtk_spin_button_get_digits(long /*int*/ spin_button) {

19523

lock.lock();

19524

try {

19525

return _gtk_spin_button_get_digits(spin_button);

19526

@@ -9375,8 +9375,8 @@

19527

}

19528

}

19529

/** @param spin_button cast=(GtkSpinButton*) */

19530

-public static final native void _gtk_spin_button_set_digits(int /*long*/ spin_button, int digits);

19531

-public static final void gtk_spin_button_set_digits(int /*long*/ spin_button, int digits) {

19532

+public static final native void _gtk_spin_button_set_digits(long /*int*/ spin_button, int digits);

19533

+public static final void gtk_spin_button_set_digits(long /*int*/ spin_button, int digits) {

19534

lock.lock();

19535

try {

19536

_gtk_spin_button_set_digits(spin_button, digits);

19537

@@ -9385,8 +9385,8 @@

19538

}

19539

}

19540

/** @param spin_button cast=(GtkSpinButton*) */

19541

-public static final native void _gtk_spin_button_set_increments(int /*long*/ spin_button, double step, double page);

19542

-public static final void gtk_spin_button_set_increments(int /*long*/ spin_button, double step, double page) {

19543

+public static final native void _gtk_spin_button_set_increments(long /*int*/ spin_button, double step, double page);

19544

+public static final void gtk_spin_button_set_increments(long /*int*/ spin_button, double step, double page) {

19545

lock.lock();

19546

try {

19547

_gtk_spin_button_set_increments(spin_button, step, page);

19548

@@ -9395,8 +9395,8 @@

19549

}

19550

}

19551

/** @param spin_button cast=(GtkSpinButton*) */

19552

-public static final native void _gtk_spin_button_set_range(int /*long*/ spin_button, double max, double min);

19553

-public static final void gtk_spin_button_set_range(int /*long*/ spin_button, double max, double min) {

19554

+public static final native void _gtk_spin_button_set_range(long /*int*/ spin_button, double max, double min);

19555

+public static final void gtk_spin_button_set_range(long /*int*/ spin_button, double max, double min) {

19556

lock.lock();

19557

try {

19558

_gtk_spin_button_set_range(spin_button, max, min);

19559

@@ -9405,8 +9405,8 @@

19560

}

19561

}

19562

/** @param spin_button cast=(GtkSpinButton*) */

19563

-public static final native void _gtk_spin_button_set_value(int /*long*/ spin_button, double value);

19564

-public static final void gtk_spin_button_set_value(int /*long*/ spin_button, double value) {

19565

+public static final native void _gtk_spin_button_set_value(long /*int*/ spin_button, double value);

19566

+public static final void gtk_spin_button_set_value(long /*int*/ spin_button, double value) {

19567

lock.lock();

19568

try {

19569

_gtk_spin_button_set_value(spin_button, value);

19570

@@ -9415,8 +9415,8 @@

19571

}

19572

}

19573

/** @param spin_button cast=(GtkSpinButton*) */

19574

-public static final native void _gtk_spin_button_set_wrap(int /*long*/ spin_button, boolean wrap);

19575

-public static final void gtk_spin_button_set_wrap(int /*long*/ spin_button, boolean wrap) {

19576

+public static final native void _gtk_spin_button_set_wrap(long /*int*/ spin_button, boolean wrap);

19577

+public static final void gtk_spin_button_set_wrap(long /*int*/ spin_button, boolean wrap) {

19578

lock.lock();

19579

try {

19580

_gtk_spin_button_set_wrap(spin_button, wrap);

19581

@@ -9425,8 +9425,8 @@

19582

}

19583

}

19584

/** @param spin_button cast=(GtkSpinButton*) */

19585

-public static final native void _gtk_spin_button_update(int /*long*/ spin_button);

19586

-public static final void gtk_spin_button_update(int /*long*/ spin_button) {

19587

+public static final native void _gtk_spin_button_update(long /*int*/ spin_button);

19588

+public static final void gtk_spin_button_update(long /*int*/ spin_button) {

19589

lock.lock();

19590

try {

19591

_gtk_spin_button_update(spin_button);

19592

@@ -9437,8 +9437,8 @@

19593

/**

19594

* @method flags=dynamic

19595

*/

19596

-public static final native boolean _gtk_status_icon_get_geometry(int /*long*/ handle, int /*long*/ screen, GdkRectangle area, int /*long*/ orientation);

19597

-public static final boolean gtk_status_icon_get_geometry(int /*long*/ handle, int /*long*/ screen, GdkRectangle area, int /*long*/ orientation) {

19598

+public static final native boolean _gtk_status_icon_get_geometry(long /*int*/ handle, long /*int*/ screen, GdkRectangle area, long /*int*/ orientation);

19599

+public static final boolean gtk_status_icon_get_geometry(long /*int*/ handle, long /*int*/ screen, GdkRectangle area, long /*int*/ orientation) {

19600

lock.lock();

19601

try {

19602

return _gtk_status_icon_get_geometry(handle, screen, area, orientation);

19603

@@ -9449,8 +9449,8 @@

19604

/**

19605

* @method flags=dynamic

19606

*/

19607

-public static final native boolean _gtk_status_icon_get_visible(int /*long*/ handle);

19608

-public static final boolean gtk_status_icon_get_visible(int /*long*/ handle) {

19609

+public static final native boolean _gtk_status_icon_get_visible(long /*int*/ handle);

19610

+public static final boolean gtk_status_icon_get_visible(long /*int*/ handle) {

19611

lock.lock();

19612

try {

19613

return _gtk_status_icon_get_visible(handle);

19614

@@ -9459,8 +9459,8 @@

19615

}

19616

}

19617

/** @method flags=dynamic */

19618

-public static final native int /*long*/ _gtk_status_icon_new();

19619

-public static final int /*long*/ gtk_status_icon_new() {

19620

+public static final native long /*int*/ _gtk_status_icon_new();

19621

+public static final long /*int*/ gtk_status_icon_new() {

19622

lock.lock();

19623

try {

19624

return _gtk_status_icon_new();

19625

@@ -9471,8 +9471,8 @@

19626

/**

19627

* @method flags=dynamic

19628

*/

19629

-public static final native void _gtk_status_icon_set_from_pixbuf(int /*long*/ handle, int /*long*/ pixbuf);

19630

-public static final void gtk_status_icon_set_from_pixbuf(int /*long*/ handle, int /*long*/ pixbuf) {

19631

+public static final native void _gtk_status_icon_set_from_pixbuf(long /*int*/ handle, long /*int*/ pixbuf);

19632

+public static final void gtk_status_icon_set_from_pixbuf(long /*int*/ handle, long /*int*/ pixbuf) {

19633

lock.lock();

19634

try {

19635

_gtk_status_icon_set_from_pixbuf(handle, pixbuf);

19636

@@ -9483,8 +9483,8 @@

19637

/**

19638

* @method flags=dynamic

19639

*/

19640

-public static final native void _gtk_status_icon_set_visible(int /*long*/ handle, boolean visible);

19641

-public static final void gtk_status_icon_set_visible(int /*long*/ handle, boolean visible) {

19642

+public static final native void _gtk_status_icon_set_visible(long /*int*/ handle, boolean visible);

19643

+public static final void gtk_status_icon_set_visible(long /*int*/ handle, boolean visible) {

19644

lock.lock();

19645

try {

19646

_gtk_status_icon_set_visible(handle, visible);

19647

@@ -9495,8 +9495,8 @@

19648

/**

19649

* @method flags=dynamic

19650

*/

19651

-public static final native void _gtk_status_icon_set_tooltip(int /*long*/ handle, byte[] tip_text);

19652

-public static final void gtk_status_icon_set_tooltip(int /*long*/ handle, byte[] tip_text) {

19653

+public static final native void _gtk_status_icon_set_tooltip(long /*int*/ handle, byte[] tip_text);

19654

+public static final void gtk_status_icon_set_tooltip(long /*int*/ handle, byte[] tip_text) {

19655

lock.lock();

19656

try {

19657

_gtk_status_icon_set_tooltip(handle, tip_text);

19658

@@ -9508,8 +9508,8 @@

19659

* @param style cast=(GtkStyle *)

19660

* @param color flags=no_in

19661

*/

19662

-public static final native void _gtk_style_get_base(int /*long*/ style, int index, GdkColor color);

19663

-public static final void gtk_style_get_base(int /*long*/ style, int index, GdkColor color) {

19664

+public static final native void _gtk_style_get_base(long /*int*/ style, int index, GdkColor color);

19665

+public static final void gtk_style_get_base(long /*int*/ style, int index, GdkColor color) {

19666

lock.lock();

19667

try {

19668

_gtk_style_get_base(style, index, color);

19669

@@ -9521,8 +9521,8 @@

19670

* @param style cast=(GtkStyle *)

19671

* @param color flags=no_in

19672

*/

19673

-public static final native void _gtk_style_get_black(int /*long*/ style, GdkColor color);

19674

-public static final void gtk_style_get_black(int /*long*/ style, GdkColor color) {

19675

+public static final native void _gtk_style_get_black(long /*int*/ style, GdkColor color);

19676

+public static final void gtk_style_get_black(long /*int*/ style, GdkColor color) {

19677

lock.lock();

19678

try {

19679

_gtk_style_get_black(style, color);

19680

@@ -9534,8 +9534,8 @@

19681

* @param style cast=(GtkStyle *)

19682

* @param color flags=no_in

19683

*/

19684

-public static final native void _gtk_style_get_bg(int /*long*/ style, int index, GdkColor color);

19685

-public static final void gtk_style_get_bg(int /*long*/ style, int index, GdkColor color) {

19686

+public static final native void _gtk_style_get_bg(long /*int*/ style, int index, GdkColor color);

19687

+public static final void gtk_style_get_bg(long /*int*/ style, int index, GdkColor color) {

19688

lock.lock();

19689

try {

19690

_gtk_style_get_bg(style, index, color);

19691

@@ -9547,8 +9547,8 @@

19692

* @param style cast=(GtkStyle *)

19693

* @param color flags=no_in

19694

*/

19695

-public static final native void _gtk_style_get_dark(int /*long*/ style, int index, GdkColor color);

19696

-public static final void gtk_style_get_dark(int /*long*/ style, int index, GdkColor color) {

19697

+public static final native void _gtk_style_get_dark(long /*int*/ style, int index, GdkColor color);

19698

+public static final void gtk_style_get_dark(long /*int*/ style, int index, GdkColor color) {

19699

lock.lock();

19700

try {

19701

_gtk_style_get_dark(style, index, color);

19702

@@ -9560,8 +9560,8 @@

19703

* @param style cast=(GtkStyle *)

19704

* @param color flags=no_in

19705

*/

19706

-public static final native void _gtk_style_get_fg(int /*long*/ style, int index, GdkColor color);

19707

-public static final void gtk_style_get_fg(int /*long*/ style, int index, GdkColor color) {

19708

+public static final native void _gtk_style_get_fg(long /*int*/ style, int index, GdkColor color);

19709

+public static final void gtk_style_get_fg(long /*int*/ style, int index, GdkColor color) {

19710

lock.lock();

19711

try {

19712

_gtk_style_get_fg(style, index, color);

19713

@@ -9573,8 +9573,8 @@

19714

* @param style cast=(GtkStyle *)

19715

* @param gc cast=(GdkGC **),flags=no_in

19716

*/

19717

-public static final native void _gtk_style_get_fg_gc(int /*long*/ style, int index, int /*long*/[] gc);

19718

-public static final void gtk_style_get_fg_gc(int /*long*/ style, int index, int /*long*/[] gc) {

19719

+public static final native void _gtk_style_get_fg_gc(long /*int*/ style, int index, long /*int*/[] gc);

19720

+public static final void gtk_style_get_fg_gc(long /*int*/ style, int index, long /*int*/[] gc) {

19721

lock.lock();

19722

try {

19723

_gtk_style_get_fg_gc(style, index, gc);

19724

@@ -9586,8 +9586,8 @@

19725

* @param style cast=(GtkStyle *)

19726

* @param gc cast=(GdkGC **),flags=no_in

19727

*/

19728

-public static final native void _gtk_style_get_bg_gc(int /*long*/ style, int index, int /*long*/[] gc);

19729

-public static final void gtk_style_get_bg_gc(int /*long*/ style, int index, int /*long*/[] gc) {

19730

+public static final native void _gtk_style_get_bg_gc(long /*int*/ style, int index, long /*int*/[] gc);

19731

+public static final void gtk_style_get_bg_gc(long /*int*/ style, int index, long /*int*/[] gc) {

19732

lock.lock();

19733

try {

19734

_gtk_style_get_bg_gc(style, index, gc);

19735

@@ -9599,8 +9599,8 @@

19736

* @param style cast=(GtkStyle *)

19737

* @param gc cast=(GdkGC **)

19738

*/

19739

-public static final native void _gtk_style_get_light_gc(int /*long*/ style, int index, int /*long*/[] gc);

19740

-public static final void gtk_style_get_light_gc(int /*long*/ style, int index, int /*long*/[] gc) {

19741

+public static final native void _gtk_style_get_light_gc(long /*int*/ style, int index, long /*int*/[] gc);

19742

+public static final void gtk_style_get_light_gc(long /*int*/ style, int index, long /*int*/[] gc) {

19743

lock.lock();

19744

try {

19745

_gtk_style_get_light_gc(style, index, gc);

19746

@@ -9612,8 +9612,8 @@

19747

* @param style cast=(GtkStyle *)

19748

* @param gc cast=(GdkGC **),flags=no_in

19749

*/

19750

-public static final native void _gtk_style_get_dark_gc(int /*long*/ style, int index, int /*long*/[] gc);

19751

-public static final void gtk_style_get_dark_gc(int /*long*/ style, int index, int /*long*/[] gc) {

19752

+public static final native void _gtk_style_get_dark_gc(long /*int*/ style, int index, long /*int*/[] gc);

19753

+public static final void gtk_style_get_dark_gc(long /*int*/ style, int index, long /*int*/[] gc) {

19754

lock.lock();

19755

try {

19756

_gtk_style_get_dark_gc(style, index, gc);

19757

@@ -9625,8 +9625,8 @@

19758

* @param style cast=(GtkStyle *)

19759

* @param gc cast=(GdkGC **)

19760

*/

19761

-public static final native void _gtk_style_get_mid_gc(int /*long*/ style, int index, int /*long*/[] gc);

19762

-public static final void gtk_style_get_mid_gc(int /*long*/ style, int index, int /*long*/[] gc) {

19763

+public static final native void _gtk_style_get_mid_gc(long /*int*/ style, int index, long /*int*/[] gc);

19764

+public static final void gtk_style_get_mid_gc(long /*int*/ style, int index, long /*int*/[] gc) {

19765

lock.lock();

19766

try {

19767

_gtk_style_get_mid_gc(style, index, gc);

19768

@@ -9638,8 +9638,8 @@

19769

* @param style cast=(GtkStyle *)

19770

* @param gc cast=(GdkGC **)

19771

*/

19772

-public static final native void _gtk_style_get_text_gc(int /*long*/ style, int index, int /*long*/[] gc);

19773

-public static final void gtk_style_get_text_gc(int /*long*/ style, int index, int /*long*/[] gc) {

19774

+public static final native void _gtk_style_get_text_gc(long /*int*/ style, int index, long /*int*/[] gc);

19775

+public static final void gtk_style_get_text_gc(long /*int*/ style, int index, long /*int*/[] gc) {

19776

lock.lock();

19777

try {

19778

_gtk_style_get_text_gc(style, index, gc);

19779

@@ -9651,8 +9651,8 @@

19780

* @param style cast=(GtkStyle *)

19781

* @param gc cast=(GdkGC **)

19782

*/

19783

-public static final native void _gtk_style_get_text_aa_gc(int /*long*/ style, int index, int /*long*/[] gc);

19784

-public static final void gtk_style_get_text_aa_gc(int /*long*/ style, int index, int /*long*/[] gc) {

19785

+public static final native void _gtk_style_get_text_aa_gc(long /*int*/ style, int index, long /*int*/[] gc);

19786

+public static final void gtk_style_get_text_aa_gc(long /*int*/ style, int index, long /*int*/[] gc) {

19787

lock.lock();

19788

try {

19789

_gtk_style_get_text_aa_gc(style, index, gc);

19790

@@ -9664,8 +9664,8 @@

19791

* @param style cast=(GtkStyle *)

19792

* @param gc cast=(GdkGC **),flags=no_in

19793

*/

19794

-public static final native void _gtk_style_get_black_gc(int /*long*/ style, int /*long*/[] gc);

19795

-public static final void gtk_style_get_black_gc(int /*long*/ style, int /*long*/[] gc) {

19796

+public static final native void _gtk_style_get_black_gc(long /*int*/ style, long /*int*/[] gc);

19797

+public static final void gtk_style_get_black_gc(long /*int*/ style, long /*int*/[] gc) {

19798

lock.lock();

19799

try {

19800

_gtk_style_get_black_gc(style, gc);

19801

@@ -9677,8 +9677,8 @@

19802

* @param style cast=(GtkStyle *)

19803

* @param gc cast=(GdkGC **)

19804

*/

19805

-public static final native void _gtk_style_get_white_gc(int /*long*/ style, int /*long*/[] gc);

19806

-public static final void gtk_style_get_white_gc(int /*long*/ style, int /*long*/[] gc) {

19807

+public static final native void _gtk_style_get_white_gc(long /*int*/ style, long /*int*/[] gc);

19808

+public static final void gtk_style_get_white_gc(long /*int*/ style, long /*int*/[] gc) {

19809

lock.lock();

19810

try {

19811

_gtk_style_get_white_gc(style, gc);

19812

@@ -9687,8 +9687,8 @@

19813

}

19814

}

19815

/** @param style cast=(GtkStyle *) */

19816

-public static final native int /*long*/ _gtk_style_get_font_desc(int /*long*/ style);

19817

-public static final int /*long*/ gtk_style_get_font_desc(int /*long*/ style) {

19818

+public static final native long /*int*/ _gtk_style_get_font_desc(long /*int*/ style);

19819

+public static final long /*int*/ gtk_style_get_font_desc(long /*int*/ style) {

19820

lock.lock();

19821

try {

19822

return _gtk_style_get_font_desc(style);

19823

@@ -9700,8 +9700,8 @@

19824

* @param style cast=(GtkStyle *)

19825

* @param color flags=no_in

19826

*/

19827

-public static final native void _gtk_style_get_light(int /*long*/ style, int index, GdkColor color);

19828

-public static final void gtk_style_get_light(int /*long*/ style, int index, GdkColor color) {

19829

+public static final native void _gtk_style_get_light(long /*int*/ style, int index, GdkColor color);

19830

+public static final void gtk_style_get_light(long /*int*/ style, int index, GdkColor color) {

19831

lock.lock();

19832

try {

19833

_gtk_style_get_light(style, index, color);

19834

@@ -9713,8 +9713,8 @@

19835

* @param style cast=(GtkStyle *)

19836

* @param color flags=no_in

19837

*/

19838

-public static final native void _gtk_style_get_text(int /*long*/ style, int index, GdkColor color);

19839

-public static final void gtk_style_get_text(int /*long*/ style, int index, GdkColor color) {

19840

+public static final native void _gtk_style_get_text(long /*int*/ style, int index, GdkColor color);

19841

+public static final void gtk_style_get_text(long /*int*/ style, int index, GdkColor color) {

19842

lock.lock();

19843

try {

19844

_gtk_style_get_text(style, index, color);

19845

@@ -9723,8 +9723,8 @@

19846

}

19847

}

19848

/** @param style cast=(GtkStyle *) */

19849

-public static final native int _gtk_style_get_xthickness(int /*long*/ style);

19850

-public static final int gtk_style_get_xthickness(int /*long*/ style) {

19851

+public static final native int _gtk_style_get_xthickness(long /*int*/ style);

19852

+public static final int gtk_style_get_xthickness(long /*int*/ style) {

19853

lock.lock();

19854

try {

19855

return _gtk_style_get_xthickness(style);

19856

@@ -9733,8 +9733,8 @@

19857

}

19858

}

19859

/** @param style cast=(GtkStyle *) */

19860

-public static final native int _gtk_style_get_ythickness(int /*long*/ style);

19861

-public static final int gtk_style_get_ythickness(int /*long*/ style) {

19862

+public static final native int _gtk_style_get_ythickness(long /*int*/ style);

19863

+public static final int gtk_style_get_ythickness(long /*int*/ style) {

19864

lock.lock();

19865

try {

19866

return _gtk_style_get_ythickness(style);

19867

@@ -9748,8 +9748,8 @@

19868

* @param widget cast=(GtkWidget *)

19869

* @param detail cast=(const gchar *)

19870

*/

19871

-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);

19872

-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) {

19873

+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);

19874

+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) {

19875

lock.lock();

19876

try {

19877

return _gtk_style_render_icon(style, source, direction, state, size, widget, detail);

19878

@@ -9761,8 +9761,8 @@

19879

* @param targets cast=(const GtkTargetEntry *)

19880

* @param ntargets cast=(guint)

19881

*/

19882

-public static final native int /*long*/ _gtk_target_list_new(int /*long*/ targets, int ntargets);

19883

-public static final int /*long*/ gtk_target_list_new(int /*long*/ targets, int ntargets) {

19884

+public static final native long /*int*/ _gtk_target_list_new(long /*int*/ targets, int ntargets);

19885

+public static final long /*int*/ gtk_target_list_new(long /*int*/ targets, int ntargets) {

19886

lock.lock();

19887

try {

19888

return _gtk_target_list_new(targets, ntargets);

19889

@@ -9771,8 +9771,8 @@

19890

}

19891

}

19892

/** @param list cast=(GtkTargetList *) */

19893

-public static final native void _gtk_target_list_unref(int /*long*/ list);

19894

-public static final void gtk_target_list_unref(int /*long*/ list) {

19895

+public static final native void _gtk_target_list_unref(long /*int*/ list);

19896

+public static final void gtk_target_list_unref(long /*int*/ list) {

19897

lock.lock();

19898

try {

19899

_gtk_target_list_unref(list);

19900

@@ -9784,8 +9784,8 @@

19901

* @param buffer cast=(GtkTextBuffer *)

19902

* @param clipboard cast=(GtkClipboard *)

19903

*/

19904

-public static final native void _gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int /*long*/ clipboard);

19905

-public static final void gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int /*long*/ clipboard) {

19906

+public static final native void _gtk_text_buffer_copy_clipboard(long /*int*/ buffer, long /*int*/ clipboard);

19907

+public static final void gtk_text_buffer_copy_clipboard(long /*int*/ buffer, long /*int*/ clipboard) {

19908

lock.lock();

19909

try {

19910

_gtk_text_buffer_copy_clipboard(buffer, clipboard);

19911

@@ -9798,8 +9798,8 @@

19912

* @param clipboard cast=(GtkClipboard *)

19913

* @param default_editable cast=(gboolean)

19914

*/

19915

-public static final native void _gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int /*long*/ clipboard, boolean default_editable);

19916

-public static final void gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int /*long*/ clipboard, boolean default_editable) {

19917

+public static final native void _gtk_text_buffer_cut_clipboard(long /*int*/ buffer, long /*int*/ clipboard, boolean default_editable);

19918

+public static final void gtk_text_buffer_cut_clipboard(long /*int*/ buffer, long /*int*/ clipboard, boolean default_editable) {

19919

lock.lock();

19920

try {

19921

_gtk_text_buffer_cut_clipboard(buffer, clipboard, default_editable);

19922

@@ -9812,8 +9812,8 @@

19923

* @param start cast=(GtkTextIter *)

19924

* @param end cast=(GtkTextIter *)

19925

*/

19926

-public static final native void _gtk_text_buffer_delete(int /*long*/ buffer, byte[] start, byte[] end);

19927

-public static final void gtk_text_buffer_delete(int /*long*/ buffer, byte[] start, byte[] end) {

19928

+public static final native void _gtk_text_buffer_delete(long /*int*/ buffer, byte[] start, byte[] end);

19929

+public static final void gtk_text_buffer_delete(long /*int*/ buffer, byte[] start, byte[] end) {

19930

lock.lock();

19931

try {

19932

_gtk_text_buffer_delete(buffer, start, end);

19933

@@ -9826,8 +9826,8 @@

19934

* @param start cast=(GtkTextIter *)

19935

* @param end cast=(GtkTextIter *)

19936

*/

19937

-public static final native void _gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[] start, byte[] end);

19938

-public static final void gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[] start, byte[] end) {

19939

+public static final native void _gtk_text_buffer_get_bounds(long /*int*/ buffer, byte[] start, byte[] end);

19940

+public static final void gtk_text_buffer_get_bounds(long /*int*/ buffer, byte[] start, byte[] end) {

19941

lock.lock();

19942

try {

19943

_gtk_text_buffer_get_bounds(buffer, start, end);

19944

@@ -9836,8 +9836,8 @@

19945

}

19946

}

19947

/** @param buffer cast=(GtkTextBuffer *) */

19948

-public static final native int _gtk_text_buffer_get_char_count(int /*long*/ buffer);

19949

-public static final int gtk_text_buffer_get_char_count(int /*long*/ buffer) {

19950

+public static final native int _gtk_text_buffer_get_char_count(long /*int*/ buffer);

19951

+public static final int gtk_text_buffer_get_char_count(long /*int*/ buffer) {

19952

lock.lock();

19953

try {

19954

return _gtk_text_buffer_get_char_count(buffer);

19955

@@ -9849,8 +9849,8 @@

19956

* @param buffer cast=(GtkTextBuffer *)

19957

* @param iter cast=(GtkTextIter *)

19958

*/

19959

-public static final native void _gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[] iter);

19960

-public static final void gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[] iter) {

19961

+public static final native void _gtk_text_buffer_get_end_iter(long /*int*/ buffer, byte[] iter);

19962

+public static final void gtk_text_buffer_get_end_iter(long /*int*/ buffer, byte[] iter) {

19963

lock.lock();

19964

try {

19965

_gtk_text_buffer_get_end_iter(buffer, iter);

19966

@@ -9859,8 +9859,8 @@

19967

}

19968

}

19969

/** @param buffer cast=(GtkTextBuffer *) */

19970

-public static final native int /*long*/ _gtk_text_buffer_get_insert(int /*long*/ buffer);

19971

-public static final int /*long*/ gtk_text_buffer_get_insert(int /*long*/ buffer) {

19972

+public static final native long /*int*/ _gtk_text_buffer_get_insert(long /*int*/ buffer);

19973

+public static final long /*int*/ gtk_text_buffer_get_insert(long /*int*/ buffer) {

19974

lock.lock();

19975

try {

19976

return _gtk_text_buffer_get_insert(buffer);

19977

@@ -9873,8 +9873,8 @@

19978

* @param iter cast=(GtkTextIter *)

19979

* @param line_number cast=(gint)

19980

*/

19981

-public static final native void _gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, byte[] iter, int line_number);

19982

-public static final void gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, byte[] iter, int line_number) {

19983

+public static final native void _gtk_text_buffer_get_iter_at_line(long /*int*/ buffer, byte[] iter, int line_number);

19984

+public static final void gtk_text_buffer_get_iter_at_line(long /*int*/ buffer, byte[] iter, int line_number) {

19985

lock.lock();

19986

try {

19987

_gtk_text_buffer_get_iter_at_line(buffer, iter, line_number);

19988

@@ -9887,8 +9887,8 @@

19989

* @param iter cast=(GtkTextIter *)

19990

* @param mark cast=(GtkTextMark *)

19991

*/

19992

-public static final native void _gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, byte[] iter, int /*long*/ mark);

19993

-public static final void gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, byte[] iter, int /*long*/ mark) {

19994

+public static final native void _gtk_text_buffer_get_iter_at_mark(long /*int*/ buffer, byte[] iter, long /*int*/ mark);

19995

+public static final void gtk_text_buffer_get_iter_at_mark(long /*int*/ buffer, byte[] iter, long /*int*/ mark) {

19996

lock.lock();

19997

try {

19998

_gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);

19999

@@ -9901,8 +9901,8 @@

20000

* @param iter cast=(GtkTextIter *)

20001

* @param char_offset cast=(gint)

20002

*/

20003

-public static final native void _gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer, byte[] iter, int char_offset);

20004

-public static final void gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer, byte[] iter, int char_offset) {

20005

+public static final native void _gtk_text_buffer_get_iter_at_offset(long /*int*/ buffer, byte[] iter, int char_offset);

20006

+public static final void gtk_text_buffer_get_iter_at_offset(long /*int*/ buffer, byte[] iter, int char_offset) {

20007

lock.lock();

20008

try {

20009

_gtk_text_buffer_get_iter_at_offset(buffer, iter, char_offset);

20010

@@ -9911,8 +9911,8 @@

20011

}

20012

}

20013

/** @param buffer cast=(GtkTextBuffer *) */

20014

-public static final native int _gtk_text_buffer_get_line_count(int /*long*/ buffer);

20015

-public static final int gtk_text_buffer_get_line_count(int /*long*/ buffer) {

20016

+public static final native int _gtk_text_buffer_get_line_count(long /*int*/ buffer);

20017

+public static final int gtk_text_buffer_get_line_count(long /*int*/ buffer) {

20018

lock.lock();

20019

try {

20020

return _gtk_text_buffer_get_line_count(buffer);

20021

@@ -9921,8 +9921,8 @@

20022

}

20023

}

20024

/** @param buffer cast=(GtkTextBuffer *) */

20025

-public static final native int /*long*/ _gtk_text_buffer_get_selection_bound(int /*long*/ buffer);

20026

-public static final int /*long*/ gtk_text_buffer_get_selection_bound(int /*long*/ buffer) {

20027

+public static final native long /*int*/ _gtk_text_buffer_get_selection_bound(long /*int*/ buffer);

20028

+public static final long /*int*/ gtk_text_buffer_get_selection_bound(long /*int*/ buffer) {

20029

lock.lock();

20030

try {

20031

return _gtk_text_buffer_get_selection_bound(buffer);

20032

@@ -9935,8 +9935,8 @@

20033

* @param start cast=(GtkTextIter *)

20034

* @param end cast=(GtkTextIter *)

20035

*/

20036

-public static final native boolean _gtk_text_buffer_get_selection_bounds(int /*long*/ buffer, byte[] start, byte[] end);

20037

-public static final boolean gtk_text_buffer_get_selection_bounds(int /*long*/ buffer, byte[] start, byte[] end) {

20038

+public static final native boolean _gtk_text_buffer_get_selection_bounds(long /*int*/ buffer, byte[] start, byte[] end);

20039

+public static final boolean gtk_text_buffer_get_selection_bounds(long /*int*/ buffer, byte[] start, byte[] end) {

20040

lock.lock();

20041

try {

20042

return _gtk_text_buffer_get_selection_bounds(buffer, start, end);

20043

@@ -9950,8 +9950,8 @@

20044

* @param end cast=(GtkTextIter *)

20045

* @param include_hidden_chars cast=(gboolean)

20046

*/

20047

-public static final native int /*long*/ _gtk_text_buffer_get_text(int /*long*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars);

20048

-public static final int /*long*/ gtk_text_buffer_get_text(int /*long*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars) {

20049

+public static final native long /*int*/ _gtk_text_buffer_get_text(long /*int*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars);

20050

+public static final long /*int*/ gtk_text_buffer_get_text(long /*int*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars) {

20051

lock.lock();

20052

try {

20053

return _gtk_text_buffer_get_text(buffer, start, end, include_hidden_chars);

20054

@@ -9965,8 +9965,8 @@

20055

* @param text cast=(const gchar *)

20056

* @param len cast=(gint)

20057

*/

20058

-public static final native void _gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter, byte[] text, int len);

20059

-public static final void gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter, byte[] text, int len) {

20060

+public static final native void _gtk_text_buffer_insert(long /*int*/ buffer, byte[] iter, byte[] text, int len);

20061

+public static final void gtk_text_buffer_insert(long /*int*/ buffer, byte[] iter, byte[] text, int len) {

20062

lock.lock();

20063

try {

20064

_gtk_text_buffer_insert(buffer, iter, text, len);

20065

@@ -9980,8 +9980,8 @@

20066

* @param text cast=(const gchar *)

20067

* @param len cast=(gint)

20068

*/

20069

-public static final native void _gtk_text_buffer_insert(int /*long*/ buffer, int /*long*/ iter, byte[] text, int len);

20070

-public static final void gtk_text_buffer_insert(int /*long*/ buffer, int /*long*/ iter, byte[] text, int len) {

20071

+public static final native void _gtk_text_buffer_insert(long /*int*/ buffer, long /*int*/ iter, byte[] text, int len);

20072

+public static final void gtk_text_buffer_insert(long /*int*/ buffer, long /*int*/ iter, byte[] text, int len) {

20073

lock.lock();

20074

try {

20075

_gtk_text_buffer_insert(buffer, iter, text, len);

20076

@@ -9994,8 +9994,8 @@

20077

* @param mark cast=(GtkTextMark *)

20078

* @param where cast=(const GtkTextIter *)

20079

*/

20080

-public static final native void _gtk_text_buffer_move_mark(int /*long*/ buffer, int /*long*/ mark, byte[] where);

20081

-public static final void gtk_text_buffer_move_mark(int /*long*/ buffer, int /*long*/ mark, byte[] where) {

20082

+public static final native void _gtk_text_buffer_move_mark(long /*int*/ buffer, long /*int*/ mark, byte[] where);

20083

+public static final void gtk_text_buffer_move_mark(long /*int*/ buffer, long /*int*/ mark, byte[] where) {

20084

lock.lock();

20085

try {

20086

_gtk_text_buffer_move_mark(buffer, mark, where);

20087

@@ -10009,8 +10009,8 @@

20088

* @param override_location cast=(GtkTextIter *)

20089

* @param default_editable cast=(gboolean)

20090

*/

20091

-public static final native void _gtk_text_buffer_paste_clipboard(int /*long*/ buffer, int /*long*/ clipboard, byte[] override_location, boolean default_editable);

20092

-public static final void gtk_text_buffer_paste_clipboard(int /*long*/ buffer, int /*long*/ clipboard, byte[] override_location, boolean default_editable) {

20093

+public static final native void _gtk_text_buffer_paste_clipboard(long /*int*/ buffer, long /*int*/ clipboard, byte[] override_location, boolean default_editable);

20094

+public static final void gtk_text_buffer_paste_clipboard(long /*int*/ buffer, long /*int*/ clipboard, byte[] override_location, boolean default_editable) {

20095

lock.lock();

20096

try {

20097

_gtk_text_buffer_paste_clipboard(buffer, clipboard, override_location, default_editable);

20098

@@ -10022,8 +10022,8 @@

20099

* @param buffer cast=(GtkTextBuffer *)

20100

* @param where cast=(const GtkTextIter *)

20101

*/

20102

-public static final native void _gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[] where);

20103

-public static final void gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[] where) {

20104

+public static final native void _gtk_text_buffer_place_cursor(long /*int*/ buffer, byte[] where);

20105

+public static final void gtk_text_buffer_place_cursor(long /*int*/ buffer, byte[] where) {

20106

lock.lock();

20107

try {

20108

_gtk_text_buffer_place_cursor(buffer, where);

20109

@@ -10036,8 +10036,8 @@

20110

* @param text cast=(const gchar *)

20111

* @param len cast=(gint)

20112

*/

20113

-public static final native void _gtk_text_buffer_set_text(int /*long*/ buffer, byte[] text, int len);

20114

-public static final void gtk_text_buffer_set_text(int /*long*/ buffer, byte[] text, int len) {

20115

+public static final native void _gtk_text_buffer_set_text(long /*int*/ buffer, byte[] text, int len);

20116

+public static final void gtk_text_buffer_set_text(long /*int*/ buffer, byte[] text, int len) {

20117

lock.lock();

20118

try {

20119

_gtk_text_buffer_set_text(buffer, text, len);

20120

@@ -10073,8 +10073,8 @@

20121

* @param window_x cast=(gint *)

20122

* @param window_y cast=(gint *)

20123

*/

20124

-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);

20125

-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) {

20126

+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);

20127

+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) {

20128

lock.lock();

20129

try {

20130

_gtk_text_view_buffer_to_window_coords(text_view, win, buffer_x, buffer_y, window_x, window_y);

20131

@@ -10083,8 +10083,8 @@

20132

}

20133

}

20134

/** @param text_view cast=(GtkTextView *) */

20135

-public static final native int /*long*/ _gtk_text_view_get_buffer(int /*long*/ text_view);

20136

-public static final int /*long*/ gtk_text_view_get_buffer(int /*long*/ text_view) {

20137

+public static final native long /*int*/ _gtk_text_view_get_buffer(long /*int*/ text_view);

20138

+public static final long /*int*/ gtk_text_view_get_buffer(long /*int*/ text_view) {

20139

lock.lock();

20140

try {

20141

return _gtk_text_view_get_buffer(text_view);

20142

@@ -10093,8 +10093,8 @@

20143

}

20144

}

20145

/** @param text_view cast=(GtkTextView *) */

20146

-public static final native boolean _gtk_text_view_get_editable(int /*long*/ text_view);

20147

-public static final boolean gtk_text_view_get_editable(int /*long*/ text_view) {

20148

+public static final native boolean _gtk_text_view_get_editable(long /*int*/ text_view);

20149

+public static final boolean gtk_text_view_get_editable(long /*int*/ text_view) {

20150

lock.lock();

20151

try {

20152

return _gtk_text_view_get_editable(text_view);

20153

@@ -10108,8 +10108,8 @@

20154

* @param x cast=(gint)

20155

* @param y cast=(gint)

20156

*/

20157

-public static final native void _gtk_text_view_get_iter_at_location(int /*long*/ text_view, byte[] iter, int x, int y);

20158

-public static final void gtk_text_view_get_iter_at_location(int /*long*/ text_view, byte[] iter, int x, int y) {

20159

+public static final native void _gtk_text_view_get_iter_at_location(long /*int*/ text_view, byte[] iter, int x, int y);

20160

+public static final void gtk_text_view_get_iter_at_location(long /*int*/ text_view, byte[] iter, int x, int y) {

20161

lock.lock();

20162

try {

20163

_gtk_text_view_get_iter_at_location(text_view, iter, x, y);

20164

@@ -10122,8 +10122,8 @@

20165

* @param iter cast=(const GtkTextIter *)

20166

* @param location cast=(GdkRectangle *),flags=no_in

20167

*/

20168

-public static final native void _gtk_text_view_get_iter_location(int /*long*/ text_view, byte[] iter, GdkRectangle location);

20169

-public static final void gtk_text_view_get_iter_location(int /*long*/ text_view, byte[] iter, GdkRectangle location) {

20170

+public static final native void _gtk_text_view_get_iter_location(long /*int*/ text_view, byte[] iter, GdkRectangle location);

20171

+public static final void gtk_text_view_get_iter_location(long /*int*/ text_view, byte[] iter, GdkRectangle location) {

20172

lock.lock();

20173

try {

20174

_gtk_text_view_get_iter_location(text_view, iter, location);

20175

@@ -10137,8 +10137,8 @@

20176

* @param y cast=(gint)

20177

* @param line_top cast=(gint *)

20178

*/

20179

-public static final native void _gtk_text_view_get_line_at_y(int /*long*/ text_view, byte[] target_iter, int y, int[] line_top);

20180

-public static final void gtk_text_view_get_line_at_y(int /*long*/ text_view, byte[] target_iter, int y, int[] line_top) {

20181

+public static final native void _gtk_text_view_get_line_at_y(long /*int*/ text_view, byte[] target_iter, int y, int[] line_top);

20182

+public static final void gtk_text_view_get_line_at_y(long /*int*/ text_view, byte[] target_iter, int y, int[] line_top) {

20183

lock.lock();

20184

try {

20185

_gtk_text_view_get_line_at_y(text_view, target_iter, y, line_top);

20186

@@ -10150,8 +10150,8 @@

20187

* @param text_view cast=(GtkTextView *)

20188

* @param visible_rect cast=(GdkRectangle *),flags=no_in

20189

*/

20190

-public static final native void _gtk_text_view_get_visible_rect(int /*long*/ text_view, GdkRectangle visible_rect);

20191

-public static final void gtk_text_view_get_visible_rect(int /*long*/ text_view, GdkRectangle visible_rect) {

20192

+public static final native void _gtk_text_view_get_visible_rect(long /*int*/ text_view, GdkRectangle visible_rect);

20193

+public static final void gtk_text_view_get_visible_rect(long /*int*/ text_view, GdkRectangle visible_rect) {

20194

lock.lock();

20195

try {

20196

_gtk_text_view_get_visible_rect(text_view, visible_rect);

20197

@@ -10163,8 +10163,8 @@

20198

* @param text_view cast=(GtkTextView *)

20199

* @param win cast=(GtkTextWindowType)

20200

*/

20201

-public static final native int /*long*/ _gtk_text_view_get_window(int /*long*/ text_view, int win);

20202

-public static final int /*long*/ gtk_text_view_get_window(int /*long*/ text_view, int win) {

20203

+public static final native long /*int*/ _gtk_text_view_get_window(long /*int*/ text_view, int win);

20204

+public static final long /*int*/ gtk_text_view_get_window(long /*int*/ text_view, int win) {

20205

lock.lock();

20206

try {

20207

return _gtk_text_view_get_window(text_view, win);

20208

@@ -10172,8 +10172,8 @@

20209

lock.unlock();

20210

}

20211

}

20212

-public static final native int /*long*/ _gtk_text_view_new();

20213

-public static final int /*long*/ gtk_text_view_new() {

20214

+public static final native long /*int*/ _gtk_text_view_new();

20215

+public static final long /*int*/ gtk_text_view_new() {

20216

lock.lock();

20217

try {

20218

return _gtk_text_view_new();

20219

@@ -10185,8 +10185,8 @@

20220

* @param text_view cast=(GtkTextView *)

20221

* @param mark cast=(GtkTextMark *)

20222

*/

20223

-public static final native void _gtk_text_view_scroll_mark_onscreen(int /*long*/ text_view, int /*long*/ mark);

20224

-public static final void gtk_text_view_scroll_mark_onscreen(int /*long*/ text_view, int /*long*/ mark) {

20225

+public static final native void _gtk_text_view_scroll_mark_onscreen(long /*int*/ text_view, long /*int*/ mark);

20226

+public static final void gtk_text_view_scroll_mark_onscreen(long /*int*/ text_view, long /*int*/ mark) {

20227

lock.lock();

20228

try {

20229

_gtk_text_view_scroll_mark_onscreen(text_view, mark);

20230

@@ -10202,8 +10202,8 @@

20231

* @param xalign cast=(gdouble)

20232

* @param yalign cast=(gdouble)

20233

*/

20234

-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);

20235

-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) {

20236

+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);

20237

+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) {

20238

lock.lock();

20239

try {

20240

return _gtk_text_view_scroll_to_iter(text_view, iter, within_margin, use_align, xalign, yalign);

20241

@@ -10215,8 +10215,8 @@

20242

* @param text_view cast=(GtkTextView *)

20243

* @param setting cast=(gboolean)

20244

*/

20245

-public static final native void _gtk_text_view_set_editable(int /*long*/ text_view, boolean setting);

20246

-public static final void gtk_text_view_set_editable(int /*long*/ text_view, boolean setting) {

20247

+public static final native void _gtk_text_view_set_editable(long /*int*/ text_view, boolean setting);

20248

+public static final void gtk_text_view_set_editable(long /*int*/ text_view, boolean setting) {

20249

lock.lock();

20250

try {

20251

_gtk_text_view_set_editable(text_view, setting);

20252

@@ -10225,8 +10225,8 @@

20253

}

20254

}

20255

/** @param text_view cast=(GtkTextView *) */

20256

-public static final native void _gtk_text_view_set_justification(int /*long*/ text_view, int justification);

20257

-public static final void gtk_text_view_set_justification(int /*long*/ text_view, int justification) {

20258

+public static final native void _gtk_text_view_set_justification(long /*int*/ text_view, int justification);

20259

+public static final void gtk_text_view_set_justification(long /*int*/ text_view, int justification) {

20260

lock.lock();

20261

try {

20262

_gtk_text_view_set_justification(text_view, justification);

20263

@@ -10238,8 +10238,8 @@

20264

* @param text_view cast=(GtkTextView *)

20265

* @param tabs cast=(PangoTabArray *)

20266

*/

20267

-public static final native void _gtk_text_view_set_tabs(int /*long*/ text_view, int /*long*/ tabs);

20268

-public static final void gtk_text_view_set_tabs(int /*long*/ text_view, int /*long*/ tabs) {

20269

+public static final native void _gtk_text_view_set_tabs(long /*int*/ text_view, long /*int*/ tabs);

20270

+public static final void gtk_text_view_set_tabs(long /*int*/ text_view, long /*int*/ tabs) {

20271

lock.lock();

20272

try {

20273

_gtk_text_view_set_tabs(text_view, tabs);

20274

@@ -10248,8 +10248,8 @@

20275

}

20276

}

20277

/** @param text_view cast=(GtkTextView *) */

20278

-public static final native void _gtk_text_view_set_wrap_mode(int /*long*/ text_view, int wrap_mode);

20279

-public static final void gtk_text_view_set_wrap_mode(int /*long*/ text_view, int wrap_mode) {

20280

+public static final native void _gtk_text_view_set_wrap_mode(long /*int*/ text_view, int wrap_mode);

20281

+public static final void gtk_text_view_set_wrap_mode(long /*int*/ text_view, int wrap_mode) {

20282

lock.lock();

20283

try {

20284

_gtk_text_view_set_wrap_mode(text_view, wrap_mode);

20285

@@ -10265,8 +10265,8 @@

20286

* @param buffer_x cast=(gint *)

20287

* @param buffer_y cast=(gint *)

20288

*/

20289

-public static final native void _gtk_text_view_window_to_buffer_coords(int /*long*/ text_view, int win, int window_x, int window_y, int[] buffer_x, int[] buffer_y);

20290

-public static final void gtk_text_view_window_to_buffer_coords(int /*long*/ text_view, int win, int window_x, int window_y, int[] buffer_x, int[] buffer_y) {

20291

+public static final native void _gtk_text_view_window_to_buffer_coords(long /*int*/ text_view, int win, int window_x, int window_y, int[] buffer_x, int[] buffer_y);

20292

+public static final void gtk_text_view_window_to_buffer_coords(long /*int*/ text_view, int win, int window_x, int window_y, int[] buffer_x, int[] buffer_y) {

20293

lock.lock();

20294

try {

20295

_gtk_text_view_window_to_buffer_coords(text_view, win, window_x, window_y, buffer_x, buffer_y);

20296

@@ -10279,8 +10279,8 @@

20297

* @param function cast=(GtkFunction)

20298

* @param data cast=(gpointer)

20299

*/

20300

-public static final native int _gtk_timeout_add(int interval, int /*long*/ function, int /*long*/ data);

20301

-public static final int gtk_timeout_add(int interval, int /*long*/ function, int /*long*/ data) {

20302

+public static final native int _gtk_timeout_add(int interval, long /*int*/ function, long /*int*/ data);

20303

+public static final int gtk_timeout_add(int interval, long /*int*/ function, long /*int*/ data) {

20304

lock.lock();

20305

try {

20306

return _gtk_timeout_add(interval, function, data);

20307

@@ -10299,8 +10299,8 @@

20308

}

20309

}

20310

/** @param toggle_button cast=(GtkToggleButton *) */

20311

-public static final native boolean _gtk_toggle_button_get_active(int /*long*/ toggle_button);

20312

-public static final boolean gtk_toggle_button_get_active(int /*long*/ toggle_button) {

20313

+public static final native boolean _gtk_toggle_button_get_active(long /*int*/ toggle_button);

20314

+public static final boolean gtk_toggle_button_get_active(long /*int*/ toggle_button) {

20315

lock.lock();

20316

try {

20317

return _gtk_toggle_button_get_active(toggle_button);

20318

@@ -10308,8 +10308,8 @@

20319

lock.unlock();

20320

}

20321

}

20322

-public static final native int /*long*/ _gtk_toggle_button_new();

20323

-public static final int /*long*/ gtk_toggle_button_new() {

20324

+public static final native long /*int*/ _gtk_toggle_button_new();

20325

+public static final long /*int*/ gtk_toggle_button_new() {

20326

lock.lock();

20327

try {

20328

return _gtk_toggle_button_new();

20329

@@ -10318,8 +10318,8 @@

20330

}

20331

}

20332

/** @param toggle_button cast=(GtkToggleButton *) */

20333

-public static final native boolean _gtk_toggle_button_get_inconsistent(int /*long*/ toggle_button);

20334

-public static final boolean gtk_toggle_button_get_inconsistent(int /*long*/ toggle_button) {

20335

+public static final native boolean _gtk_toggle_button_get_inconsistent(long /*int*/ toggle_button);

20336

+public static final boolean gtk_toggle_button_get_inconsistent(long /*int*/ toggle_button) {

20337

lock.lock();

20338

try {

20339

return _gtk_toggle_button_get_inconsistent(toggle_button);

20340

@@ -10331,8 +10331,8 @@

20341

* @param toggle_button cast=(GtkToggleButton *)

20342

* @param is_active cast=(gboolean)

20343

*/

20344

-public static final native void _gtk_toggle_button_set_active(int /*long*/ toggle_button, boolean is_active);

20345

-public static final void gtk_toggle_button_set_active(int /*long*/ toggle_button, boolean is_active) {

20346

+public static final native void _gtk_toggle_button_set_active(long /*int*/ toggle_button, boolean is_active);

20347

+public static final void gtk_toggle_button_set_active(long /*int*/ toggle_button, boolean is_active) {

20348

lock.lock();

20349

try {

20350

_gtk_toggle_button_set_active(toggle_button, is_active);

20351

@@ -10344,8 +10344,8 @@

20352

* @param toggle_button cast=(GtkToggleButton *)

20353

* @param setting cast=(gboolean)

20354

*/

20355

-public static final native void _gtk_toggle_button_set_inconsistent(int /*long*/ toggle_button, boolean setting);

20356

-public static final void gtk_toggle_button_set_inconsistent(int /*long*/ toggle_button, boolean setting) {

20357

+public static final native void _gtk_toggle_button_set_inconsistent(long /*int*/ toggle_button, boolean setting);

20358

+public static final void gtk_toggle_button_set_inconsistent(long /*int*/ toggle_button, boolean setting) {

20359

lock.lock();

20360

try {

20361

_gtk_toggle_button_set_inconsistent(toggle_button, setting);

20362

@@ -10357,8 +10357,8 @@

20363

* @param toggle_button cast=(GtkToggleButton *)

20364

* @param draw_indicator cast=(gboolean)

20365

*/

20366

-public static final native void _gtk_toggle_button_set_mode(int /*long*/ toggle_button, boolean draw_indicator);

20367

-public static final void gtk_toggle_button_set_mode(int /*long*/ toggle_button, boolean draw_indicator) {

20368

+public static final native void _gtk_toggle_button_set_mode(long /*int*/ toggle_button, boolean draw_indicator);

20369

+public static final void gtk_toggle_button_set_mode(long /*int*/ toggle_button, boolean draw_indicator) {

20370

lock.lock();

20371

try {

20372

_gtk_toggle_button_set_mode(toggle_button, draw_indicator);

20373

@@ -10373,8 +10373,8 @@

20374

* @param tooltip_private_text cast=(const char *)

20375

* @param position cast=(gint)

20376

*/

20377

-public static final native void _gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*long*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position);

20378

-public static final void gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*long*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position) {

20379

+public static final native void _gtk_toolbar_insert_widget(long /*int*/ toolbar, long /*int*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position);

20380

+public static final void gtk_toolbar_insert_widget(long /*int*/ toolbar, long /*int*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position) {

20381

lock.lock();

20382

try {

20383

_gtk_toolbar_insert_widget(toolbar, widget, tooltip_text, tooltip_private_text, position);

20384

@@ -10382,8 +10382,8 @@

20385

lock.unlock();

20386

}

20387

}

20388

-public static final native int /*long*/ _gtk_toolbar_new();

20389

-public static final int /*long*/ gtk_toolbar_new() {

20390

+public static final native long /*int*/ _gtk_toolbar_new();

20391

+public static final long /*int*/ gtk_toolbar_new() {

20392

lock.lock();

20393

try {

20394

return _gtk_toolbar_new();

20395

@@ -10395,8 +10395,8 @@

20396

* @param toolbar cast=(GtkToolbar *)

20397

* @param orientation cast=(GtkOrientation)

20398

*/

20399

-public static final native void _gtk_toolbar_set_orientation(int /*long*/ toolbar, int orientation);

20400

-public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int orientation) {

20401

+public static final native void _gtk_toolbar_set_orientation(long /*int*/ toolbar, int orientation);

20402

+public static final void gtk_toolbar_set_orientation(long /*int*/ toolbar, int orientation) {

20403

lock.lock();

20404

try {

20405

_gtk_toolbar_set_orientation(toolbar, orientation);

20406

@@ -10405,8 +10405,8 @@

20407

}

20408

}

20409

/** @param widget cast=(GtkWidget *) */

20410

-public static final native int /*long*/ _gtk_tooltips_data_get(int /*long*/ widget);

20411

-public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) {

20412

+public static final native long /*int*/ _gtk_tooltips_data_get(long /*int*/ widget);

20413

+public static final long /*int*/ gtk_tooltips_data_get(long /*int*/ widget) {

20414

lock.lock();

20415

try {

20416

return _gtk_tooltips_data_get(widget);

20417

@@ -10415,8 +10415,8 @@

20418

}

20419

}

20420

/** @param tooltips cast=(GtkTooltips *) */

20421

-public static final native void _gtk_tooltips_disable(int /*long*/ tooltips);

20422

-public static final void gtk_tooltips_disable(int /*long*/ tooltips) {

20423

+public static final native void _gtk_tooltips_disable(long /*int*/ tooltips);

20424

+public static final void gtk_tooltips_disable(long /*int*/ tooltips) {

20425

lock.lock();

20426

try {

20427

_gtk_tooltips_disable(tooltips);

20428

@@ -10425,8 +10425,8 @@

20429

}

20430

}

20431

/** @param tooltips cast=(GtkTooltips *) */

20432

-public static final native void _gtk_tooltips_enable(int /*long*/ tooltips);

20433

-public static final void gtk_tooltips_enable(int /*long*/ tooltips) {

20434

+public static final native void _gtk_tooltips_enable(long /*int*/ tooltips);

20435

+public static final void gtk_tooltips_enable(long /*int*/ tooltips) {

20436

lock.lock();

20437

try {

20438

_gtk_tooltips_enable(tooltips);

20439

@@ -10434,8 +10434,8 @@

20440

lock.unlock();

20441

}

20442

}

20443

-public static final native int /*long*/ _gtk_tooltips_new();

20444

-public static final int /*long*/ gtk_tooltips_new() {

20445

+public static final native long /*int*/ _gtk_tooltips_new();

20446

+public static final long /*int*/ gtk_tooltips_new() {

20447

lock.lock();

20448

try {

20449

return _gtk_tooltips_new();

20450

@@ -10444,8 +10444,8 @@

20451

}

20452

}

20453

/** @param tooltips cast=(GtkTooltips *) */

20454

-public static final native void _gtk_tooltips_force_window(int /*long*/ tooltips);

20455

-public static final void gtk_tooltips_force_window(int /*long*/ tooltips) {

20456

+public static final native void _gtk_tooltips_force_window(long /*int*/ tooltips);

20457

+public static final void gtk_tooltips_force_window(long /*int*/ tooltips) {

20458

lock.lock();

20459

try {

20460

_gtk_tooltips_force_window(tooltips);

20461

@@ -10459,8 +10459,8 @@

20462

* @param tip_text cast=(const gchar *)

20463

* @param tip_private cast=(const gchar *)

20464

*/

20465

-public static final native void _gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*/ widget, byte[] tip_text, byte[] tip_private);

20466

-public static final void gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*/ widget, byte[] tip_text, byte[] tip_private) {

20467

+public static final native void _gtk_tooltips_set_tip(long /*int*/ tooltips, long /*int*/ widget, byte[] tip_text, byte[] tip_private);

20468

+public static final void gtk_tooltips_set_tip(long /*int*/ tooltips, long /*int*/ widget, byte[] tip_text, byte[] tip_private) {

20469

lock.lock();

20470

try {

20471

_gtk_tooltips_set_tip(tooltips, widget, tip_text, tip_private);

20472

@@ -10472,8 +10472,8 @@

20473

* @param tree_model cast=(GtkTreeModel *)

20474

* @param iter cast=(GtkTreeIter *)

20475

*/

20476

-public static final native void _gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, int[] value, int /*long*/ terminator);

20477

-public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, int[] value, int /*long*/ terminator) {

20478

+public static final native void _gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, int[] value, long /*int*/ terminator);

20479

+public static final void gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, int[] value, long /*int*/ terminator) {

20480

lock.lock();

20481

try {

20482

_gtk_tree_model_get(tree_model, iter, column, value, terminator);

20483

@@ -10485,8 +10485,8 @@

20484

* @param tree_model cast=(GtkTreeModel *)

20485

* @param iter cast=(GtkTreeIter *)

20486

*/

20487

-public static final native void _gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, long[] value, int /*long*/ terminator);

20488

-public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, long[] value, int /*long*/ terminator) {

20489

+public static final native void _gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, long[] value, long /*int*/ terminator);

20490

+public static final void gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, long[] value, long /*int*/ terminator) {

20491

lock.lock();

20492

try {

20493

_gtk_tree_model_get(tree_model, iter, column, value, terminator);

20494

@@ -10499,8 +10499,8 @@

20495

* @param iter cast=(GtkTreeIter *)

20496

* @param path cast=(GtkTreePath *)

20497

*/

20498

-public static final native boolean _gtk_tree_model_get_iter(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ path);

20499

-public static final boolean gtk_tree_model_get_iter(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ path) {

20500

+public static final native boolean _gtk_tree_model_get_iter(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ path);

20501

+public static final boolean gtk_tree_model_get_iter(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ path) {

20502

lock.lock();

20503

try {

20504

return _gtk_tree_model_get_iter(tree_model, iter, path);

20505

@@ -10512,8 +10512,8 @@

20506

* @param tree_model cast=(GtkTreeModel *)

20507

* @param iter cast=(GtkTreeIter *)

20508

*/

20509

-public static final native boolean _gtk_tree_model_get_iter_first(int /*long*/ tree_model, int /*long*/ iter);

20510

-public static final boolean gtk_tree_model_get_iter_first(int /*long*/ tree_model, int /*long*/ iter) {

20511

+public static final native boolean _gtk_tree_model_get_iter_first(long /*int*/ tree_model, long /*int*/ iter);

20512

+public static final boolean gtk_tree_model_get_iter_first(long /*int*/ tree_model, long /*int*/ iter) {

20513

lock.lock();

20514

try {

20515

return _gtk_tree_model_get_iter_first(tree_model, iter);

20516

@@ -10522,8 +10522,8 @@

20517

}

20518

}

20519

/** @param tree_model cast=(GtkTreeModel *) */

20520

-public static final native int _gtk_tree_model_get_n_columns(int /*long*/ tree_model);

20521

-public static final int gtk_tree_model_get_n_columns(int /*long*/ tree_model) {

20522

+public static final native int _gtk_tree_model_get_n_columns(long /*int*/ tree_model);

20523

+public static final int gtk_tree_model_get_n_columns(long /*int*/ tree_model) {

20524

lock.lock();

20525

try {

20526

return _gtk_tree_model_get_n_columns(tree_model);

20527

@@ -10535,8 +10535,8 @@

20528

* @param tree_model cast=(GtkTreeModel *)

20529

* @param iter cast=(GtkTreeIter *)

20530

*/

20531

-public static final native int /*long*/ _gtk_tree_model_get_path(int /*long*/ tree_model, int /*long*/ iter);

20532

-public static final int /*long*/ gtk_tree_model_get_path(int /*long*/ tree_model, int /*long*/ iter) {

20533

+public static final native long /*int*/ _gtk_tree_model_get_path(long /*int*/ tree_model, long /*int*/ iter);

20534

+public static final long /*int*/ gtk_tree_model_get_path(long /*int*/ tree_model, long /*int*/ iter) {

20535

lock.lock();

20536

try {

20537

return _gtk_tree_model_get_path(tree_model, iter);

20538

@@ -10544,8 +10544,8 @@

20539

lock.unlock();

20540

}

20541

}

20542

-public static final native int /*long*/ _gtk_tree_model_get_type();

20543

-public static final int /*long*/ gtk_tree_model_get_type() {

20544

+public static final native long /*int*/ _gtk_tree_model_get_type();

20545

+public static final long /*int*/ gtk_tree_model_get_type() {

20546

lock.lock();

20547

try {

20548

return _gtk_tree_model_get_type();

20549

@@ -10558,8 +10558,8 @@

20550

* @param iter cast=(GtkTreeIter *)

20551

* @param parent cast=(GtkTreeIter *)

20552

*/

20553

-public static final native boolean _gtk_tree_model_iter_children(int /*long*/ model, int /*long*/ iter, int /*long*/ parent);

20554

-public static final boolean gtk_tree_model_iter_children(int /*long*/ model, int /*long*/ iter, int /*long*/ parent) {

20555

+public static final native boolean _gtk_tree_model_iter_children(long /*int*/ model, long /*int*/ iter, long /*int*/ parent);

20556

+public static final boolean gtk_tree_model_iter_children(long /*int*/ model, long /*int*/ iter, long /*int*/ parent) {

20557

lock.lock();

20558

try {

20559

return _gtk_tree_model_iter_children(model, iter, parent);

20560

@@ -10571,8 +10571,8 @@

20561

* @param model cast=(GtkTreeModel *)

20562

* @param iter cast=(GtkTreeIter *)

20563

*/

20564

-public static final native int _gtk_tree_model_iter_n_children(int /*long*/ model, int /*long*/ iter);

20565

-public static final int gtk_tree_model_iter_n_children(int /*long*/ model, int /*long*/ iter) {

20566

+public static final native int _gtk_tree_model_iter_n_children(long /*int*/ model, long /*int*/ iter);

20567

+public static final int gtk_tree_model_iter_n_children(long /*int*/ model, long /*int*/ iter) {

20568

lock.lock();

20569

try {

20570

return _gtk_tree_model_iter_n_children(model, iter);

20571

@@ -10584,8 +10584,8 @@

20572

* @param model cast=(GtkTreeModel *)

20573

* @param iter cast=(GtkTreeIter *)

20574

*/

20575

-public static final native boolean _gtk_tree_model_iter_next(int /*long*/ model, int /*long*/ iter);

20576

-public static final boolean gtk_tree_model_iter_next(int /*long*/ model, int /*long*/ iter) {

20577

+public static final native boolean _gtk_tree_model_iter_next(long /*int*/ model, long /*int*/ iter);

20578

+public static final boolean gtk_tree_model_iter_next(long /*int*/ model, long /*int*/ iter) {

20579

lock.lock();

20580

try {

20581

return _gtk_tree_model_iter_next(model, iter);

20582

@@ -10598,8 +10598,8 @@

20583

* @param iter cast=(GtkTreeIter *)

20584

* @param parent cast=(GtkTreeIter *)

20585

*/

20586

-public static final native boolean _gtk_tree_model_iter_nth_child(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ parent, int n);

20587

-public static final boolean gtk_tree_model_iter_nth_child(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ parent, int n) {

20588

+public static final native boolean _gtk_tree_model_iter_nth_child(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ parent, int n);

20589

+public static final boolean gtk_tree_model_iter_nth_child(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ parent, int n) {

20590

lock.lock();

20591

try {

20592

return _gtk_tree_model_iter_nth_child(tree_model, iter, parent, n);

20593

@@ -10608,8 +10608,8 @@

20594

}

20595

}

20596

/** @param path cast=(GtkTreePath *) */

20597

-public static final native void _gtk_tree_path_append_index(int /*long*/ path, int index);

20598

-public static final void gtk_tree_path_append_index(int /*long*/ path, int index) {

20599

+public static final native void _gtk_tree_path_append_index(long /*int*/ path, int index);

20600

+public static final void gtk_tree_path_append_index(long /*int*/ path, int index) {

20601

lock.lock();

20602

try {

20603

_gtk_tree_path_append_index(path, index);

20604

@@ -10621,8 +10621,8 @@

20605

* @param a cast=(const GtkTreePath *)

20606

* @param b cast=(const GtkTreePath *)

20607

*/

20608

-public static final native int /*long*/ _gtk_tree_path_compare(int /*long*/ a, int /*long*/ b);

20609

-public static final int /*long*/ gtk_tree_path_compare(int /*long*/ a, int /*long*/ b) {

20610

+public static final native long /*int*/ _gtk_tree_path_compare(long /*int*/ a, long /*int*/ b);

20611

+public static final long /*int*/ gtk_tree_path_compare(long /*int*/ a, long /*int*/ b) {

20612

lock.lock();

20613

try {

20614

return _gtk_tree_path_compare(a, b);

20615

@@ -10631,8 +10631,8 @@

20616

}

20617

}

20618

/** @param path cast=(GtkTreePath *) */

20619

-public static final native void _gtk_tree_path_down(int /*long*/ path);

20620

-public static final void gtk_tree_path_down(int /*long*/ path) {

20621

+public static final native void _gtk_tree_path_down(long /*int*/ path);

20622

+public static final void gtk_tree_path_down(long /*int*/ path) {

20623

lock.lock();

20624

try {

20625

_gtk_tree_path_down(path);

20626

@@ -10641,8 +10641,8 @@

20627

}

20628

}

20629

/** @param path cast=(GtkTreePath *) */

20630

-public static final native void _gtk_tree_path_free(int /*long*/ path);

20631

-public static final void gtk_tree_path_free(int /*long*/ path) {

20632

+public static final native void _gtk_tree_path_free(long /*int*/ path);

20633

+public static final void gtk_tree_path_free(long /*int*/ path) {

20634

lock.lock();

20635

try {

20636

_gtk_tree_path_free(path);

20637

@@ -10651,8 +10651,8 @@

20638

}

20639

}

20640

/** @param path cast=(GtkTreePath *) */

20641

-public static final native int _gtk_tree_path_get_depth(int /*long*/ path);

20642

-public static final int gtk_tree_path_get_depth(int /*long*/ path) {

20643

+public static final native int _gtk_tree_path_get_depth(long /*int*/ path);

20644

+public static final int gtk_tree_path_get_depth(long /*int*/ path) {

20645

lock.lock();

20646

try {

20647

return _gtk_tree_path_get_depth(path);

20648

@@ -10661,8 +10661,8 @@

20649

}

20650

}

20651

/** @param path cast=(GtkTreePath *) */

20652

-public static final native int /*long*/ _gtk_tree_path_get_indices(int /*long*/ path);

20653

-public static final int /*long*/ gtk_tree_path_get_indices(int /*long*/ path) {

20654

+public static final native long /*int*/ _gtk_tree_path_get_indices(long /*int*/ path);

20655

+public static final long /*int*/ gtk_tree_path_get_indices(long /*int*/ path) {

20656

lock.lock();

20657

try {

20658

return _gtk_tree_path_get_indices(path);

20659

@@ -10670,8 +10670,8 @@

20660

lock.unlock();

20661

}

20662

}

20663

-public static final native int /*long*/ _gtk_tree_path_new();

20664

-public static final int /*long*/ gtk_tree_path_new() {

20665

+public static final native long /*int*/ _gtk_tree_path_new();

20666

+public static final long /*int*/ gtk_tree_path_new() {

20667

lock.lock();

20668

try {

20669

return _gtk_tree_path_new();

20670

@@ -10679,8 +10679,8 @@

20671

lock.unlock();

20672

}

20673

}

20674

-public static final native int /*long*/ _gtk_tree_path_new_first();

20675

-public static final int /*long*/ gtk_tree_path_new_first() {

20676

+public static final native long /*int*/ _gtk_tree_path_new_first();

20677

+public static final long /*int*/ gtk_tree_path_new_first() {

20678

lock.lock();

20679

try {

20680

return _gtk_tree_path_new_first();

20681

@@ -10689,8 +10689,8 @@

20682

}

20683

}

20684

/** @param path cast=(const gchar *) */

20685

-public static final native int /*long*/ _gtk_tree_path_new_from_string(byte[] path);

20686

-public static final int /*long*/ gtk_tree_path_new_from_string(byte[] path) {

20687

+public static final native long /*int*/ _gtk_tree_path_new_from_string(byte[] path);

20688

+public static final long /*int*/ gtk_tree_path_new_from_string(byte[] path) {

20689

lock.lock();

20690

try {

20691

return _gtk_tree_path_new_from_string(path);

20692

@@ -10699,8 +10699,8 @@

20693

}

20694

}

20695

/** @param path cast=(const gchar *) */

20696

-public static final native int /*long*/ _gtk_tree_path_new_from_string(int /*long*/ path);

20697

-public static final int /*long*/ gtk_tree_path_new_from_string(int /*long*/ path) {

20698

+public static final native long /*int*/ _gtk_tree_path_new_from_string(long /*int*/ path);

20699

+public static final long /*int*/ gtk_tree_path_new_from_string(long /*int*/ path) {

20700

lock.lock();

20701

try {

20702

return _gtk_tree_path_new_from_string(path);

20703

@@ -10709,8 +10709,8 @@

20704

}

20705

}

20706

/** @param path cast=(GtkTreePath *) */

20707

-public static final native void _gtk_tree_path_next(int /*long*/ path);

20708

-public static final void gtk_tree_path_next(int /*long*/ path) {

20709

+public static final native void _gtk_tree_path_next(long /*int*/ path);

20710

+public static final void gtk_tree_path_next(long /*int*/ path) {

20711

lock.lock();

20712

try {

20713

_gtk_tree_path_next(path);

20714

@@ -10719,8 +10719,8 @@

20715

}

20716

}

20717

/** @param path cast=(GtkTreePath *) */

20718

-public static final native boolean _gtk_tree_path_prev(int /*long*/ path);

20719

-public static final boolean gtk_tree_path_prev(int /*long*/ path) {

20720

+public static final native boolean _gtk_tree_path_prev(long /*int*/ path);

20721

+public static final boolean gtk_tree_path_prev(long /*int*/ path) {

20722

lock.lock();

20723

try {

20724

return _gtk_tree_path_prev(path);

20725

@@ -10729,8 +10729,8 @@

20726

}

20727

}

20728

/** @param path cast=(GtkTreePath *) */

20729

-public static final native boolean _gtk_tree_path_up(int /*long*/ path);

20730

-public static final boolean gtk_tree_path_up(int /*long*/ path) {

20731

+public static final native boolean _gtk_tree_path_up(long /*int*/ path);

20732

+public static final boolean gtk_tree_path_up(long /*int*/ path) {

20733

lock.lock();

20734

try {

20735

return _gtk_tree_path_up(path);

20736

@@ -10742,8 +10742,8 @@

20737

* @method flags=dynamic

20738

* @param selection cast=(GtkTreeSelection *)

20739

*/

20740

-public static final native int _gtk_tree_selection_count_selected_rows(int /*long*/ selection);

20741

-public static final int gtk_tree_selection_count_selected_rows(int /*long*/ selection) {

20742

+public static final native int _gtk_tree_selection_count_selected_rows(long /*int*/ selection);

20743

+public static final int gtk_tree_selection_count_selected_rows(long /*int*/ selection) {

20744

lock.lock();

20745

try {

20746

return _gtk_tree_selection_count_selected_rows(selection);

20747

@@ -10756,8 +10756,8 @@

20748

* @param model cast=(GtkTreeModel **)

20749

* @param iter cast=(GtkTreeIter *)

20750

*/

20751

-public static final native boolean _gtk_tree_selection_get_selected(int /*long*/ selection, int /*long*/[] model, int /*long*/ iter);

20752

-public static final boolean gtk_tree_selection_get_selected(int /*long*/ selection, int /*long*/[] model, int /*long*/ iter) {

20753

+public static final native boolean _gtk_tree_selection_get_selected(long /*int*/ selection, long /*int*/[] model, long /*int*/ iter);

20754

+public static final boolean gtk_tree_selection_get_selected(long /*int*/ selection, long /*int*/[] model, long /*int*/ iter) {

20755

lock.lock();

20756

try {

20757

return _gtk_tree_selection_get_selected(selection, model, iter);

20758

@@ -10770,8 +10770,8 @@

20759

* @param selection cast=(GtkTreeSelection *)

20760

* @param model cast=(GtkTreeModel **)

20761

*/

20762

-public static final native int /*long*/ _gtk_tree_selection_get_selected_rows(int /*long*/ selection, int /*long*/[] model);

20763

-public static final int /*long*/ gtk_tree_selection_get_selected_rows(int /*long*/ selection, int /*long*/[] model) {

20764

+public static final native long /*int*/ _gtk_tree_selection_get_selected_rows(long /*int*/ selection, long /*int*/[] model);

20765

+public static final long /*int*/ gtk_tree_selection_get_selected_rows(long /*int*/ selection, long /*int*/[] model) {

20766

lock.lock();

20767

try {

20768

return _gtk_tree_selection_get_selected_rows(selection, model);

20769

@@ -10783,8 +10783,8 @@

20770

* @param selection cast=(GtkTreeSelection *)

20771

* @param path cast=(GtkTreePath *)

20772

*/

20773

-public static final native boolean _gtk_tree_selection_path_is_selected(int /*long*/ selection, int /*long*/ path);

20774

-public static final boolean gtk_tree_selection_path_is_selected(int /*long*/ selection, int /*long*/ path) {

20775

+public static final native boolean _gtk_tree_selection_path_is_selected(long /*int*/ selection, long /*int*/ path);

20776

+public static final boolean gtk_tree_selection_path_is_selected(long /*int*/ selection, long /*int*/ path) {

20777

lock.lock();

20778

try {

20779

return _gtk_tree_selection_path_is_selected(selection, path);

20780

@@ -10793,8 +10793,8 @@

20781

}

20782

}

20783

/** @param selection cast=(GtkTreeSelection *) */

20784

-public static final native void _gtk_tree_selection_select_all(int /*long*/ selection);

20785

-public static final void gtk_tree_selection_select_all(int /*long*/ selection) {

20786

+public static final native void _gtk_tree_selection_select_all(long /*int*/ selection);

20787

+public static final void gtk_tree_selection_select_all(long /*int*/ selection) {

20788

lock.lock();

20789

try {

20790

_gtk_tree_selection_select_all(selection);

20791

@@ -10806,8 +10806,8 @@

20792

* @param selection cast=(GtkTreeSelection *)

20793

* @param iter cast=(GtkTreeIter *)

20794

*/

20795

-public static final native void _gtk_tree_selection_select_iter(int /*long*/ selection, int /*long*/ iter);

20796

-public static final void gtk_tree_selection_select_iter(int /*long*/ selection, int /*long*/ iter) {

20797

+public static final native void _gtk_tree_selection_select_iter(long /*int*/ selection, long /*int*/ iter);

20798

+public static final void gtk_tree_selection_select_iter(long /*int*/ selection, long /*int*/ iter) {

20799

lock.lock();

20800

try {

20801

_gtk_tree_selection_select_iter(selection, iter);

20802

@@ -10820,8 +10820,8 @@

20803

* @param func cast=(GtkTreeSelectionForeachFunc)

20804

* @param data cast=(gpointer)

20805

*/

20806

-public static final native void _gtk_tree_selection_selected_foreach(int /*long*/ selection, int /*long*/ func, int /*long*/ data);

20807

-public static final void gtk_tree_selection_selected_foreach(int /*long*/ selection, int /*long*/ func, int /*long*/ data) {

20808

+public static final native void _gtk_tree_selection_selected_foreach(long /*int*/ selection, long /*int*/ func, long /*int*/ data);

20809

+public static final void gtk_tree_selection_selected_foreach(long /*int*/ selection, long /*int*/ func, long /*int*/ data) {

20810

lock.lock();

20811

try {

20812

_gtk_tree_selection_selected_foreach(selection, func, data);

20813

@@ -10833,8 +10833,8 @@

20814

* @param selection cast=(GtkTreeSelection *)

20815

* @param mode cast=(GtkSelectionMode)

20816

*/

20817

-public static final native void _gtk_tree_selection_set_mode(int /*long*/ selection, int mode);

20818

-public static final void gtk_tree_selection_set_mode(int /*long*/ selection, int mode) {

20819

+public static final native void _gtk_tree_selection_set_mode(long /*int*/ selection, int mode);

20820

+public static final void gtk_tree_selection_set_mode(long /*int*/ selection, int mode) {

20821

lock.lock();

20822

try {

20823

_gtk_tree_selection_set_mode(selection, mode);

20824

@@ -10843,8 +10843,8 @@

20825

}

20826

}

20827

/** @param selection cast=(GtkTreeSelection *) */

20828

-public static final native void _gtk_tree_selection_unselect_all(int /*long*/ selection);

20829

-public static final void gtk_tree_selection_unselect_all(int /*long*/ selection) {

20830

+public static final native void _gtk_tree_selection_unselect_all(long /*int*/ selection);

20831

+public static final void gtk_tree_selection_unselect_all(long /*int*/ selection) {

20832

lock.lock();

20833

try {

20834

_gtk_tree_selection_unselect_all(selection);

20835

@@ -10856,8 +10856,8 @@

20836

* @param selection cast=(GtkTreeSelection *)

20837

* @param iter cast=(GtkTreeIter *)

20838

*/

20839

-public static final native void _gtk_tree_selection_unselect_iter(int /*long*/ selection, int /*long*/ iter);

20840

-public static final void gtk_tree_selection_unselect_iter(int /*long*/ selection, int /*long*/ iter) {

20841

+public static final native void _gtk_tree_selection_unselect_iter(long /*int*/ selection, long /*int*/ iter);

20842

+public static final void gtk_tree_selection_unselect_iter(long /*int*/ selection, long /*int*/ iter) {

20843

lock.lock();

20844

try {

20845

_gtk_tree_selection_unselect_iter(selection, iter);

20846

@@ -10870,8 +10870,8 @@

20847

* @param iter cast=(GtkTreeIter *)

20848

* @param parent cast=(GtkTreeIter *)

20849

*/

20850

-public static final native void _gtk_tree_store_append(int /*long*/ store, int /*long*/ iter, int /*long*/ parent);

20851

-public static final void gtk_tree_store_append(int /*long*/ store, int /*long*/ iter, int /*long*/ parent) {

20852

+public static final native void _gtk_tree_store_append(long /*int*/ store, long /*int*/ iter, long /*int*/ parent);

20853

+public static final void gtk_tree_store_append(long /*int*/ store, long /*int*/ iter, long /*int*/ parent) {

20854

lock.lock();

20855

try {

20856

_gtk_tree_store_append(store, iter, parent);

20857

@@ -10880,8 +10880,8 @@

20858

}

20859

}

20860

/** @param store cast=(GtkTreeStore *) */

20861

-public static final native void _gtk_tree_store_clear(int /*long*/ store);

20862

-public static final void gtk_tree_store_clear(int /*long*/ store) {

20863

+public static final native void _gtk_tree_store_clear(long /*int*/ store);

20864

+public static final void gtk_tree_store_clear(long /*int*/ store) {

20865

lock.lock();

20866

try {

20867

_gtk_tree_store_clear(store);

20868

@@ -10895,8 +10895,8 @@

20869

* @param parent cast=(GtkTreeIter *)

20870

* @param position cast=(gint)

20871

*/

20872

-public static final native void _gtk_tree_store_insert(int /*long*/ store, int /*long*/ iter, int /*long*/ parent, int position);

20873

-public static final void gtk_tree_store_insert(int /*long*/ store, int /*long*/ iter, int /*long*/ parent, int position) {

20874

+public static final native void _gtk_tree_store_insert(long /*int*/ store, long /*int*/ iter, long /*int*/ parent, int position);

20875

+public static final void gtk_tree_store_insert(long /*int*/ store, long /*int*/ iter, long /*int*/ parent, int position) {

20876

lock.lock();

20877

try {

20878

_gtk_tree_store_insert(store, iter, parent, position);

20879

@@ -10905,8 +10905,8 @@

20880

}

20881

}

20882

/** @param types cast=(GType *) */

20883

-public static final native int /*long*/ _gtk_tree_store_newv(int numColumns, int /*long*/[] types);

20884

-public static final int /*long*/ gtk_tree_store_newv(int numColumns, int /*long*/[] types) {

20885

+public static final native long /*int*/ _gtk_tree_store_newv(int numColumns, long /*int*/[] types);

20886

+public static final long /*int*/ gtk_tree_store_newv(int numColumns, long /*int*/[] types) {

20887

lock.lock();

20888

try {

20889

return _gtk_tree_store_newv(numColumns, types);

20890

@@ -10918,8 +10918,8 @@

20891

* @param store cast=(GtkTreeStore *)

20892

* @param iter cast=(GtkTreeIter *)

20893

*/

20894

-public static final native void _gtk_tree_store_remove(int /*long*/ store, int /*long*/ iter);

20895

-public static final void gtk_tree_store_remove(int /*long*/ store, int /*long*/ iter) {

20896

+public static final native void _gtk_tree_store_remove(long /*int*/ store, long /*int*/ iter);

20897

+public static final void gtk_tree_store_remove(long /*int*/ store, long /*int*/ iter) {

20898

lock.lock();

20899

try {

20900

_gtk_tree_store_remove(store, iter);

20901

@@ -10931,8 +10931,8 @@

20902

* @param store cast=(GtkTreeStore *)

20903

* @param iter cast=(GtkTreeIter *)

20904

*/

20905

-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int /*long*/ terminator);

20906

-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int /*long*/ terminator) {

20907

+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, long /*int*/ terminator);

20908

+public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, long /*int*/ terminator) {

20909

lock.lock();

20910

try {

20911

_gtk_tree_store_set(store, iter, column, value, terminator);

20912

@@ -10944,8 +10944,8 @@

20913

* @param store cast=(GtkTreeStore *)

20914

* @param iter cast=(GtkTreeIter *)

20915

*/

20916

-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int /*long*/ terminator);

20917

-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int /*long*/ terminator) {

20918

+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, long /*int*/ terminator);

20919

+public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, long /*int*/ terminator) {

20920

lock.lock();

20921

try {

20922

_gtk_tree_store_set(store, iter, column, value, terminator);

20923

@@ -10957,8 +10957,8 @@

20924

* @param store cast=(GtkTreeStore *)

20925

* @param iter cast=(GtkTreeIter *)

20926

*/

20927

-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int /*long*/ terminator);

20928

-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int /*long*/ terminator) {

20929

+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, long /*int*/ terminator);

20930

+public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, long /*int*/ terminator) {

20931

lock.lock();

20932

try {

20933

_gtk_tree_store_set(store, iter, column, value, terminator);

20934

@@ -10971,8 +10971,8 @@

20935

* @param iter cast=(GtkTreeIter *)

20936

* @param value flags=no_out

20937

*/

20938

-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int /*long*/ terminator);

20939

-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int /*long*/ terminator) {

20940

+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, long /*int*/ terminator);

20941

+public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, long /*int*/ terminator) {

20942

lock.lock();

20943

try {

20944

_gtk_tree_store_set(store, iter, column, value, terminator);

20945

@@ -10984,8 +10984,8 @@

20946

* @param store cast=(GtkTreeStore *)

20947

* @param iter cast=(GtkTreeIter *)

20948

*/

20949

-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int /*long*/ terminator);

20950

-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int /*long*/ terminator) {

20951

+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, long /*int*/ terminator);

20952

+public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, long /*int*/ terminator) {

20953

lock.lock();

20954

try {

20955

_gtk_tree_store_set(store, iter, column, value, terminator);

20956

@@ -10997,8 +10997,8 @@

20957

* @param view cast=(GtkTreeView *)

20958

* @param path cast=(GtkTreePath *)

20959

*/

20960

-public static final native int /*long*/ _gtk_tree_view_create_row_drag_icon(int /*long*/ view, int /*long*/ path);

20961

-public static final int /*long*/ gtk_tree_view_create_row_drag_icon(int /*long*/ view, int /*long*/ path) {

20962

+public static final native long /*int*/ _gtk_tree_view_create_row_drag_icon(long /*int*/ view, long /*int*/ path);

20963

+public static final long /*int*/ gtk_tree_view_create_row_drag_icon(long /*int*/ view, long /*int*/ path) {

20964

lock.lock();

20965

try {

20966

return _gtk_tree_view_create_row_drag_icon(view, path);

20967

@@ -11010,8 +11010,8 @@

20968

* @param view cast=(GtkTreeView *)

20969

* @param path cast=(GtkTreePath *)

20970

*/

20971

-public static final native boolean _gtk_tree_view_collapse_row(int /*long*/ view, int /*long*/ path);

20972

-public static final boolean gtk_tree_view_collapse_row(int /*long*/ view, int /*long*/ path) {

20973

+public static final native boolean _gtk_tree_view_collapse_row(long /*int*/ view, long /*int*/ path);

20974

+public static final boolean gtk_tree_view_collapse_row(long /*int*/ view, long /*int*/ path) {

20975

lock.lock();

20976

try {

20977

return _gtk_tree_view_collapse_row(view, path);

20978

@@ -11025,8 +11025,8 @@

20979

* @param attribute cast=(const gchar *)

20980

* @param column cast=(gint)

20981

*/

20982

-public static final native void _gtk_tree_view_column_add_attribute(int /*long*/ treeColumn, int /*long*/ cellRenderer, byte[] attribute, int column);

20983

-public static final void gtk_tree_view_column_add_attribute(int /*long*/ treeColumn, int /*long*/ cellRenderer, byte[] attribute, int column) {

20984

+public static final native void _gtk_tree_view_column_add_attribute(long /*int*/ treeColumn, long /*int*/ cellRenderer, byte[] attribute, int column);

20985

+public static final void gtk_tree_view_column_add_attribute(long /*int*/ treeColumn, long /*int*/ cellRenderer, byte[] attribute, int column) {

20986

lock.lock();

20987

try {

20988

_gtk_tree_view_column_add_attribute(treeColumn, cellRenderer, attribute, column);

20989

@@ -11041,8 +11041,8 @@

20990

* @param start_pos cast=(gint *)

20991

* @param width cast=(gint *)

20992

*/

20993

-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);

20994

-public static final boolean gtk_tree_view_column_cell_get_position(int /*long*/ tree_column, int /*long*/ cell_renderer, int[] start_pos, int[] width) {

20995

+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);

20996

+public static final boolean gtk_tree_view_column_cell_get_position(long /*int*/ tree_column, long /*int*/ cell_renderer, int[] start_pos, int[] width) {

20997

lock.lock();

20998

try {

20999

return _gtk_tree_view_column_cell_get_position(tree_column, cell_renderer, start_pos, width);

21000

@@ -11058,8 +11058,8 @@

21001

* @param width cast=(gint *)

21002

* @param height cast=(gint *)

21003

*/

21004

-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);

21005

-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) {

21006

+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);

21007

+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) {

21008

lock.lock();

21009

try {

21010

_gtk_tree_view_column_cell_get_size(tree_column, cell_area, x_offset, y_offset, width, height);

21011

@@ -11072,8 +11072,8 @@

21012

* @param tree_model cast=(GtkTreeModel *)

21013

* @param iter cast=(GtkTreeIter *)

21014

*/

21015

-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);

21016

-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) {

21017

+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);

21018

+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) {

21019

lock.lock();

21020

try {

21021

_gtk_tree_view_column_cell_set_cell_data(tree_column, tree_model, iter, is_expander, is_expanded);

21022

@@ -11082,8 +11082,8 @@

21023

}

21024

}

21025

/** @param tree_column cast=(GtkTreeViewColumn *) */

21026

-public static final native void _gtk_tree_view_column_clear(int /*long*/ tree_column);

21027

-public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) {

21028

+public static final native void _gtk_tree_view_column_clear(long /*int*/ tree_column);

21029

+public static final void gtk_tree_view_column_clear(long /*int*/ tree_column) {

21030

lock.lock();

21031

try {

21032

_gtk_tree_view_column_clear(tree_column);

21033

@@ -11092,8 +11092,8 @@

21034

}

21035

}

21036

/** @param tree_column cast=(GtkTreeViewColumn *) */

21037

-public static final native int /*long*/ _gtk_tree_view_column_get_cell_renderers(int /*long*/ tree_column);

21038

-public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*long*/ tree_column) {

21039

+public static final native long /*int*/ _gtk_tree_view_column_get_cell_renderers(long /*int*/ tree_column);

21040

+public static final long /*int*/ gtk_tree_view_column_get_cell_renderers(long /*int*/ tree_column) {

21041

lock.lock();

21042

try {

21043

return _gtk_tree_view_column_get_cell_renderers(tree_column);

21044

@@ -11102,8 +11102,8 @@

21045

}

21046

}

21047

/** @param column cast=(GtkTreeViewColumn *) */

21048

-public static final native int _gtk_tree_view_column_get_fixed_width(int /*long*/ column);

21049

-public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column) {

21050

+public static final native int _gtk_tree_view_column_get_fixed_width(long /*int*/ column);

21051

+public static final int gtk_tree_view_column_get_fixed_width(long /*int*/ column) {

21052

lock.lock();

21053

try {

21054

return _gtk_tree_view_column_get_fixed_width(column);

21055

@@ -11112,8 +11112,8 @@

21056

}

21057

}

21058

/** @param column cast=(GtkTreeViewColumn *) */

21059

-public static final native boolean _gtk_tree_view_column_get_reorderable(int /*long*/ column);

21060

-public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ column) {

21061

+public static final native boolean _gtk_tree_view_column_get_reorderable(long /*int*/ column);

21062

+public static final boolean gtk_tree_view_column_get_reorderable(long /*int*/ column) {

21063

lock.lock();

21064

try {

21065

return _gtk_tree_view_column_get_reorderable(column);

21066

@@ -11122,8 +11122,8 @@

21067

}

21068

}

21069

/** @param column cast=(GtkTreeViewColumn *) */

21070

-public static final native boolean _gtk_tree_view_column_get_resizable(int /*long*/ column);

21071

-public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ column) {

21072

+public static final native boolean _gtk_tree_view_column_get_resizable(long /*int*/ column);

21073

+public static final boolean gtk_tree_view_column_get_resizable(long /*int*/ column) {

21074

lock.lock();

21075

try {

21076

return _gtk_tree_view_column_get_resizable(column);

21077

@@ -11132,8 +11132,8 @@

21078

}

21079

}

21080

/** @param tree_column cast=(GtkTreeViewColumn *) */

21081

-public static final native int _gtk_tree_view_column_get_sizing(int /*long*/ tree_column);

21082

-public static final int gtk_tree_view_column_get_sizing(int /*long*/ tree_column) {

21083

+public static final native int _gtk_tree_view_column_get_sizing(long /*int*/ tree_column);

21084

+public static final int gtk_tree_view_column_get_sizing(long /*int*/ tree_column) {

21085

lock.lock();

21086

try {

21087

return _gtk_tree_view_column_get_sizing(tree_column);

21088

@@ -11142,8 +11142,8 @@

21089

}

21090

}

21091

/** @param tree_column cast=(GtkTreeViewColumn *) */

21092

-public static final native int _gtk_tree_view_column_get_spacing(int /*long*/ tree_column);

21093

-public static final int gtk_tree_view_column_get_spacing(int /*long*/ tree_column) {

21094

+public static final native int _gtk_tree_view_column_get_spacing(long /*int*/ tree_column);

21095

+public static final int gtk_tree_view_column_get_spacing(long /*int*/ tree_column) {

21096

lock.lock();

21097

try {

21098

return _gtk_tree_view_column_get_spacing(tree_column);

21099

@@ -11152,8 +11152,8 @@

21100

}

21101

}

21102

/** @param column cast=(GtkTreeViewColumn *) */

21103

-public static final native boolean _gtk_tree_view_column_get_visible(int /*long*/ column);

21104

-public static final boolean gtk_tree_view_column_get_visible(int /*long*/ column) {

21105

+public static final native boolean _gtk_tree_view_column_get_visible(long /*int*/ column);

21106

+public static final boolean gtk_tree_view_column_get_visible(long /*int*/ column) {

21107

lock.lock();

21108

try {

21109

return _gtk_tree_view_column_get_visible(column);

21110

@@ -11162,8 +11162,8 @@

21111

}

21112

}

21113

/** @param tree_column cast=(GtkTreeViewColumn *) */

21114

-public static final native boolean _gtk_tree_view_column_get_sort_indicator(int /*long*/ tree_column);

21115

-public static final boolean gtk_tree_view_column_get_sort_indicator(int /*long*/ tree_column) {

21116

+public static final native boolean _gtk_tree_view_column_get_sort_indicator(long /*int*/ tree_column);

21117

+public static final boolean gtk_tree_view_column_get_sort_indicator(long /*int*/ tree_column) {

21118

lock.lock();

21119

try {

21120

return _gtk_tree_view_column_get_sort_indicator(tree_column);

21121

@@ -11172,8 +11172,8 @@

21122

}

21123

}

21124

/** @param tree_column cast=(GtkTreeViewColumn *) */

21125

-public static final native int _gtk_tree_view_column_get_sort_order(int /*long*/ tree_column);

21126

-public static final int gtk_tree_view_column_get_sort_order(int /*long*/ tree_column) {

21127

+public static final native int _gtk_tree_view_column_get_sort_order(long /*int*/ tree_column);

21128

+public static final int gtk_tree_view_column_get_sort_order(long /*int*/ tree_column) {

21129

lock.lock();

21130

try {

21131

return _gtk_tree_view_column_get_sort_order(tree_column);

21132

@@ -11182,8 +11182,8 @@

21133

}

21134

}

21135

/** @param column cast=(GtkTreeViewColumn *) */

21136

-public static final native int _gtk_tree_view_column_get_width(int /*long*/ column);

21137

-public static final int gtk_tree_view_column_get_width(int /*long*/ column) {

21138

+public static final native int _gtk_tree_view_column_get_width(long /*int*/ column);

21139

+public static final int gtk_tree_view_column_get_width(long /*int*/ column) {

21140

lock.lock();

21141

try {

21142

return _gtk_tree_view_column_get_width(column);

21143

@@ -11191,8 +11191,8 @@

21144

lock.unlock();

21145

}

21146

}

21147

-public static final native int /*long*/ _gtk_tree_view_column_new();

21148

-public static final int /*long*/ gtk_tree_view_column_new() {

21149

+public static final native long /*int*/ _gtk_tree_view_column_new();

21150

+public static final long /*int*/ gtk_tree_view_column_new() {

21151

lock.lock();

21152

try {

21153

return _gtk_tree_view_column_new();

21154

@@ -11205,8 +11205,8 @@

21155

* @param cell_renderer cast=(GtkCellRenderer *)

21156

* @param expand cast=(gboolean)

21157

*/

21158

-public static final native void _gtk_tree_view_column_pack_start(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand);

21159

-public static final void gtk_tree_view_column_pack_start(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand) {

21160

+public static final native void _gtk_tree_view_column_pack_start(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand);

21161

+public static final void gtk_tree_view_column_pack_start(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand) {

21162

lock.lock();

21163

try {

21164

_gtk_tree_view_column_pack_start(tree_column, cell_renderer, expand);

21165

@@ -11219,8 +11219,8 @@

21166

* @param cell_renderer cast=(GtkCellRenderer *)

21167

* @param expand cast=(gboolean)

21168

*/

21169

-public static final native void _gtk_tree_view_column_pack_end(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand);

21170

-public static final void gtk_tree_view_column_pack_end(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand) {

21171

+public static final native void _gtk_tree_view_column_pack_end(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand);

21172

+public static final void gtk_tree_view_column_pack_end(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand) {

21173

lock.lock();

21174

try {

21175

_gtk_tree_view_column_pack_end(tree_column, cell_renderer, expand);

21176

@@ -11229,8 +11229,8 @@

21177

}

21178

}

21179

/** @param tree_column cast=(GtkTreeViewColumn *) */

21180

-public static final native void _gtk_tree_view_column_set_alignment(int /*long*/ tree_column, float xalign);

21181

-public static final void gtk_tree_view_column_set_alignment(int /*long*/ tree_column, float xalign) {

21182

+public static final native void _gtk_tree_view_column_set_alignment(long /*int*/ tree_column, float xalign);

21183

+public static final void gtk_tree_view_column_set_alignment(long /*int*/ tree_column, float xalign) {

21184

lock.lock();

21185

try {

21186

_gtk_tree_view_column_set_alignment(tree_column, xalign);

21187

@@ -11245,8 +11245,8 @@

21188

* @param func_data cast=(gpointer)

21189

* @param destroy cast=(GtkDestroyNotify)

21190

*/

21191

-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);

21192

-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) {

21193

+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);

21194

+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) {

21195

lock.lock();

21196

try {

21197

_gtk_tree_view_column_set_cell_data_func(tree_column, cell_renderer, func, func_data, destroy);

21198

@@ -11258,8 +11258,8 @@

21199

* @param column cast=(GtkTreeViewColumn *)

21200

* @param clickable cast=(gboolean)

21201

*/

21202

-public static final native void _gtk_tree_view_column_set_clickable(int /*long*/ column, boolean clickable);

21203

-public static final void gtk_tree_view_column_set_clickable(int /*long*/ column, boolean clickable) {

21204

+public static final native void _gtk_tree_view_column_set_clickable(long /*int*/ column, boolean clickable);

21205

+public static final void gtk_tree_view_column_set_clickable(long /*int*/ column, boolean clickable) {

21206

lock.lock();

21207

try {

21208

_gtk_tree_view_column_set_clickable(column, clickable);

21209

@@ -11271,8 +11271,8 @@

21210

* @param column cast=(GtkTreeViewColumn *)

21211

* @param fixed_width cast=(gint)

21212

*/

21213

-public static final native void _gtk_tree_view_column_set_fixed_width(int /*long*/ column, int fixed_width);

21214

-public static final void gtk_tree_view_column_set_fixed_width(int /*long*/ column, int fixed_width) {

21215

+public static final native void _gtk_tree_view_column_set_fixed_width(long /*int*/ column, int fixed_width);

21216

+public static final void gtk_tree_view_column_set_fixed_width(long /*int*/ column, int fixed_width) {

21217

lock.lock();

21218

try {

21219

_gtk_tree_view_column_set_fixed_width(column, fixed_width);

21220

@@ -11284,8 +11284,8 @@

21221

* @param tree_column cast=(GtkTreeViewColumn *)

21222

* @param min_width cast=(gint)

21223

*/

21224

-public static final native void _gtk_tree_view_column_set_min_width(int /*long*/ tree_column, int min_width);

21225

-public static final void gtk_tree_view_column_set_min_width(int /*long*/ tree_column, int min_width) {

21226

+public static final native void _gtk_tree_view_column_set_min_width(long /*int*/ tree_column, int min_width);

21227

+public static final void gtk_tree_view_column_set_min_width(long /*int*/ tree_column, int min_width) {

21228

lock.lock();

21229

try {

21230

_gtk_tree_view_column_set_min_width(tree_column, min_width);

21231

@@ -11297,8 +11297,8 @@

21232

* @param column cast=(GtkTreeViewColumn *)

21233

* @param reorderable cast=(gboolean)

21234

*/

21235

-public static final native void _gtk_tree_view_column_set_reorderable(int /*long*/ column, boolean reorderable);

21236

-public static final void gtk_tree_view_column_set_reorderable(int /*long*/ column, boolean reorderable) {

21237

+public static final native void _gtk_tree_view_column_set_reorderable(long /*int*/ column, boolean reorderable);

21238

+public static final void gtk_tree_view_column_set_reorderable(long /*int*/ column, boolean reorderable) {

21239

lock.lock();

21240

try {

21241

_gtk_tree_view_column_set_reorderable(column, reorderable);

21242

@@ -11310,8 +11310,8 @@

21243

* @param column cast=(GtkTreeViewColumn *)

21244

* @param resizable cast=(gboolean)

21245

*/

21246

-public static final native void _gtk_tree_view_column_set_resizable(int /*long*/ column, boolean resizable);

21247

-public static final void gtk_tree_view_column_set_resizable(int /*long*/ column, boolean resizable) {

21248

+public static final native void _gtk_tree_view_column_set_resizable(long /*int*/ column, boolean resizable);

21249

+public static final void gtk_tree_view_column_set_resizable(long /*int*/ column, boolean resizable) {

21250

lock.lock();

21251

try {

21252

_gtk_tree_view_column_set_resizable(column, resizable);

21253

@@ -11323,8 +11323,8 @@

21254

* @param column cast=(GtkTreeViewColumn *)

21255

* @param type cast=(GtkTreeViewColumnSizing)

21256

*/

21257

-public static final native void _gtk_tree_view_column_set_sizing(int /*long*/ column, int type);

21258

-public static final void gtk_tree_view_column_set_sizing(int /*long*/ column, int type) {

21259

+public static final native void _gtk_tree_view_column_set_sizing(long /*int*/ column, int type);

21260

+public static final void gtk_tree_view_column_set_sizing(long /*int*/ column, int type) {

21261

lock.lock();

21262

try {

21263

_gtk_tree_view_column_set_sizing(column, type);

21264

@@ -11336,8 +11336,8 @@

21265

* @param tree_column cast=(GtkTreeViewColumn *)

21266

* @param setting cast=(gboolean)

21267

*/

21268

-public static final native void _gtk_tree_view_column_set_sort_indicator(int /*long*/ tree_column, boolean setting);

21269

-public static final void gtk_tree_view_column_set_sort_indicator(int /*long*/ tree_column, boolean setting) {

21270

+public static final native void _gtk_tree_view_column_set_sort_indicator(long /*int*/ tree_column, boolean setting);

21271

+public static final void gtk_tree_view_column_set_sort_indicator(long /*int*/ tree_column, boolean setting) {

21272

lock.lock();

21273

try {

21274

_gtk_tree_view_column_set_sort_indicator(tree_column, setting);

21275

@@ -11349,8 +11349,8 @@

21276

* @param tree_column cast=(GtkTreeViewColumn *)

21277

* @param order cast=(GtkSortType)

21278

*/

21279

-public static final native void _gtk_tree_view_column_set_sort_order(int /*long*/ tree_column, int order);

21280

-public static final void gtk_tree_view_column_set_sort_order(int /*long*/ tree_column, int order) {

21281

+public static final native void _gtk_tree_view_column_set_sort_order(long /*int*/ tree_column, int order);

21282

+public static final void gtk_tree_view_column_set_sort_order(long /*int*/ tree_column, int order) {

21283

lock.lock();

21284

try {

21285

_gtk_tree_view_column_set_sort_order(tree_column, order);

21286

@@ -11362,8 +11362,8 @@

21287

* @param tree_column cast=(GtkTreeViewColumn *)

21288

* @param title cast=(const gchar *)

21289

*/

21290

-public static final native void _gtk_tree_view_column_set_title(int /*long*/ tree_column, byte[] title);

21291

-public static final void gtk_tree_view_column_set_title(int /*long*/ tree_column, byte[] title) {

21292

+public static final native void _gtk_tree_view_column_set_title(long /*int*/ tree_column, byte[] title);

21293

+public static final void gtk_tree_view_column_set_title(long /*int*/ tree_column, byte[] title) {

21294

lock.lock();

21295

try {

21296

_gtk_tree_view_column_set_title(tree_column, title);

21297

@@ -11372,8 +11372,8 @@

21298

}

21299

}

21300

/** @param tree_column cast=(GtkTreeViewColumn *) */

21301

-public static final native void _gtk_tree_view_column_set_visible (int /*long*/ tree_column, boolean visible);

21302

-public static final void gtk_tree_view_column_set_visible (int /*long*/ tree_column, boolean visible) {

21303

+public static final native void _gtk_tree_view_column_set_visible (long /*int*/ tree_column, boolean visible);

21304

+public static final void gtk_tree_view_column_set_visible (long /*int*/ tree_column, boolean visible) {

21305

lock.lock();

21306

try {

21307

_gtk_tree_view_column_set_visible(tree_column, visible);

21308

@@ -11385,8 +11385,8 @@

21309

* @param tree_column cast=(GtkTreeViewColumn *)

21310

* @param widget cast=(GtkWidget *)

21311

*/

21312

-public static final native void _gtk_tree_view_column_set_widget(int /*long*/ tree_column, int /*long*/ widget);

21313

-public static final void gtk_tree_view_column_set_widget(int /*long*/ tree_column, int /*long*/ widget) {

21314

+public static final native void _gtk_tree_view_column_set_widget(long /*int*/ tree_column, long /*int*/ widget);

21315

+public static final void gtk_tree_view_column_set_widget(long /*int*/ tree_column, long /*int*/ widget) {

21316

lock.lock();

21317

try {

21318

_gtk_tree_view_column_set_widget(tree_column, widget);

21319

@@ -11398,8 +11398,8 @@

21320

* @param view cast=(GtkTreeView *)

21321

* @param path cast=(GtkTreePath *)

21322

*/

21323

-public static final native void _gtk_tree_view_set_drag_dest_row(int /*long*/ view, int /*long*/ path, int pos);

21324

-public static final void gtk_tree_view_set_drag_dest_row(int /*long*/ view, int /*long*/ path, int pos) {

21325

+public static final native void _gtk_tree_view_set_drag_dest_row(long /*int*/ view, long /*int*/ path, int pos);

21326

+public static final void gtk_tree_view_set_drag_dest_row(long /*int*/ view, long /*int*/ path, int pos) {

21327

lock.lock();

21328

try {

21329

_gtk_tree_view_set_drag_dest_row(view, path, pos);

21330

@@ -11408,8 +11408,8 @@

21331

}

21332

}

21333

/** @param view cast=(GtkTreeView *) */

21334

-public static final native void _gtk_tree_view_set_enable_search (int /*long*/ view, boolean enable_search);

21335

-public static final void gtk_tree_view_set_enable_search (int /*long*/ view, boolean enable_search) {

21336

+public static final native void _gtk_tree_view_set_enable_search (long /*int*/ view, boolean enable_search);

21337

+public static final void gtk_tree_view_set_enable_search (long /*int*/ view, boolean enable_search) {

21338

lock.lock();

21339

try {

21340

_gtk_tree_view_set_enable_search(view, enable_search);

21341

@@ -11422,8 +11422,8 @@

21342

* @param path cast=(GtkTreePath *)

21343

* @param open_all cast=(gboolean)

21344

*/

21345

-public static final native boolean _gtk_tree_view_expand_row(int /*long*/ view, int /*long*/ path, boolean open_all);

21346

-public static final boolean gtk_tree_view_expand_row(int /*long*/ view, int /*long*/ path, boolean open_all) {

21347

+public static final native boolean _gtk_tree_view_expand_row(long /*int*/ view, long /*int*/ path, boolean open_all);

21348

+public static final boolean gtk_tree_view_expand_row(long /*int*/ view, long /*int*/ path, boolean open_all) {

21349

lock.lock();

21350

try {

21351

return _gtk_tree_view_expand_row(view, path, open_all);

21352

@@ -11437,8 +11437,8 @@

21353

* @param column cast=(GtkTreeViewColumn *)

21354

* @param rect cast=(GdkRectangle *)

21355

*/

21356

-public static final native void _gtk_tree_view_get_background_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect);

21357

-public static final void gtk_tree_view_get_background_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect) {

21358

+public static final native void _gtk_tree_view_get_background_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect);

21359

+public static final void gtk_tree_view_get_background_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect) {

21360

lock.lock();

21361

try {

21362

_gtk_tree_view_get_background_area(tree_view, path, column, rect);

21363

@@ -11447,8 +11447,8 @@

21364

}

21365

}

21366

/** @param tree_view cast=(GtkTreeView *) */

21367

-public static final native int /*long*/ _gtk_tree_view_get_bin_window(int /*long*/ tree_view);

21368

-public static final int /*long*/ gtk_tree_view_get_bin_window(int /*long*/ tree_view) {

21369

+public static final native long /*int*/ _gtk_tree_view_get_bin_window(long /*int*/ tree_view);

21370

+public static final long /*int*/ gtk_tree_view_get_bin_window(long /*int*/ tree_view) {

21371

lock.lock();

21372

try {

21373

return _gtk_tree_view_get_bin_window(tree_view);

21374

@@ -11462,8 +11462,8 @@

21375

* @param column cast=(GtkTreeViewColumn *)

21376

* @param rect cast=(GdkRectangle *),flags=no_in

21377

*/

21378

-public static final native void _gtk_tree_view_get_cell_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect);

21379

-public static final void gtk_tree_view_get_cell_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect) {

21380

+public static final native void _gtk_tree_view_get_cell_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect);

21381

+public static final void gtk_tree_view_get_cell_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect) {

21382

lock.lock();

21383

try {

21384

_gtk_tree_view_get_cell_area(tree_view, path, column, rect);

21385

@@ -11472,8 +11472,8 @@

21386

}

21387

}

21388

/** @param tree_view cast=(GtkTreeView *) */

21389

-public static final native int /*long*/_gtk_tree_view_get_expander_column(int /*long*/ tree_view);

21390

-public static final int /*long*/gtk_tree_view_get_expander_column(int /*long*/ tree_view) {

21391

+public static final native long /*int*/_gtk_tree_view_get_expander_column(long /*int*/ tree_view);

21392

+public static final long /*int*/gtk_tree_view_get_expander_column(long /*int*/ tree_view) {

21393

lock.lock();

21394

try {

21395

return _gtk_tree_view_get_expander_column(tree_view);

21396

@@ -11485,8 +11485,8 @@

21397

* @param tree_view cast=(GtkTreeView *)

21398

* @param n cast=(gint)

21399

*/

21400

-public static final native int /*long*/ _gtk_tree_view_get_column(int /*long*/ tree_view, int n);

21401

-public static final int /*long*/ gtk_tree_view_get_column(int /*long*/ tree_view, int n) {

21402

+public static final native long /*int*/ _gtk_tree_view_get_column(long /*int*/ tree_view, int n);

21403

+public static final long /*int*/ gtk_tree_view_get_column(long /*int*/ tree_view, int n) {

21404

lock.lock();

21405

try {

21406

return _gtk_tree_view_get_column(tree_view, n);

21407

@@ -11495,8 +11495,8 @@

21408

}

21409

}

21410

/** @param tree_view cast=(GtkTreeView *) */

21411

-public static final native int /*long*/ _gtk_tree_view_get_columns(int /*long*/ tree_view);

21412

-public static final int /*long*/ gtk_tree_view_get_columns(int /*long*/ tree_view) {

21413

+public static final native long /*int*/ _gtk_tree_view_get_columns(long /*int*/ tree_view);

21414

+public static final long /*int*/ gtk_tree_view_get_columns(long /*int*/ tree_view) {

21415

lock.lock();

21416

try {

21417

return _gtk_tree_view_get_columns(tree_view);

21418

@@ -11509,8 +11509,8 @@

21419

* @param path cast=(GtkTreePath **)

21420

* @param focus_column cast=(GtkTreeViewColumn **)

21421

*/

21422

-public static final native void _gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*long*/[] path, int /*long*/[] focus_column);

21423

-public static final void gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*long*/[] path, int /*long*/[] focus_column) {

21424

+public static final native void _gtk_tree_view_get_cursor(long /*int*/ tree_view, long /*int*/[] path, long /*int*/[] focus_column);

21425

+public static final void gtk_tree_view_get_cursor(long /*int*/ tree_view, long /*int*/[] path, long /*int*/[] focus_column) {

21426

lock.lock();

21427

try {

21428

_gtk_tree_view_get_cursor(tree_view, path, focus_column);

21429

@@ -11519,8 +11519,8 @@

21430

}

21431

}

21432

/** @param tree_view cast=(GtkTreeView *) */

21433

-public static final native boolean _gtk_tree_view_get_headers_visible(int /*long*/ tree_view);

21434

-public static final boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_view) {

21435

+public static final native boolean _gtk_tree_view_get_headers_visible(long /*int*/ tree_view);

21436

+public static final boolean gtk_tree_view_get_headers_visible(long /*int*/ tree_view) {

21437

lock.lock();

21438

try {

21439

return _gtk_tree_view_get_headers_visible(tree_view);

21440

@@ -11537,8 +11537,8 @@

21441

* @param cell_x cast=(gint *)

21442

* @param cell_y cast=(gint *)

21443

*/

21444

-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);

21445

-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) {

21446

+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);

21447

+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) {

21448

lock.lock();

21449

try {

21450

return _gtk_tree_view_get_path_at_pos(tree_view, x, y, path, column, cell_x, cell_y);

21451

@@ -11547,8 +11547,8 @@

21452

}

21453

}

21454

/** @param tree_view cast=(GtkTreeView *) */

21455

-public static final native boolean _gtk_tree_view_get_rules_hint(int /*long*/ tree_view);

21456

-public static final boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view) {

21457

+public static final native boolean _gtk_tree_view_get_rules_hint(long /*int*/ tree_view);

21458

+public static final boolean gtk_tree_view_get_rules_hint(long /*int*/ tree_view) {

21459

lock.lock();

21460

try {

21461

return _gtk_tree_view_get_rules_hint(tree_view);

21462

@@ -11557,8 +11557,8 @@

21463

}

21464

}

21465

/** @param tree_view cast=(GtkTreeView *) */

21466

-public static final native int /*long*/ _gtk_tree_view_get_selection(int /*long*/ tree_view);

21467

-public static final int /*long*/ gtk_tree_view_get_selection(int /*long*/ tree_view) {

21468

+public static final native long /*int*/ _gtk_tree_view_get_selection(long /*int*/ tree_view);

21469

+public static final long /*int*/ gtk_tree_view_get_selection(long /*int*/ tree_view) {

21470

lock.lock();

21471

try {

21472

return _gtk_tree_view_get_selection(tree_view);

21473

@@ -11570,8 +11570,8 @@

21474

* @param tree_view cast=(GtkTreeView *)

21475

* @param visible_rect flags=no_in

21476

*/

21477

-public static final native void _gtk_tree_view_get_visible_rect(int /*long*/ tree_view, GdkRectangle visible_rect);

21478

-public static final void gtk_tree_view_get_visible_rect(int /*long*/ tree_view, GdkRectangle visible_rect) {

21479

+public static final native void _gtk_tree_view_get_visible_rect(long /*int*/ tree_view, GdkRectangle visible_rect);

21480

+public static final void gtk_tree_view_get_visible_rect(long /*int*/ tree_view, GdkRectangle visible_rect) {

21481

lock.lock();

21482

try {

21483

_gtk_tree_view_get_visible_rect(tree_view, visible_rect);

21484

@@ -11584,8 +11584,8 @@

21485

* @param column cast=(GtkTreeViewColumn *)

21486

* @param position cast=(gint)

21487

*/

21488

-public static final native int _gtk_tree_view_insert_column(int /*long*/ tree_view, int /*long*/ column, int position);

21489

-public static final int gtk_tree_view_insert_column(int /*long*/ tree_view, int /*long*/ column, int position) {

21490

+public static final native int _gtk_tree_view_insert_column(long /*int*/ tree_view, long /*int*/ column, int position);

21491

+public static final int gtk_tree_view_insert_column(long /*int*/ tree_view, long /*int*/ column, int position) {

21492

lock.lock();

21493

try {

21494

return _gtk_tree_view_insert_column(tree_view, column, position);

21495

@@ -11598,8 +11598,8 @@

21496

* @param column cast=(GtkTreeViewColumn *)

21497

* @param base_column cast=(GtkTreeViewColumn *)

21498

*/

21499

-public static final native void _gtk_tree_view_move_column_after(int /*long*/ tree_view, int /*long*/ column, int /*long*/ base_column);

21500

-public static final void gtk_tree_view_move_column_after(int /*long*/ tree_view, int /*long*/ column, int /*long*/base_column) {

21501

+public static final native void _gtk_tree_view_move_column_after(long /*int*/ tree_view, long /*int*/ column, long /*int*/ base_column);

21502

+public static final void gtk_tree_view_move_column_after(long /*int*/ tree_view, long /*int*/ column, long /*int*/base_column) {

21503

lock.lock();

21504

try {

21505

_gtk_tree_view_move_column_after(tree_view, column, base_column);

21506

@@ -11608,8 +11608,8 @@

21507

}

21508

}

21509

/** @param model cast=(GtkTreeModel *) */

21510

-public static final native int /*long*/ _gtk_tree_view_new_with_model(int /*long*/ model);

21511

-public static final int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model) {

21512

+public static final native long /*int*/ _gtk_tree_view_new_with_model(long /*int*/ model);

21513

+public static final long /*int*/ gtk_tree_view_new_with_model(long /*int*/ model) {

21514

lock.lock();

21515

try {

21516

return _gtk_tree_view_new_with_model(model);

21517

@@ -11621,8 +11621,8 @@

21518

* @param tree_view cast=(GtkTreeView *)

21519

* @param column cast=(GtkTreeViewColumn *)

21520

*/

21521

-public static final native void _gtk_tree_view_remove_column(int /*long*/ tree_view, int /*long*/ column);

21522

-public static final void gtk_tree_view_remove_column(int /*long*/ tree_view, int /*long*/ column) {

21523

+public static final native void _gtk_tree_view_remove_column(long /*int*/ tree_view, long /*int*/ column);

21524

+public static final void gtk_tree_view_remove_column(long /*int*/ tree_view, long /*int*/ column) {

21525

lock.lock();

21526

try {

21527

_gtk_tree_view_remove_column(tree_view, column);

21528

@@ -11634,8 +11634,8 @@

21529

* @param view cast=(GtkTreeView *)

21530

* @param path cast=(GtkTreePath *)

21531

*/

21532

-public static final native boolean _gtk_tree_view_row_expanded(int /*long*/ view, int /*long*/ path);

21533

-public static final boolean gtk_tree_view_row_expanded(int /*long*/ view, int /*long*/ path) {

21534

+public static final native boolean _gtk_tree_view_row_expanded(long /*int*/ view, long /*int*/ path);

21535

+public static final boolean gtk_tree_view_row_expanded(long /*int*/ view, long /*int*/ path) {

21536

lock.lock();

21537

try {

21538

return _gtk_tree_view_row_expanded(view, path);

21539

@@ -11651,8 +11651,8 @@

21540

* @param row_aligh cast=(gfloat)

21541

* @param column_align cast=(gfloat)

21542

*/

21543

-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);

21544

-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) {

21545

+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);

21546

+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) {

21547

lock.lock();

21548

try {

21549

_gtk_tree_view_scroll_to_cell(tree_view, path, column, use_align, row_aligh, column_align);

21550

@@ -11665,8 +11665,8 @@

21551

* @param tree_x cast=(gint)

21552

* @param tree_y cast=(gint)

21553

*/

21554

-public static final native void _gtk_tree_view_scroll_to_point (int /*long*/ tree_view, int tree_x, int tree_y);

21555

-public static final void gtk_tree_view_scroll_to_point (int /*long*/ tree_view, int tree_x, int tree_y) {

21556

+public static final native void _gtk_tree_view_scroll_to_point (long /*int*/ tree_view, int tree_x, int tree_y);

21557

+public static final void gtk_tree_view_scroll_to_point (long /*int*/ tree_view, int tree_x, int tree_y) {

21558

lock.lock();

21559

try {

21560

_gtk_tree_view_scroll_to_point(tree_view, tree_x, tree_y);

21561

@@ -11679,8 +11679,8 @@

21562

* @param path cast=(GtkTreePath *)

21563

* @param focus_column cast=(GtkTreeViewColumn *)

21564

*/

21565

-public static final native void _gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*long*/ path, int /*long*/ focus_column, boolean start_editing);

21566

-public static final void gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*long*/ path, int /*long*/ focus_column, boolean start_editing) {

21567

+public static final native void _gtk_tree_view_set_cursor(long /*int*/ tree_view, long /*int*/ path, long /*int*/ focus_column, boolean start_editing);

21568

+public static final void gtk_tree_view_set_cursor(long /*int*/ tree_view, long /*int*/ path, long /*int*/ focus_column, boolean start_editing) {

21569

lock.lock();

21570

try {

21571

_gtk_tree_view_set_cursor(tree_view, path, focus_column, start_editing);

21572

@@ -11692,8 +11692,8 @@

21573

* @method flags=dynamic

21574

* @param tree_view cast=(GtkTreeView*)

21575

*/

21576

-public static final native void _gtk_tree_view_set_grid_lines(int /*long*/ tree_view, int grid_lines);

21577

-public static final void gtk_tree_view_set_grid_lines(int /*long*/ tree_view, int grid_lines) {

21578

+public static final native void _gtk_tree_view_set_grid_lines(long /*int*/ tree_view, int grid_lines);

21579

+public static final void gtk_tree_view_set_grid_lines(long /*int*/ tree_view, int grid_lines) {

21580

lock.lock();

21581

try {

21582

_gtk_tree_view_set_grid_lines(tree_view, grid_lines);

21583

@@ -11705,8 +11705,8 @@

21584

* @param tree_view cast=(GtkTreeView *)

21585

* @param visible cast=(gboolean)

21586

*/

21587

-public static final native void _gtk_tree_view_set_headers_visible(int /*long*/ tree_view, boolean visible);

21588

-public static final void gtk_tree_view_set_headers_visible(int /*long*/ tree_view, boolean visible) {

21589

+public static final native void _gtk_tree_view_set_headers_visible(long /*int*/ tree_view, boolean visible);

21590

+public static final void gtk_tree_view_set_headers_visible(long /*int*/ tree_view, boolean visible) {

21591

lock.lock();

21592

try {

21593

_gtk_tree_view_set_headers_visible(tree_view, visible);

21594

@@ -11718,8 +11718,8 @@

21595

* @param tree_view cast=(GtkTreeView *)

21596

* @param model cast=(GtkTreeModel *)

21597

*/

21598

-public static final native void _gtk_tree_view_set_model(int /*long*/ tree_view, int /*long*/ model);

21599

-public static final void gtk_tree_view_set_model(int /*long*/ tree_view, int /*long*/ model) {

21600

+public static final native void _gtk_tree_view_set_model(long /*int*/ tree_view, long /*int*/ model);

21601

+public static final void gtk_tree_view_set_model(long /*int*/ tree_view, long /*int*/ model) {

21602

lock.lock();

21603

try {

21604

_gtk_tree_view_set_model(tree_view, model);

21605

@@ -11728,8 +11728,8 @@

21606

}

21607

}

21608

/** @param tree_view cast=(GtkTreeView *) */

21609

-public static final native void _gtk_tree_view_set_rules_hint(int /*long*/ tree_view, boolean setting);

21610

-public static final void gtk_tree_view_set_rules_hint(int /*long*/ tree_view, boolean setting) {

21611

+public static final native void _gtk_tree_view_set_rules_hint(long /*int*/ tree_view, boolean setting);

21612

+public static final void gtk_tree_view_set_rules_hint(long /*int*/ tree_view, boolean setting) {

21613

lock.lock();

21614

try {

21615

_gtk_tree_view_set_rules_hint(tree_view, setting);

21616

@@ -11741,8 +11741,8 @@

21617

* @param tree_view cast=(GtkTreeView *)

21618

* @param column cast=(gint)

21619

*/

21620

-public static final native void _gtk_tree_view_set_search_column(int /*long*/ tree_view, int column);

21621

-public static final void gtk_tree_view_set_search_column(int /*long*/ tree_view, int column) {

21622

+public static final native void _gtk_tree_view_set_search_column(long /*int*/ tree_view, int column);

21623

+public static final void gtk_tree_view_set_search_column(long /*int*/ tree_view, int column) {

21624

lock.lock();

21625

try {

21626

_gtk_tree_view_set_search_column(tree_view, column);

21627

@@ -11757,8 +11757,8 @@

21628

* @param wx cast=(gint *)

21629

* @param wy cast=(gint *)

21630

*/

21631

-public static final native void _gtk_tree_view_tree_to_widget_coords(int /*long*/ tree_view, int tx, int ty, int[] wx, int[] wy);

21632

-public static final void gtk_tree_view_tree_to_widget_coords(int /*long*/ tree_view, int tx, int ty, int[] wx, int[] wy) {

21633

+public static final native void _gtk_tree_view_tree_to_widget_coords(long /*int*/ tree_view, int tx, int ty, int[] wx, int[] wy);

21634

+public static final void gtk_tree_view_tree_to_widget_coords(long /*int*/ tree_view, int tx, int ty, int[] wx, int[] wy) {

21635

lock.lock();

21636

try {

21637

_gtk_tree_view_tree_to_widget_coords(tree_view, tx, ty, wx, wy);

21638

@@ -11767,8 +11767,8 @@

21639

}

21640

}

21641

/** @param tree_view cast=(GtkTreeView *) */

21642

-public static final native void _gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_view);

21643

-public static final void gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_view) {

21644

+public static final native void _gtk_tree_view_unset_rows_drag_dest(long /*int*/ tree_view);

21645

+public static final void gtk_tree_view_unset_rows_drag_dest(long /*int*/ tree_view) {

21646

lock.lock();

21647

try {

21648

_gtk_tree_view_unset_rows_drag_dest(tree_view);

21649

@@ -11777,8 +11777,8 @@

21650

}

21651

}

21652

/** @param tree_view cast=(GtkTreeView *) */

21653

-public static final native void _gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty);

21654

-public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty) {

21655

+public static final native void _gtk_tree_view_widget_to_tree_coords(long /*int*/ tree_view, int wx, int wy, int[] tx, int[] ty);

21656

+public static final void gtk_tree_view_widget_to_tree_coords(long /*int*/ tree_view, int wx, int wy, int[] tx, int[] ty) {

21657

lock.lock();

21658

try {

21659

_gtk_tree_view_widget_to_tree_coords(tree_view, wx, wy, tx, ty);

21660

@@ -11790,8 +11790,8 @@

21661

* @param homogeneous cast=(gboolean)

21662

* @param spacing cast=(gint)

21663

*/

21664

-public static final native int /*long*/ _gtk_vbox_new(boolean homogeneous, int spacing);

21665

-public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing) {

21666

+public static final native long /*int*/ _gtk_vbox_new(boolean homogeneous, int spacing);

21667

+public static final long /*int*/ gtk_vbox_new(boolean homogeneous, int spacing) {

21668

lock.lock();

21669

try {

21670

return _gtk_vbox_new(homogeneous, spacing);

21671

@@ -11800,8 +11800,8 @@

21672

}

21673

}

21674

/** @param viewport cast=(GtkViewport *) */

21675

-public static final native int _gtk_viewport_get_shadow_type(int /*long*/ viewport);

21676

-public static final int gtk_viewport_get_shadow_type(int /*long*/ viewport) {

21677

+public static final native int _gtk_viewport_get_shadow_type(long /*int*/ viewport);

21678

+public static final int gtk_viewport_get_shadow_type(long /*int*/ viewport) {

21679

lock.lock();

21680

try {

21681

return _gtk_viewport_get_shadow_type(viewport);

21682

@@ -11813,8 +11813,8 @@

21683

* @param viewport cast=(GtkViewport *)

21684

* @param type cast=(GtkShadowType)

21685

*/

21686

-public static final native void _gtk_viewport_set_shadow_type(int /*long*/ viewport, int type);

21687

-public static final void gtk_viewport_set_shadow_type(int /*long*/ viewport, int type) {

21688

+public static final native void _gtk_viewport_set_shadow_type(long /*int*/ viewport, int type);

21689

+public static final void gtk_viewport_set_shadow_type(long /*int*/ viewport, int type) {

21690

lock.lock();

21691

try {

21692

_gtk_viewport_set_shadow_type(viewport, type);

21693

@@ -11823,8 +11823,8 @@

21694

}

21695

}

21696

/** @param adjustment cast=(GtkAdjustment *) */

21697

-public static final native int /*long*/ _gtk_vscale_new(int /*long*/ adjustment);

21698

-public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) {

21699

+public static final native long /*int*/ _gtk_vscale_new(long /*int*/ adjustment);

21700

+public static final long /*int*/ gtk_vscale_new(long /*int*/ adjustment) {

21701

lock.lock();

21702

try {

21703

return _gtk_vscale_new(adjustment);

21704

@@ -11833,8 +11833,8 @@

21705

}

21706

}

21707

/** @param adjustment cast=(GtkAdjustment *) */

21708

-public static final native int /*long*/ _gtk_vscrollbar_new(int /*long*/ adjustment);

21709

-public static final int /*long*/ gtk_vscrollbar_new(int /*long*/ adjustment) {

21710

+public static final native long /*int*/ _gtk_vscrollbar_new(long /*int*/ adjustment);

21711

+public static final long /*int*/ gtk_vscrollbar_new(long /*int*/ adjustment) {

21712

lock.lock();

21713

try {

21714

return _gtk_vscrollbar_new(adjustment);

21715

@@ -11842,8 +11842,8 @@

21716

lock.unlock();

21717

}

21718

}

21719

-public static final native int /*long*/ _gtk_vseparator_new();

21720

-public static final int /*long*/ gtk_vseparator_new() {

21721

+public static final native long /*int*/ _gtk_vseparator_new();

21722

+public static final long /*int*/ gtk_vseparator_new() {

21723

lock.lock();

21724

try {

21725

return _gtk_vseparator_new();

21726

@@ -11858,8 +11858,8 @@

21727

* @param accel_key cast=(guint)

21728

* @param accel_mods cast=(GdkModifierType)

21729

*/

21730

-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);

21731

-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) {

21732

+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);

21733

+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) {

21734

lock.lock();

21735

try {

21736

_gtk_widget_add_accelerator(widget, accel_signal, accel_group, accel_key, accel_mods, accel_flags);

21737

@@ -11871,8 +11871,8 @@

21738

* @param widget cast=(GtkWidget *)

21739

* @param events cast=(gint)

21740

*/

21741

-public static final native void _gtk_widget_add_events(int /*long*/ widget, int events);

21742

-public static final void gtk_widget_add_events(int /*long*/ widget, int events) {

21743

+public static final native void _gtk_widget_add_events(long /*int*/ widget, int events);

21744

+public static final void gtk_widget_add_events(long /*int*/ widget, int events) {

21745

lock.lock();

21746

try {

21747

_gtk_widget_add_events(widget, events);

21748

@@ -11881,8 +11881,8 @@

21749

}

21750

}

21751

/** @param widget cast=(GtkWidget *) */

21752

-public static final native boolean _gtk_widget_child_focus(int /*long*/ widget, int direction);

21753

-public static final boolean gtk_widget_child_focus(int /*long*/ widget, int direction) {

21754

+public static final native boolean _gtk_widget_child_focus(long /*int*/ widget, int direction);

21755

+public static final boolean gtk_widget_child_focus(long /*int*/ widget, int direction) {

21756

lock.lock();

21757

try {

21758

return _gtk_widget_child_focus(widget, direction);

21759

@@ -11894,8 +11894,8 @@

21760

* @param widget cast=(GtkWidget *)

21761

* @param text cast=(const gchar *)

21762

*/

21763

-public static final native int /*long*/ _gtk_widget_create_pango_layout(int /*long*/ widget, byte[] text);

21764

-public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ widget, byte[] text) {

21765

+public static final native long /*int*/ _gtk_widget_create_pango_layout(long /*int*/ widget, byte[] text);

21766

+public static final long /*int*/ gtk_widget_create_pango_layout(long /*int*/ widget, byte[] text) {

21767

lock.lock();

21768

try {

21769

return _gtk_widget_create_pango_layout(widget, text);

21770

@@ -11907,8 +11907,8 @@

21771

* @param widget cast=(GtkWidget *)

21772

* @param text cast=(const gchar *)

21773

*/

21774

-public static final native int /*long*/ _gtk_widget_create_pango_layout(int /*long*/ widget, int /*long*/ text);

21775

-public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ widget, int /*long*/ text) {

21776

+public static final native long /*int*/ _gtk_widget_create_pango_layout(long /*int*/ widget, long /*int*/ text);

21777

+public static final long /*int*/ gtk_widget_create_pango_layout(long /*int*/ widget, long /*int*/ text) {

21778

lock.lock();

21779

try {

21780

return _gtk_widget_create_pango_layout(widget, text);

21781

@@ -11917,8 +11917,8 @@

21782

}

21783

}

21784

/** @param widget cast=(GtkWidget *) */

21785

-public static final native void _gtk_widget_destroy(int /*long*/ widget);

21786

-public static final void gtk_widget_destroy(int /*long*/ widget) {

21787

+public static final native void _gtk_widget_destroy(long /*int*/ widget);

21788

+public static final void gtk_widget_destroy(long /*int*/ widget) {

21789

lock.lock();

21790

try {

21791

_gtk_widget_destroy(widget);

21792

@@ -11930,8 +11930,8 @@

21793

* @param widget cast=(GtkWidget *)

21794

* @param event cast=(GdkEvent *)

21795

*/

21796

-public static final native boolean _gtk_widget_event(int /*long*/ widget, int /*long*/ event);

21797

-public static final boolean gtk_widget_event(int /*long*/ widget, int /*long*/ event) {

21798

+public static final native boolean _gtk_widget_event(long /*int*/ widget, long /*int*/ event);

21799

+public static final boolean gtk_widget_event(long /*int*/ widget, long /*int*/ event) {

21800

lock.lock();

21801

try {

21802

return _gtk_widget_event(widget, event);

21803

@@ -11940,8 +11940,8 @@

21804

}

21805

}

21806

/** @param widget cast=(GtkWidget *) */

21807

-public static final native int /*long*/ _gtk_widget_get_accessible (int /*long*/ widget);

21808

-public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget) {

21809

+public static final native long /*int*/ _gtk_widget_get_accessible (long /*int*/ widget);

21810

+public static final long /*int*/ gtk_widget_get_accessible (long /*int*/ widget) {

21811

lock.lock();

21812

try {

21813

return _gtk_widget_get_accessible(widget);

21814

@@ -11950,8 +11950,8 @@

21815

}

21816

}

21817

/** @param widget cast=(GtkWidget *) */

21818

-public static final native boolean _gtk_widget_get_child_visible (int /*long*/ widget);

21819

-public static final boolean gtk_widget_get_child_visible (int /*long*/ widget) {

21820

+public static final native boolean _gtk_widget_get_child_visible (long /*int*/ widget);

21821

+public static final boolean gtk_widget_get_child_visible (long /*int*/ widget) {

21822

lock.lock();

21823

try {

21824

return _gtk_widget_get_child_visible(widget);

21825

@@ -11968,8 +11968,8 @@

21826

lock.unlock();

21827

}

21828

}

21829

-public static final native int /*long*/ _gtk_widget_get_default_style();

21830

-public static final int /*long*/ gtk_widget_get_default_style() {

21831

+public static final native long /*int*/ _gtk_widget_get_default_style();

21832

+public static final long /*int*/ gtk_widget_get_default_style() {

21833

lock.lock();

21834

try {

21835

return _gtk_widget_get_default_style();

21836

@@ -11978,8 +11978,8 @@

21837

}

21838

}

21839

/** @param widget cast=(GtkWidget *) */

21840

-public static final native int _gtk_widget_get_direction(int /*long*/ widget);

21841

-public static final int gtk_widget_get_direction(int /*long*/ widget) {

21842

+public static final native int _gtk_widget_get_direction(long /*int*/ widget);

21843

+public static final int gtk_widget_get_direction(long /*int*/ widget) {

21844

lock.lock();

21845

try {

21846

return _gtk_widget_get_direction(widget);

21847

@@ -11988,8 +11988,8 @@

21848

}

21849

}

21850

/** @param widget cast=(GtkWidget *) */

21851

-public static final native int _gtk_widget_get_events(int /*long*/ widget);

21852

-public static final int gtk_widget_get_events(int /*long*/ widget) {

21853

+public static final native int _gtk_widget_get_events(long /*int*/ widget);

21854

+public static final int gtk_widget_get_events(long /*int*/ widget) {

21855

lock.lock();

21856

try {

21857

return _gtk_widget_get_events(widget);

21858

@@ -11998,8 +11998,8 @@

21859

}

21860

}

21861

/** @param widget cast=(GtkWidget *) */

21862

-public static final native int /*long*/ _gtk_widget_get_modifier_style(int /*long*/ widget);

21863

-public static final int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widget) {

21864

+public static final native long /*int*/ _gtk_widget_get_modifier_style(long /*int*/ widget);

21865

+public static final long /*int*/ gtk_widget_get_modifier_style(long /*int*/ widget) {

21866

lock.lock();

21867

try {

21868

return _gtk_widget_get_modifier_style(widget);

21869

@@ -12008,8 +12008,8 @@

21870

}

21871

}

21872

/** @param widget cast=(GtkWidget *) */

21873

-public static final native int /*long*/ _gtk_widget_get_pango_context(int /*long*/ widget);

21874

-public static final int /*long*/ gtk_widget_get_pango_context(int /*long*/ widget) {

21875

+public static final native long /*int*/ _gtk_widget_get_pango_context(long /*int*/ widget);

21876

+public static final long /*int*/ gtk_widget_get_pango_context(long /*int*/ widget) {

21877

lock.lock();

21878

try {

21879

return _gtk_widget_get_pango_context(widget);

21880

@@ -12018,8 +12018,8 @@

21881

}

21882

}

21883

/** @param widget cast=(GtkWidget *) */

21884

-public static final native int /*long*/ _gtk_widget_get_parent(int /*long*/ widget);

21885

-public static final int /*long*/ gtk_widget_get_parent(int /*long*/ widget) {

21886

+public static final native long /*int*/ _gtk_widget_get_parent(long /*int*/ widget);

21887

+public static final long /*int*/ gtk_widget_get_parent(long /*int*/ widget) {

21888

lock.lock();

21889

try {

21890

return _gtk_widget_get_parent(widget);

21891

@@ -12028,8 +12028,8 @@

21892

}

21893

}

21894

/** @param widget cast=(GtkWidget *) */

21895

-public static final native int /*long*/ _gtk_widget_get_style(int /*long*/ widget);

21896

-public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) {

21897

+public static final native long /*int*/ _gtk_widget_get_style(long /*int*/ widget);

21898

+public static final long /*int*/ gtk_widget_get_style(long /*int*/ widget) {

21899

lock.lock();

21900

try {

21901

return _gtk_widget_get_style(widget);

21902

@@ -12042,8 +12042,8 @@

21903

* @param width cast=(gint *)

21904

* @param height cast=(gint *)

21905

*/

21906

-public static final native void _gtk_widget_get_size_request(int /*long*/ widget, int [] width, int [] height);

21907

-public static final void gtk_widget_get_size_request(int /*long*/ widget, int [] width, int [] height) {

21908

+public static final native void _gtk_widget_get_size_request(long /*int*/ widget, int [] width, int [] height);

21909

+public static final void gtk_widget_get_size_request(long /*int*/ widget, int [] width, int [] height) {

21910

lock.lock();

21911

try {

21912

_gtk_widget_get_size_request(widget, width, height);

21913

@@ -12052,8 +12052,8 @@

21914

}

21915

}

21916

/** @param widget cast=(GtkWidget *) */

21917

-public static final native int /*long*/ _gtk_widget_get_toplevel (int /*long*/ widget);

21918

-public static final int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget) {

21919

+public static final native long /*int*/ _gtk_widget_get_toplevel (long /*int*/ widget);

21920

+public static final long /*int*/ gtk_widget_get_toplevel (long /*int*/ widget) {

21921

lock.lock();

21922

try {

21923

return _gtk_widget_get_toplevel(widget);

21924

@@ -12062,8 +12062,8 @@

21925

}

21926

}

21927

/** @param widget cast=(GtkWidget *) */

21928

-public static final native void _gtk_widget_grab_focus(int /*long*/ widget);

21929

-public static final void gtk_widget_grab_focus(int /*long*/ widget) {

21930

+public static final native void _gtk_widget_grab_focus(long /*int*/ widget);

21931

+public static final void gtk_widget_grab_focus(long /*int*/ widget) {

21932

lock.lock();

21933

try {

21934

_gtk_widget_grab_focus(widget);

21935

@@ -12072,8 +12072,8 @@

21936

}

21937

}

21938

/** @param widget cast=(GtkWidget *) */

21939

-public static final native void _gtk_widget_hide(int /*long*/ widget);

21940

-public static final void gtk_widget_hide(int /*long*/ widget) {

21941

+public static final native void _gtk_widget_hide(long /*int*/ widget);

21942

+public static final void gtk_widget_hide(long /*int*/ widget) {

21943

lock.lock();

21944

try {

21945

_gtk_widget_hide(widget);

21946

@@ -12085,8 +12085,8 @@

21947

* @method flags=dynamic

21948

* @param widget cast=(GtkWidget *)

21949

*/

21950

-public static final native boolean _gtk_widget_is_composited(int /*long*/ widget);

21951

-public static final boolean gtk_widget_is_composited(int /*long*/ widget) {

21952

+public static final native boolean _gtk_widget_is_composited(long /*int*/ widget);

21953

+public static final boolean gtk_widget_is_composited(long /*int*/ widget) {

21954

lock.lock();

21955

try {

21956

return _gtk_widget_is_composited(widget);

21957

@@ -12095,8 +12095,8 @@

21958

}

21959

}

21960

/** @param widget cast=(GtkWidget *) */

21961

-public static final native boolean _gtk_widget_is_focus(int /*long*/ widget);

21962

-public static final boolean gtk_widget_is_focus(int /*long*/ widget) {

21963

+public static final native boolean _gtk_widget_is_focus(long /*int*/ widget);

21964

+public static final boolean gtk_widget_is_focus(long /*int*/ widget) {

21965

lock.lock();

21966

try {

21967

return _gtk_widget_is_focus(widget);

21968

@@ -12105,8 +12105,8 @@

21969

}

21970

}

21971

/** @param widget cast=(GtkWidget *) */

21972

-public static final native void _gtk_widget_map(int /*long*/ widget);

21973

-public static final void gtk_widget_map(int /*long*/ widget) {

21974

+public static final native void _gtk_widget_map(long /*int*/ widget);

21975

+public static final void gtk_widget_map(long /*int*/ widget) {

21976

lock.lock();

21977

try {

21978

_gtk_widget_map(widget);

21979

@@ -12118,8 +12118,8 @@

21980

* @param widget cast=(GtkWidget *)

21981

* @param group_cycling cast=(gboolean)

21982

*/

21983

-public static final native boolean _gtk_widget_mnemonic_activate(int /*long*/ widget, boolean group_cycling);

21984

-public static final boolean gtk_widget_mnemonic_activate(int /*long*/ widget, boolean group_cycling) {

21985

+public static final native boolean _gtk_widget_mnemonic_activate(long /*int*/ widget, boolean group_cycling);

21986

+public static final boolean gtk_widget_mnemonic_activate(long /*int*/ widget, boolean group_cycling) {

21987

lock.lock();

21988

try {

21989

return _gtk_widget_mnemonic_activate(widget, group_cycling);

21990

@@ -12132,8 +12132,8 @@

21991

* @param state cast=(GtkStateType)

21992

* @param color cast=(GdkColor *),flags=no_out

21993

*/

21994

-public static final native void _gtk_widget_modify_base(int /*long*/ widget, int state, GdkColor color);

21995

-public static final void gtk_widget_modify_base(int /*long*/ widget, int state, GdkColor color) {

21996

+public static final native void _gtk_widget_modify_base(long /*int*/ widget, int state, GdkColor color);

21997

+public static final void gtk_widget_modify_base(long /*int*/ widget, int state, GdkColor color) {

21998

lock.lock();

21999

try {

22000

_gtk_widget_modify_base(widget, state, color);

22001

@@ -12146,8 +12146,8 @@

22002

* @param state cast=(GtkStateType)

22003

* @param color cast=(GdkColor *),flags=no_out

22004

*/

22005

-public static final native void _gtk_widget_modify_bg(int /*long*/ widget, int state, GdkColor color);

22006

-public static final void gtk_widget_modify_bg(int /*long*/ widget, int state, GdkColor color) {

22007

+public static final native void _gtk_widget_modify_bg(long /*int*/ widget, int state, GdkColor color);

22008

+public static final void gtk_widget_modify_bg(long /*int*/ widget, int state, GdkColor color) {

22009

lock.lock();

22010

try {

22011

_gtk_widget_modify_bg(widget, state, color);

22012

@@ -12160,8 +12160,8 @@

22013

* @param state cast=(GtkStateType)

22014

* @param color cast=(GdkColor *),flags=no_out

22015

*/

22016

-public static final native void _gtk_widget_modify_fg(int /*long*/ widget, int state, GdkColor color);

22017

-public static final void gtk_widget_modify_fg(int /*long*/ widget, int state, GdkColor color) {

22018

+public static final native void _gtk_widget_modify_fg(long /*int*/ widget, int state, GdkColor color);

22019

+public static final void gtk_widget_modify_fg(long /*int*/ widget, int state, GdkColor color) {

22020

lock.lock();

22021

try {

22022

_gtk_widget_modify_fg(widget, state, color);

22023

@@ -12173,8 +12173,8 @@

22024

* @param widget cast=(GtkWidget *)

22025

* @param pango_font_descr cast=(PangoFontDescription *)

22026

*/

22027

-public static final native void _gtk_widget_modify_font(int /*long*/ widget, int /*long*/ pango_font_descr);

22028

-public static final void gtk_widget_modify_font(int /*long*/ widget, int /*long*/ pango_font_descr) {

22029

+public static final native void _gtk_widget_modify_font(long /*int*/ widget, long /*int*/ pango_font_descr);

22030

+public static final void gtk_widget_modify_font(long /*int*/ widget, long /*int*/ pango_font_descr) {

22031

lock.lock();

22032

try {

22033

_gtk_widget_modify_font(widget, pango_font_descr);

22034

@@ -12186,8 +12186,8 @@

22035

* @param widget cast=(GtkWidget *)

22036

* @param style cast=(GtkRcStyle *)

22037

*/

22038

-public static final native void _gtk_widget_modify_style(int /*long*/ widget, int /*long*/ style);

22039

-public static final void gtk_widget_modify_style(int /*long*/ widget, int /*long*/ style) {

22040

+public static final native void _gtk_widget_modify_style(long /*int*/ widget, long /*int*/ style);

22041

+public static final void gtk_widget_modify_style(long /*int*/ widget, long /*int*/ style) {

22042

lock.lock();

22043

try {

22044

_gtk_widget_modify_style(widget, style);

22045

@@ -12200,8 +12200,8 @@

22046

* @param state cast=(GtkStateType)

22047

* @param color cast=(GdkColor *),flags=no_out

22048

*/

22049

-public static final native void _gtk_widget_modify_text(int /*long*/ widget, int state, GdkColor color);

22050

-public static final void gtk_widget_modify_text(int /*long*/ widget, int state, GdkColor color) {

22051

+public static final native void _gtk_widget_modify_text(long /*int*/ widget, int state, GdkColor color);

22052

+public static final void gtk_widget_modify_text(long /*int*/ widget, int state, GdkColor color) {

22053

lock.lock();

22054

try {

22055

_gtk_widget_modify_text(widget, state, color);

22056

@@ -12210,8 +12210,8 @@

22057

}

22058

}

22059

/** @param widget cast=(GtkWidget *) */

22060

-public static final native void _gtk_widget_queue_resize(int /*long*/ widget);

22061

-public static final void gtk_widget_queue_resize(int /*long*/ widget) {

22062

+public static final native void _gtk_widget_queue_resize(long /*int*/ widget);

22063

+public static final void gtk_widget_queue_resize(long /*int*/ widget) {

22064

lock.lock();

22065

try {

22066

_gtk_widget_queue_resize(widget);

22067

@@ -12220,8 +12220,8 @@

22068

}

22069

}

22070

/** @param widget cast=(GtkWidget *) */

22071

-public static final native void _gtk_widget_realize(int /*long*/ widget);

22072

-public static final void gtk_widget_realize(int /*long*/ widget) {

22073

+public static final native void _gtk_widget_realize(long /*int*/ widget);

22074

+public static final void gtk_widget_realize(long /*int*/ widget) {

22075

lock.lock();

22076

try {

22077

_gtk_widget_realize(widget);

22078

@@ -12235,8 +12235,8 @@

22079

* @param accel_key cast=(guint)

22080

* @param accel_mods cast=(GdkModifierType)

22081

*/

22082

-public static final native void _gtk_widget_remove_accelerator(int /*long*/ widget, int /*long*/ accel_group, int accel_key, int accel_mods);

22083

-public static final void gtk_widget_remove_accelerator(int /*long*/ widget, int /*long*/ accel_group, int accel_key, int accel_mods) {

22084

+public static final native void _gtk_widget_remove_accelerator(long /*int*/ widget, long /*int*/ accel_group, int accel_key, int accel_mods);

22085

+public static final void gtk_widget_remove_accelerator(long /*int*/ widget, long /*int*/ accel_group, int accel_key, int accel_mods) {

22086

lock.lock();

22087

try {

22088

_gtk_widget_remove_accelerator(widget, accel_group, accel_key, accel_mods);

22089

@@ -12248,8 +12248,8 @@

22090

* @param widget cast=(GtkWidget *)

22091

* @param new_parent cast=(GtkWidget *)

22092

*/

22093

-public static final native void _gtk_widget_reparent(int /*long*/ widget, int /*long*/ new_parent);

22094

-public static final void gtk_widget_reparent(int /*long*/ widget, int /*long*/ new_parent) {

22095

+public static final native void _gtk_widget_reparent(long /*int*/ widget, long /*int*/ new_parent);

22096

+public static final void gtk_widget_reparent(long /*int*/ widget, long /*int*/ new_parent) {

22097

lock.lock();

22098

try {

22099

_gtk_widget_reparent(widget, new_parent);

22100

@@ -12261,8 +12261,8 @@

22101

* @param widget cast=(GtkWidget *)

22102

* @param event cast=(GdkEvent *)

22103

*/

22104

-public static final native int _gtk_widget_send_expose(int /*long*/ widget, int /*long*/ event);

22105

-public static final int gtk_widget_send_expose(int /*long*/ widget, int /*long*/ event) {

22106

+public static final native int _gtk_widget_send_expose(long /*int*/ widget, long /*int*/ event);

22107

+public static final int gtk_widget_send_expose(long /*int*/ widget, long /*int*/ event) {

22108

lock.lock();

22109

try {

22110

return _gtk_widget_send_expose(widget, event);

22111

@@ -12271,8 +12271,8 @@

22112

}

22113

}

22114

/** @param widget cast=(GtkWidget *) */

22115

-public static final native void _gtk_widget_set_app_paintable(int /*long*/ widget, boolean app_paintable);

22116

-public static final void gtk_widget_set_app_paintable(int /*long*/ widget, boolean app_paintable) {

22117

+public static final native void _gtk_widget_set_app_paintable(long /*int*/ widget, boolean app_paintable);

22118

+public static final void gtk_widget_set_app_paintable(long /*int*/ widget, boolean app_paintable) {

22119

lock.lock();

22120

try {

22121

_gtk_widget_set_app_paintable(widget, app_paintable);

22122

@@ -12294,8 +12294,8 @@

22123

* @param widget cast=(GtkWidget *)

22124

* @param dir cast=(GtkTextDirection)

22125

*/

22126

-public static final native void _gtk_widget_set_direction(int /*long*/ widget, int dir);

22127

-public static final void gtk_widget_set_direction(int /*long*/ widget, int dir) {

22128

+public static final native void _gtk_widget_set_direction(long /*int*/ widget, int dir);

22129

+public static final void gtk_widget_set_direction(long /*int*/ widget, int dir) {

22130

lock.lock();

22131

try {

22132

_gtk_widget_set_direction(widget, dir);

22133

@@ -12307,8 +12307,8 @@

22134

* @param widget cast=(GtkWidget *)

22135

* @param double_buffered cast=(gboolean)

22136

*/

22137

-public static final native void _gtk_widget_set_double_buffered(int /*long*/ widget, boolean double_buffered);

22138

-public static final void gtk_widget_set_double_buffered(int /*long*/ widget, boolean double_buffered) {

22139

+public static final native void _gtk_widget_set_double_buffered(long /*int*/ widget, boolean double_buffered);

22140

+public static final void gtk_widget_set_double_buffered(long /*int*/ widget, boolean double_buffered) {

22141

lock.lock();

22142

try {

22143

_gtk_widget_set_double_buffered(widget, double_buffered);

22144

@@ -12320,8 +12320,8 @@

22145

* @param widget cast=(GtkWidget *)

22146

* @param name cast=(const char *)

22147

*/

22148

-public static final native void _gtk_widget_set_name(int /*long*/ widget, byte[] name);

22149

-public static final void gtk_widget_set_name(int /*long*/ widget, byte[] name) {

22150

+public static final native void _gtk_widget_set_name(long /*int*/ widget, byte[] name);

22151

+public static final void gtk_widget_set_name(long /*int*/ widget, byte[] name) {

22152

lock.lock();

22153

try {

22154

_gtk_widget_set_name(widget, name);

22155

@@ -12333,8 +12333,8 @@

22156

* @param widget cast=(GtkWidget *)

22157

* @param redraw cast=(gboolean)

22158

*/

22159

-public static final native void _gtk_widget_set_redraw_on_allocate(int /*long*/ widget, boolean redraw);

22160

-public static final void gtk_widget_set_redraw_on_allocate(int /*long*/ widget, boolean redraw) {

22161

+public static final native void _gtk_widget_set_redraw_on_allocate(long /*int*/ widget, boolean redraw);

22162

+public static final void gtk_widget_set_redraw_on_allocate(long /*int*/ widget, boolean redraw) {

22163

lock.lock();

22164

try {

22165

_gtk_widget_set_redraw_on_allocate(widget, redraw);

22166

@@ -12346,8 +12346,8 @@

22167

* @param widget cast=(GtkWidget *)

22168

* @param sensitive cast=(gboolean)

22169

*/

22170

-public static final native void _gtk_widget_set_sensitive(int /*long*/ widget, boolean sensitive);

22171

-public static final void gtk_widget_set_sensitive(int /*long*/ widget, boolean sensitive) {

22172

+public static final native void _gtk_widget_set_sensitive(long /*int*/ widget, boolean sensitive);

22173

+public static final void gtk_widget_set_sensitive(long /*int*/ widget, boolean sensitive) {

22174

lock.lock();

22175

try {

22176

_gtk_widget_set_sensitive(widget, sensitive);

22177

@@ -12360,8 +12360,8 @@

22178

* @param width cast=(gint)

22179

* @param height cast=(gint)

22180

*/

22181

-public static final native void _gtk_widget_set_size_request(int /*long*/ widget, int width, int height);

22182

-public static final void gtk_widget_set_size_request(int /*long*/ widget, int width, int height) {

22183

+public static final native void _gtk_widget_set_size_request(long /*int*/ widget, int width, int height);

22184

+public static final void gtk_widget_set_size_request(long /*int*/ widget, int width, int height) {

22185

lock.lock();

22186

try {

22187

_gtk_widget_set_size_request(widget, width, height);

22188

@@ -12373,8 +12373,8 @@

22189

* @param widget cast=(GtkWidget *)

22190

* @param state cast=(GtkStateType)

22191

*/

22192

-public static final native void _gtk_widget_set_state(int /*long*/ widget, int state);

22193

-public static final void gtk_widget_set_state(int /*long*/ widget, int state) {

22194

+public static final native void _gtk_widget_set_state(long /*int*/ widget, int state);

22195

+public static final void gtk_widget_set_state(long /*int*/ widget, int state) {

22196

lock.lock();

22197

try {

22198

_gtk_widget_set_state(widget, state);

22199

@@ -12386,8 +12386,8 @@

22200

* @param widget cast=(GtkWidget *)

22201

* @param style cast=(GtkStyle *)

22202

*/

22203

-public static final native void _gtk_widget_set_style(int /*long*/ widget, int /*long*/ style);

22204

-public static final void gtk_widget_set_style(int /*long*/ widget, int /*long*/ style) {

22205

+public static final native void _gtk_widget_set_style(long /*int*/ widget, long /*int*/ style);

22206

+public static final void gtk_widget_set_style(long /*int*/ widget, long /*int*/ style) {

22207

lock.lock();

22208

try {

22209

_gtk_widget_set_style(widget, style);

22210

@@ -12401,8 +12401,8 @@

22211

* @param offset_x cast=(gint)

22212

* @param offset_y cast=(gint)

22213

*/

22214

-public static final native void _gtk_widget_shape_combine_mask(int /*long*/ widget, int /*long*/ shape_mask, int offset_x, int offset_y);

22215

-public static final void gtk_widget_shape_combine_mask(int /*long*/ widget, int /*long*/ shape_mask, int offset_x, int offset_y) {

22216

+public static final native void _gtk_widget_shape_combine_mask(long /*int*/ widget, long /*int*/ shape_mask, int offset_x, int offset_y);

22217

+public static final void gtk_widget_shape_combine_mask(long /*int*/ widget, long /*int*/ shape_mask, int offset_x, int offset_y) {

22218

lock.lock();

22219

try {

22220

_gtk_widget_shape_combine_mask(widget, shape_mask, offset_x, offset_y);

22221

@@ -12411,8 +12411,8 @@

22222

}

22223

}

22224

/** @param widget cast=(GtkWidget *) */

22225

-public static final native void _gtk_widget_show(int /*long*/ widget);

22226

-public static final void gtk_widget_show(int /*long*/ widget) {

22227

+public static final native void _gtk_widget_show(long /*int*/ widget);

22228

+public static final void gtk_widget_show(long /*int*/ widget) {

22229

lock.lock();

22230

try {

22231

_gtk_widget_show(widget);

22232

@@ -12421,8 +12421,8 @@

22233

}

22234

}

22235

/** @param widget cast=(GtkWidget *) */

22236

-public static final native void _gtk_widget_show_now(int /*long*/ widget);

22237

-public static final void gtk_widget_show_now(int /*long*/ widget) {

22238

+public static final native void _gtk_widget_show_now(long /*int*/ widget);

22239

+public static final void gtk_widget_show_now(long /*int*/ widget) {

22240

lock.lock();

22241

try {

22242

_gtk_widget_show_now(widget);

22243

@@ -12434,8 +12434,8 @@

22244

* @param widget cast=(GtkWidget *)

22245

* @param allocation cast=(GtkAllocation *),flags=no_out

22246

*/

22247

-public static final native void _gtk_widget_size_allocate(int /*long*/ widget, GtkAllocation allocation);

22248

-public static final void gtk_widget_size_allocate(int /*long*/ widget, GtkAllocation allocation) {

22249

+public static final native void _gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation);

22250

+public static final void gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation) {

22251

lock.lock();

22252

try {

22253

_gtk_widget_size_allocate(widget, allocation);

22254

@@ -12447,8 +12447,8 @@

22255

* @param widget cast=(GtkWidget *)

22256

* @param requisition cast=(GtkRequisition *),flags=no_in

22257

*/

22258

-public static final native void _gtk_widget_size_request(int /*long*/ widget, GtkRequisition requisition);

22259

-public static final void gtk_widget_size_request(int /*long*/ widget, GtkRequisition requisition) {

22260

+public static final native void _gtk_widget_size_request(long /*int*/ widget, GtkRequisition requisition);

22261

+public static final void gtk_widget_size_request(long /*int*/ widget, GtkRequisition requisition) {

22262

lock.lock();

22263

try {

22264

_gtk_widget_size_request(widget, requisition);

22265

@@ -12461,8 +12461,8 @@

22266

* @param property_name cast=(const gchar *)

22267

* @param terminator cast=(const gchar *),flags=sentinel

22268

*/

22269

-public static final native void _gtk_widget_style_get(int /*long*/ widget, byte[] property_name, int[] value, int /*long*/ terminator);

22270

-public static final void gtk_widget_style_get(int /*long*/ widget, byte[] property_name, int[] value, int /*long*/ terminator) {

22271

+public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator);

22272

+public static final void gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator) {

22273

lock.lock();

22274

try {

22275

_gtk_widget_style_get(widget, property_name, value, terminator);

22276

@@ -12475,8 +12475,8 @@

22277

* @param property_name cast=(const gchar *)

22278

* @param terminator cast=(const gchar *),flags=sentinel

22279

*/

22280

-public static final native void _gtk_widget_style_get(int /*long*/ widget, byte[] property_name, long[] value, int /*long*/ terminator);

22281

-public static final void gtk_widget_style_get(int /*long*/ widget, byte[] property_name, long[] value, int /*long*/ terminator) {

22282

+public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator);

22283

+public static final void gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator) {

22284

lock.lock();

22285

try {

22286

_gtk_widget_style_get(widget, property_name, value, terminator);

22287

@@ -12488,8 +12488,8 @@

22288

* @param src_widget cast=(GtkWidget *)

22289

* @param dest_widget cast=(GtkWidget *)

22290

*/

22291

-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);

22292

-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) {

22293

+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);

22294

+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) {

22295

lock.lock();

22296

try {

22297

return _gtk_widget_translate_coordinates(src_widget, dest_widget, src_x, src_y, dest_x, dest_y);

22298

@@ -12498,8 +12498,8 @@

22299

}

22300

}

22301

/** @param widget cast=(GtkWidget *) */

22302

-public static final native void _gtk_widget_unrealize(int /*long*/ widget);

22303

-public static final void gtk_widget_unrealize(int /*long*/ widget) {

22304

+public static final native void _gtk_widget_unrealize(long /*int*/ widget);

22305

+public static final void gtk_widget_unrealize(long /*int*/ widget) {

22306

lock.lock();

22307

try {

22308

_gtk_widget_unrealize(widget);

22309

@@ -12508,8 +12508,8 @@

22310

}

22311

}

22312

/** @param window cast=(GtkWindow *) */

22313

-public static final native boolean _gtk_window_activate_default(int /*long*/ window);

22314

-public static final boolean gtk_window_activate_default(int /*long*/ window) {

22315

+public static final native boolean _gtk_window_activate_default(long /*int*/ window);

22316

+public static final boolean gtk_window_activate_default(long /*int*/ window) {

22317

lock.lock();

22318

try {

22319

return _gtk_window_activate_default(window);

22320

@@ -12521,8 +12521,8 @@

22321

* @param window cast=(GtkWindow *)

22322

* @param accel_group cast=(GtkAccelGroup *)

22323

*/

22324

-public static final native void _gtk_window_add_accel_group(int /*long*/ window, int /*long*/ accel_group);

22325

-public static final void gtk_window_add_accel_group(int /*long*/ window, int /*long*/ accel_group) {

22326

+public static final native void _gtk_window_add_accel_group(long /*int*/ window, long /*int*/ accel_group);

22327

+public static final void gtk_window_add_accel_group(long /*int*/ window, long /*int*/ accel_group) {

22328

lock.lock();

22329

try {

22330

_gtk_window_add_accel_group(window, accel_group);

22331

@@ -12531,8 +12531,8 @@

22332

}

22333

}

22334

/** @param handle cast=(GtkWindow *) */

22335

-public static final native void _gtk_window_deiconify(int /*long*/ handle);

22336

-public static final void gtk_window_deiconify(int /*long*/ handle) {

22337

+public static final native void _gtk_window_deiconify(long /*int*/ handle);

22338

+public static final void gtk_window_deiconify(long /*int*/ handle) {

22339

lock.lock();

22340

try {

22341

_gtk_window_deiconify(handle);

22342

@@ -12541,8 +12541,8 @@

22343

}

22344

}

22345

/** @param window cast=(GtkWindow *) */

22346

-public static final native int /*long*/ _gtk_window_get_focus(int /*long*/ window);

22347

-public static final int /*long*/ gtk_window_get_focus(int /*long*/ window) {

22348

+public static final native long /*int*/ _gtk_window_get_focus(long /*int*/ window);

22349

+public static final long /*int*/ gtk_window_get_focus(long /*int*/ window) {

22350

lock.lock();

22351

try {

22352

return _gtk_window_get_focus(window);

22353

@@ -12554,8 +12554,8 @@

22354

* @method flags=dynamic

22355

* @param window cast=(GtkWindow *)

22356

*/

22357

-public static final native int /*long*/ _gtk_window_get_group(int /*long*/ window);

22358

-public static final int /*long*/ gtk_window_get_group(int /*long*/ window) {

22359

+public static final native long /*int*/ _gtk_window_get_group(long /*int*/ window);

22360

+public static final long /*int*/ gtk_window_get_group(long /*int*/ window) {

22361

lock.lock();

22362

try {

22363

return _gtk_window_get_group(window);

22364

@@ -12564,8 +12564,8 @@

22365

}

22366

}

22367

/** @param window cast=(GtkWindow *) */

22368

-public static final native int /*long*/ _gtk_window_get_icon_list(int /*long*/ window);

22369

-public static final int /*long*/ gtk_window_get_icon_list(int /*long*/ window) {

22370

+public static final native long /*int*/ _gtk_window_get_icon_list(long /*int*/ window);

22371

+public static final long /*int*/ gtk_window_get_icon_list(long /*int*/ window) {

22372

lock.lock();

22373

try {

22374

return _gtk_window_get_icon_list(window);

22375

@@ -12574,8 +12574,8 @@

22376

}

22377

}

22378

/** @param window cast=(GtkWindow *) */

22379

-public static final native boolean _gtk_window_get_modal(int /*long*/ window);

22380

-public static final boolean gtk_window_get_modal(int /*long*/ window) {

22381

+public static final native boolean _gtk_window_get_modal(long /*int*/ window);

22382

+public static final boolean gtk_window_get_modal(long /*int*/ window) {

22383

lock.lock();

22384

try {

22385

return _gtk_window_get_modal(window);

22386

@@ -12584,8 +12584,8 @@

22387

}

22388

}

22389

/** @param window cast=(GtkWindow *) */

22390

-public static final native int _gtk_window_get_mnemonic_modifier(int /*long*/ window);

22391

-public static final int gtk_window_get_mnemonic_modifier(int /*long*/ window) {

22392

+public static final native int _gtk_window_get_mnemonic_modifier(long /*int*/ window);

22393

+public static final int gtk_window_get_mnemonic_modifier(long /*int*/ window) {

22394

lock.lock();

22395

try {

22396

return _gtk_window_get_mnemonic_modifier(window);

22397

@@ -12597,8 +12597,8 @@

22398

* @method flags=dynamic

22399

* @param window cast=(GtkWindow *)

22400

*/

22401

-public static final native double _gtk_window_get_opacity (int /*long*/ window);

22402

-public static final double gtk_window_get_opacity (int /*long*/ window) {

22403

+public static final native double _gtk_window_get_opacity (long /*int*/ window);

22404

+public static final double gtk_window_get_opacity (long /*int*/ window) {

22405

lock.lock();

22406

try {

22407

return _gtk_window_get_opacity (window);

22408

@@ -12611,8 +12611,8 @@

22409

* @param x cast=(gint *)

22410

* @param y cast=(gint *)

22411

*/

22412

-public static final native void _gtk_window_get_position(int /*long*/ handle, int[] x, int[] y);

22413

-public static final void gtk_window_get_position(int /*long*/ handle, int[] x, int[] y) {

22414

+public static final native void _gtk_window_get_position(long /*int*/ handle, int[] x, int[] y);

22415

+public static final void gtk_window_get_position(long /*int*/ handle, int[] x, int[] y) {

22416

lock.lock();

22417

try {

22418

_gtk_window_get_position(handle, x, y);

22419

@@ -12625,8 +12625,8 @@

22420

* @param x cast=(gint *)

22421

* @param y cast=(gint *)

22422

*/

22423

-public static final native void _gtk_window_get_size(int /*long*/ handle, int[] x, int[] y);

22424

-public static final void gtk_window_get_size(int /*long*/ handle, int[] x, int[] y) {

22425

+public static final native void _gtk_window_get_size(long /*int*/ handle, int[] x, int[] y);

22426

+public static final void gtk_window_get_size(long /*int*/ handle, int[] x, int[] y) {

22427

lock.lock();

22428

try {

22429

_gtk_window_get_size(handle, x, y);

22430

@@ -12638,8 +12638,8 @@

22431

* @param group cast=(GtkWindowGroup*)

22432

* @param window cast=(GtkWindow*)

22433

*/

22434

-public static final native void _gtk_window_group_add_window(int /*long*/ group, int /*long*/ window);

22435

-public static final void gtk_window_group_add_window(int /*long*/ group, int /*long*/ window) {

22436

+public static final native void _gtk_window_group_add_window(long /*int*/ group, long /*int*/ window);

22437

+public static final void gtk_window_group_add_window(long /*int*/ group, long /*int*/ window) {

22438

lock.lock();

22439

try {

22440

_gtk_window_group_add_window(group, window);

22441

@@ -12651,8 +12651,8 @@

22442

* @param group cast=(GtkWindowGroup*)

22443

* @param window cast=(GtkWindow*)

22444

*/

22445

-public static final native void _gtk_window_group_remove_window(int /*long*/ group, int /*long*/ window);

22446

-public static final void gtk_window_group_remove_window(int /*long*/ group, int /*long*/ window) {

22447

+public static final native void _gtk_window_group_remove_window(long /*int*/ group, long /*int*/ window);

22448

+public static final void gtk_window_group_remove_window(long /*int*/ group, long /*int*/ window) {

22449

lock.lock();

22450

try {

22451

_gtk_window_group_remove_window(group, window);

22452

@@ -12660,8 +12660,8 @@

22453

lock.unlock();

22454

}

22455

}

22456

-public static final native int /*long*/ _gtk_window_group_new();

22457

-public static final int /*long*/ gtk_window_group_new() {

22458

+public static final native long /*int*/ _gtk_window_group_new();

22459

+public static final long /*int*/ gtk_window_group_new() {

22460

lock.lock();

22461

try {

22462

return _gtk_window_group_new();

22463

@@ -12670,8 +12670,8 @@

22464

}

22465

}

22466

/** @param handle cast=(GtkWindow *) */

22467

-public static final native void _gtk_window_iconify(int /*long*/ handle);

22468

-public static final void gtk_window_iconify(int /*long*/ handle) {

22469

+public static final native void _gtk_window_iconify(long /*int*/ handle);

22470

+public static final void gtk_window_iconify(long /*int*/ handle) {

22471

lock.lock();

22472

try {

22473

_gtk_window_iconify(handle);

22474

@@ -12679,8 +12679,8 @@

22475

lock.unlock();

22476

}

22477

}

22478

-public static final native int /*long*/ _gtk_window_list_toplevels ();

22479

-public static final int /*long*/ gtk_window_list_toplevels () {

22480

+public static final native long /*int*/ _gtk_window_list_toplevels ();

22481

+public static final long /*int*/ gtk_window_list_toplevels () {

22482

lock.lock();

22483

try {

22484

return _gtk_window_list_toplevels ();

22485

@@ -12689,8 +12689,8 @@

22486

}

22487

}

22488

/** @param handle cast=(GtkWindow *) */

22489

-public static final native void _gtk_window_maximize(int /*long*/ handle);

22490

-public static final void gtk_window_maximize(int /*long*/ handle) {

22491

+public static final native void _gtk_window_maximize(long /*int*/ handle);

22492

+public static final void gtk_window_maximize(long /*int*/ handle) {

22493

lock.lock();

22494

try {

22495

_gtk_window_maximize(handle);

22496

@@ -12699,8 +12699,8 @@

22497

}

22498

}

22499

/** @param handle cast=(GtkWindow *) */

22500

-public static final native void _gtk_window_fullscreen(int /*long*/ handle);

22501

-public static final void gtk_window_fullscreen(int /*long*/ handle) {

22502

+public static final native void _gtk_window_fullscreen(long /*int*/ handle);

22503

+public static final void gtk_window_fullscreen(long /*int*/ handle) {

22504

lock.lock();

22505

try {

22506

_gtk_window_fullscreen(handle);

22507

@@ -12709,8 +12709,8 @@

22508

}

22509

}

22510

/** @param handle cast=(GtkWindow *) */

22511

-public static final native void _gtk_window_unfullscreen(int /*long*/ handle);

22512

-public static final void gtk_window_unfullscreen(int /*long*/ handle) {

22513

+public static final native void _gtk_window_unfullscreen(long /*int*/ handle);

22514

+public static final void gtk_window_unfullscreen(long /*int*/ handle) {

22515

lock.lock();

22516

try {

22517

_gtk_window_unfullscreen(handle);

22518

@@ -12723,8 +12723,8 @@

22519

* @param x cast=(gint)

22520

* @param y cast=(gint)

22521

*/

22522

-public static final native void _gtk_window_move(int /*long*/ handle, int x, int y);

22523

-public static final void gtk_window_move(int /*long*/ handle, int x, int y) {

22524

+public static final native void _gtk_window_move(long /*int*/ handle, int x, int y);

22525

+public static final void gtk_window_move(long /*int*/ handle, int x, int y) {

22526

lock.lock();

22527

try {

22528

_gtk_window_move(handle, x, y);

22529

@@ -12733,8 +12733,8 @@

22530

}

22531

}

22532

/** @param type cast=(GtkWindowType) */

22533

-public static final native int /*long*/ _gtk_window_new(int type);

22534

-public static final int /*long*/ gtk_window_new(int type) {

22535

+public static final native long /*int*/ _gtk_window_new(int type);

22536

+public static final long /*int*/ gtk_window_new(int type) {

22537

lock.lock();

22538

try {

22539

return _gtk_window_new(type);

22540

@@ -12743,8 +12743,8 @@

22541

}

22542

}

22543

/** @param window cast=(GtkWindow *) */

22544

-public static final native void _gtk_window_present(int /*long*/ window);

22545

-public static final void gtk_window_present(int /*long*/ window) {

22546

+public static final native void _gtk_window_present(long /*int*/ window);

22547

+public static final void gtk_window_present(long /*int*/ window) {

22548

lock.lock();

22549

try {

22550

_gtk_window_present(window);

22551

@@ -12756,8 +12756,8 @@

22552

* @param window cast=(GtkWindow *)

22553

* @param accel_group cast=(GtkAccelGroup *)

22554

*/

22555

-public static final native void _gtk_window_remove_accel_group(int /*long*/ window, int /*long*/ accel_group);

22556

-public static final void gtk_window_remove_accel_group(int /*long*/ window, int /*long*/ accel_group) {

22557

+public static final native void _gtk_window_remove_accel_group(long /*int*/ window, long /*int*/ accel_group);

22558

+public static final void gtk_window_remove_accel_group(long /*int*/ window, long /*int*/ accel_group) {

22559

lock.lock();

22560

try {

22561

_gtk_window_remove_accel_group(window, accel_group);

22562

@@ -12770,8 +12770,8 @@

22563

* @param x cast=(gint)

22564

* @param y cast=(gint)

22565

*/

22566

-public static final native void _gtk_window_resize(int /*long*/ handle, int x, int y);

22567

-public static final void gtk_window_resize(int /*long*/ handle, int x, int y) {

22568

+public static final native void _gtk_window_resize(long /*int*/ handle, int x, int y);

22569

+public static final void gtk_window_resize(long /*int*/ handle, int x, int y) {

22570

lock.lock();

22571

try {

22572

_gtk_window_resize(handle, x, y);

22573

@@ -12783,8 +12783,8 @@

22574

* @param window cast=(GtkWindow *)

22575

* @param widget cast=(GtkWidget *)

22576

*/

22577

-public static final native void _gtk_window_set_default(int /*long*/ window, int /*long*/ widget);

22578

-public static final void gtk_window_set_default(int /*long*/ window, int /*long*/ widget) {

22579

+public static final native void _gtk_window_set_default(long /*int*/ window, long /*int*/ widget);

22580

+public static final void gtk_window_set_default(long /*int*/ window, long /*int*/ widget) {

22581

lock.lock();

22582

try {

22583

_gtk_window_set_default(window, widget);

22584

@@ -12796,8 +12796,8 @@

22585

* @param window cast=(GtkWindow *)

22586

* @param setting cast=(gboolean)

22587

*/

22588

-public static final native void _gtk_window_set_destroy_with_parent(int /*long*/ window, boolean setting);

22589

-public static final void gtk_window_set_destroy_with_parent(int /*long*/ window, boolean setting) {

22590

+public static final native void _gtk_window_set_destroy_with_parent(long /*int*/ window, boolean setting);

22591

+public static final void gtk_window_set_destroy_with_parent(long /*int*/ window, boolean setting) {

22592

lock.lock();

22593

try {

22594

_gtk_window_set_destroy_with_parent(window, setting);

22595

@@ -12810,8 +12810,8 @@

22596

* @param window cast=(GtkWindow *)

22597

* @param setting cast=(gboolean)

22598

*/

22599

-public static final native void _gtk_window_set_keep_below(int /*long*/ window, boolean setting);

22600

-public static final void gtk_window_set_keep_below(int /*long*/ window, boolean setting) {

22601

+public static final native void _gtk_window_set_keep_below(long /*int*/ window, boolean setting);

22602

+public static final void gtk_window_set_keep_below(long /*int*/ window, boolean setting) {

22603

lock.lock();

22604

try {

22605

_gtk_window_set_keep_below(window, setting);

22606

@@ -12824,8 +12824,8 @@

22607

* @param geometry_widget cast=(GtkWidget *)

22608

* @param geometry flags=no_out

22609

*/

22610

-public static final native void _gtk_window_set_geometry_hints(int /*long*/ window, int /*long*/ geometry_widget, GdkGeometry geometry, int geom_mask);

22611

-public static final void gtk_window_set_geometry_hints(int /*long*/ window, int /*long*/ geometry_widget, GdkGeometry geometry, int geom_mask) {

22612

+public static final native void _gtk_window_set_geometry_hints(long /*int*/ window, long /*int*/ geometry_widget, GdkGeometry geometry, int geom_mask);

22613

+public static final void gtk_window_set_geometry_hints(long /*int*/ window, long /*int*/ geometry_widget, GdkGeometry geometry, int geom_mask) {

22614

lock.lock();

22615

try {

22616

_gtk_window_set_geometry_hints(window, geometry_widget, geometry, geom_mask);

22617

@@ -12837,8 +12837,8 @@

22618

* @param window cast=(GtkWindow *)

22619

* @param list cast=(GList *)

22620

*/

22621

-public static final native void _gtk_window_set_icon_list(int /*long*/ window, int /*long*/ list);

22622

-public static final void gtk_window_set_icon_list(int /*long*/ window, int /*long*/ list) {

22623

+public static final native void _gtk_window_set_icon_list(long /*int*/ window, long /*int*/ list);

22624

+public static final void gtk_window_set_icon_list(long /*int*/ window, long /*int*/ list) {

22625

lock.lock();

22626

try {

22627

_gtk_window_set_icon_list(window, list);

22628

@@ -12850,8 +12850,8 @@

22629

* @param window cast=(GtkWindow *)

22630

* @param modal cast=(gboolean)

22631

*/

22632

-public static final native void _gtk_window_set_modal(int /*long*/ window, boolean modal);

22633

-public static final void gtk_window_set_modal(int /*long*/ window, boolean modal) {

22634

+public static final native void _gtk_window_set_modal(long /*int*/ window, boolean modal);

22635

+public static final void gtk_window_set_modal(long /*int*/ window, boolean modal) {

22636

lock.lock();

22637

try {

22638

_gtk_window_set_modal(window, modal);

22639

@@ -12863,8 +12863,8 @@

22640

* @method flags=dynamic

22641

* @param window cast=(GtkWindow *)

22642

*/

22643

-public static final native void _gtk_window_set_opacity(int /*long*/ window, double opacity);

22644

-public static final void gtk_window_set_opacity(int /*long*/ window, double opacity) {

22645

+public static final native void _gtk_window_set_opacity(long /*int*/ window, double opacity);

22646

+public static final void gtk_window_set_opacity(long /*int*/ window, double opacity) {

22647

lock.lock();

22648

try {

22649

_gtk_window_set_opacity(window, opacity);

22650

@@ -12877,8 +12877,8 @@

22651

* @param widget cast=(GtkWidget *)

22652

* @param tip_text cast=(const gchar *)

22653

*/

22654

-public static final native void _gtk_widget_set_tooltip_text(int /*long*/ widget, byte[] tip_text);

22655

-public static final void gtk_widget_set_tooltip_text(int /*long*/ widget, byte[] tip_text) {

22656

+public static final native void _gtk_widget_set_tooltip_text(long /*int*/ widget, byte[] tip_text);

22657

+public static final void gtk_widget_set_tooltip_text(long /*int*/ widget, byte[] tip_text) {

22658

lock.lock();

22659

try {

22660

_gtk_widget_set_tooltip_text(widget, tip_text);

22661

@@ -12890,8 +12890,8 @@

22662

* @param widget cast=(GtkWidget *)

22663

* @param parent_window cast=(GdkWindow *)

22664

*/

22665

-public static final native void _gtk_widget_set_parent_window(int /*long*/ widget, int /*long*/ parent_window);

22666

-public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /*long*/ parent_window) {

22667

+public static final native void _gtk_widget_set_parent_window(long /*int*/ widget, long /*int*/ parent_window);

22668

+public static final void gtk_widget_set_parent_window(long /*int*/ widget, long /*int*/ parent_window) {

22669

lock.lock();

22670

try {

22671

_gtk_widget_set_parent_window(widget, parent_window);

22672

@@ -12903,8 +12903,8 @@

22673

* @param window cast=(GtkWindow *)

22674

* @param resizable cast=(gboolean)

22675

*/

22676

-public static final native void _gtk_window_set_resizable(int /*long*/ window, boolean resizable);

22677

-public static final void gtk_window_set_resizable(int /*long*/ window, boolean resizable) {

22678

+public static final native void _gtk_window_set_resizable(long /*int*/ window, boolean resizable);

22679

+public static final void gtk_window_set_resizable(long /*int*/ window, boolean resizable) {

22680

lock.lock();

22681

try {

22682

_gtk_window_set_resizable(window, resizable);

22683

@@ -12916,8 +12916,8 @@

22684

* @param window cast=(GtkWindow *)

22685

* @param title cast=(const gchar *)

22686

*/

22687

-public static final native void _gtk_window_set_title(int /*long*/ window, byte[] title);

22688

-public static final void gtk_window_set_title(int /*long*/ window, byte[] title) {

22689

+public static final native void _gtk_window_set_title(long /*int*/ window, byte[] title);

22690

+public static final void gtk_window_set_title(long /*int*/ window, byte[] title) {

22691

lock.lock();

22692

try {

22693

_gtk_window_set_title(window, title);

22694

@@ -12930,8 +12930,8 @@

22695

* @param window cast=(GtkWindow *)

22696

* @param skips_taskbar cast=(gboolean)

22697

*/

22698

-public static final native void _gtk_window_set_skip_taskbar_hint(int /*long*/ window, boolean skips_taskbar);

22699

-public static final void gtk_window_set_skip_taskbar_hint(int /*long*/ window, boolean skips_taskbar) {

22700

+public static final native void _gtk_window_set_skip_taskbar_hint(long /*int*/ window, boolean skips_taskbar);

22701

+public static final void gtk_window_set_skip_taskbar_hint(long /*int*/ window, boolean skips_taskbar) {

22702

lock.lock();

22703

try {

22704

_gtk_window_set_skip_taskbar_hint(window, skips_taskbar);

22705

@@ -12940,8 +12940,8 @@

22706

}

22707

}

22708

/** @param window cast=(GtkWindow *) */

22709

-public static final native void _gtk_window_set_type_hint(int /*long*/ window, int hint);

22710

-public static final void gtk_window_set_type_hint(int /*long*/ window, int hint) {

22711

+public static final native void _gtk_window_set_type_hint(long /*int*/ window, int hint);

22712

+public static final void gtk_window_set_type_hint(long /*int*/ window, int hint) {

22713

lock.lock();

22714

try {

22715

_gtk_window_set_type_hint(window, hint);

22716

@@ -12953,8 +12953,8 @@

22717

* @param window cast=(GtkWindow *)

22718

* @param parent cast=(GtkWindow *)

22719

*/

22720

-public static final native void _gtk_window_set_transient_for(int /*long*/ window, int /*long*/ parent);

22721

-public static final void gtk_window_set_transient_for(int /*long*/ window, int /*long*/ parent) {

22722

+public static final native void _gtk_window_set_transient_for(long /*int*/ window, long /*int*/ parent);

22723

+public static final void gtk_window_set_transient_for(long /*int*/ window, long /*int*/ parent) {

22724

lock.lock();

22725

try {

22726

_gtk_window_set_transient_for(window, parent);

22727

@@ -12963,8 +12963,8 @@

22728

}

22729

}

22730

/** @param handle cast=(GtkWindow *) */

22731

-public static final native void _gtk_window_unmaximize(int /*long*/ handle);

22732

-public static final void gtk_window_unmaximize(int /*long*/ handle) {

22733

+public static final native void _gtk_window_unmaximize(long /*int*/ handle);

22734

+public static final void gtk_window_unmaximize(long /*int*/ handle) {

22735

lock.lock();

22736

try {

22737

_gtk_window_unmaximize(handle);

22738

@@ -12977,256 +12977,256 @@

22739

* @param src cast=(const void *),flags=no_out

22740

* @param size cast=(size_t)

22741

*/

22742

-public static final native void memmove(int /*long*/ dest, GInterfaceInfo src, int size);

22743

+public static final native void memmove(long /*int*/ dest, GInterfaceInfo src, int size);

22744

/**

22745

* @param dest cast=(void *),flags=no_in

22746

* @param src cast=(const void *),flags=no_out

22747

*/

22748

-public static final native void memmove(int /*long*/ dest, GObjectClass src);

22749

+public static final native void memmove(long /*int*/ dest, GObjectClass src);

22750

/**

22751

* @param dest cast=(void *)

22752

* @param src cast=(const void *),flags=no_out

22753

* @param size cast=(size_t)

22754

*/

22755

-public static final native void memmove(int /*long*/ dest, GTypeInfo src, int size);

22756

+public static final native void memmove(long /*int*/ dest, GTypeInfo src, int size);

22757

/**

22758

* @param dest cast=(void *)

22759

* @param src cast=(const void *),flags=no_out

22760

* @param size cast=(size_t)

22761

*/

22762

-public static final native void memmove(int /*long*/ dest, GtkTargetEntry src, int /*long*/ size);

22763

+public static final native void memmove(long /*int*/ dest, GtkTargetEntry src, long /*int*/ size);

22764

/**

22765

* @param dest cast=(void *)

22766

* @param src cast=(const void *),flags=no_out

22767

*/

22768

-public static final native void memmove(int /*long*/ dest, GtkAdjustment src);

22769

+public static final native void memmove(long /*int*/ dest, GtkAdjustment src);

22770

/**

22771

* @param dest cast=(void *)

22772

* @param src cast=(const void *),flags=no_out

22773

* @param size cast=(size_t)

22774

*/

22775

-public static final native void memmove(int /*long*/ dest, GdkEventButton src, int /*long*/ size);

22776

+public static final native void memmove(long /*int*/ dest, GdkEventButton src, long /*int*/ size);

22777

/**

22778

* @param dest cast=(void *)

22779

* @param src cast=(const void *),flags=no_out

22780

* @param size cast=(size_t)

22781

*/

22782

-public static final native void memmove(int /*long*/ dest, GdkEventExpose src, int /*long*/ size);

22783

+public static final native void memmove(long /*int*/ dest, GdkEventExpose src, long /*int*/ size);

22784

/**

22785

* @param dest cast=(void *)

22786

* @param src cast=(const void *),flags=no_out

22787

* @param size cast=(size_t)

22788

*/

22789

-public static final native void memmove(int /*long*/ dest, GdkEventMotion src, int /*long*/ size);

22790

+public static final native void memmove(long /*int*/ dest, GdkEventMotion src, long /*int*/ size);

22791

/** @param src flags=no_out */

22792

-public static final native void memmove(int /*long*/ dest, GtkWidgetClass src);

22793

+public static final native void memmove(long /*int*/ dest, GtkWidgetClass src);

22794

/**

22795

* @param dest cast=(void *)

22796

* @param src cast=(const void *),flags=no_out

22797

* @param size cast=(size_t)

22798

*/

22799

-public static final native void memmove(int /*long*/ dest, PangoAttribute src, int /*long*/ size);

22800

+public static final native void memmove(long /*int*/ dest, PangoAttribute src, long /*int*/ size);

22801

/**

22802

* @param dest cast=(void *),flags=no_in

22803

* @param src cast=(const void *)

22804

*/

22805

-public static final native void memmove(GObjectClass dest, int /*long*/ src);

22806

+public static final native void memmove(GObjectClass dest, long /*int*/ src);

22807

/**

22808

* @param dest cast=(void *),flags=no_in

22809

* @param src cast=(const void *)

22810

* @param size cast=(size_t)

22811

*/

22812

-public static final native void memmove(GTypeQuery dest, int /*long*/ src, int /*long*/ size);

22813

+public static final native void memmove(GTypeQuery dest, long /*int*/ src, long /*int*/ size);

22814

/**

22815

* @param dest cast=(void *),flags=no_in

22816

* @param src cast=(const void *)

22817

*/

22818

-public static final native void memmove(GtkColorSelectionDialog dest, int /*long*/ src);

22819

+public static final native void memmove(GtkColorSelectionDialog dest, long /*int*/ src);

22820

/**

22821

* @param dest cast=(void *),flags=no_in

22822

* @param src cast=(const void *)

22823

*/

22824

-public static final native void memmove(GtkFileSelection dest, int /*long*/ src);

22825

+public static final native void memmove(GtkFileSelection dest, long /*int*/ src);

22826

/**

22827

* @param dest cast=(void *),flags=no_in

22828

* @param src cast=(const void *)

22829

* @param size cast=(size_t)

22830

*/

22831

-public static final native void memmove(GdkDragContext dest, int /*long*/ src, int /*long*/ size);

22832

+public static final native void memmove(GdkDragContext dest, long /*int*/ src, long /*int*/ size);

22833

/**

22834

* @param dest cast=(void *),flags=no_in

22835

* @param src cast=(const void *)

22836

* @param size cast=(size_t)

22837

*/

22838

-public static final native void memmove(GtkSelectionData dest, int /*long*/ src, int /*long*/ size);

22839

+public static final native void memmove(GtkSelectionData dest, long /*int*/ src, long /*int*/ size);

22840

/** @param dest flags=no_in */

22841

-public static final native void memmove(GtkWidgetClass dest, int /*long*/ src);

22842

+public static final native void memmove(GtkWidgetClass dest, long /*int*/ src);

22843

/**

22844

* @param dest cast=(void *),flags=no_in

22845

* @param src cast=(const void *)

22846

* @param size cast=(size_t)

22847

*/

22848

-public static final native void memmove(GtkTargetPair dest, int /*long*/ src, int /*long*/ size);

22849

+public static final native void memmove(GtkTargetPair dest, long /*int*/ src, long /*int*/ size);

22850

/**

22851

* @param dest cast=(void *),flags=no_in

22852

* @param src cast=(const void *)

22853

*/

22854

-public static final native void memmove(GtkCombo dest, int /*long*/ src);

22855

+public static final native void memmove(GtkCombo dest, long /*int*/ src);

22856

/**

22857

* @param dest cast=(void *),flags=no_in

22858

* @param src cast=(const void *)

22859

*/

22860

-public static final native void memmove(GtkAdjustment dest, int /*long*/ src);

22861

+public static final native void memmove(GtkAdjustment dest, long /*int*/ src);

22862

/**

22863

* @param dest cast=(void *),flags=no_in

22864

* @param src cast=(const void *)

22865

* @param size cast=(size_t)

22866

*/

22867

-public static final native void memmove(GtkBorder dest, int /*long*/ src, int /*long*/ size);

22868

+public static final native void memmove(GtkBorder dest, long /*int*/ src, long /*int*/ size);

22869

/**

22870

* @param dest cast=(void *),flags=no_in

22871

* @param src cast=(const void *)

22872

* @param size cast=(size_t)

22873

*/

22874

-public static final native void memmove(GdkColor dest, int /*long*/ src, int /*long*/ size);

22875

+public static final native void memmove(GdkColor dest, long /*int*/ src, long /*int*/ size);

22876

/**

22877

* @param dest cast=(void *),flags=no_in

22878

* @param src cast=(const void *)

22879

* @param size cast=(size_t)

22880

*/

22881

-public static final native void memmove(GdkEvent dest, int /*long*/ src, int /*long*/ size);

22882

+public static final native void memmove(GdkEvent dest, long /*int*/ src, long /*int*/ size);

22883

/**

22884

* @param dest cast=(void *),flags=no_in

22885

* @param src cast=(const void *)

22886

* @param size cast=(size_t)

22887

*/

22888

-public static final native void memmove(GdkEventAny dest, int /*long*/ src, int /*long*/ size);

22889

+public static final native void memmove(GdkEventAny dest, long /*int*/ src, long /*int*/ size);

22890

/**

22891

* @param dest cast=(void *),flags=no_in

22892

* @param src cast=(const void *)

22893

* @param size cast=(size_t)

22894

*/

22895

-public static final native void memmove(GdkEventButton dest, int /*long*/ src, int /*long*/ size);

22896

+public static final native void memmove(GdkEventButton dest, long /*int*/ src, long /*int*/ size);

22897

/**

22898

* @param dest cast=(void *),flags=no_in

22899

* @param src cast=(const void *)

22900

* @param size cast=(size_t)

22901

*/

22902

-public static final native void memmove(GdkEventCrossing dest, int /*long*/ src, int /*long*/ size);

22903

+public static final native void memmove(GdkEventCrossing dest, long /*int*/ src, long /*int*/ size);

22904

/**

22905

* @param dest cast=(void *),flags=no_in

22906

* @param src cast=(const void *)

22907

* @param size cast=(size_t)

22908

*/

22909

-public static final native void memmove(GdkEventExpose dest, int /*long*/ src, int /*long*/ size);

22910

+public static final native void memmove(GdkEventExpose dest, long /*int*/ src, long /*int*/ size);

22911

/**

22912

* @param dest cast=(void *),flags=no_in

22913

* @param src cast=(const void *)

22914

* @param size cast=(size_t)

22915

*/

22916

-public static final native void memmove(GdkEventFocus dest, int /*long*/ src, int /*long*/ size);

22917

+public static final native void memmove(GdkEventFocus dest, long /*int*/ src, long /*int*/ size);

22918

/**

22919

* @param dest cast=(void *),flags=no_in

22920

* @param src cast=(const void *)

22921

* @param size cast=(size_t)

22922

*/

22923

-public static final native void memmove(GdkEventKey dest, int /*long*/ src, int /*long*/ size);

22924

+public static final native void memmove(GdkEventKey dest, long /*int*/ src, long /*int*/ size);

22925

/**

22926

* @param dest cast=(void *),flags=no_in

22927

* @param src cast=(const void *)

22928

* @param size cast=(size_t)

22929

*/

22930

-public static final native void memmove(GdkEventMotion dest, int /*long*/ src, int /*long*/ size);

22931

+public static final native void memmove(GdkEventMotion dest, long /*int*/ src, long /*int*/ size);

22932

/**

22933

* @param dest cast=(void *),flags=no_in

22934

* @param src cast=(const void *)

22935

* @param size cast=(size_t)

22936

*/

22937

-public static final native void memmove(GdkEventScroll dest, int /*long*/ src, int /*long*/ size);

22938

+public static final native void memmove(GdkEventScroll dest, long /*int*/ src, long /*int*/ size);

22939

/**

22940

* @param dest cast=(void *),flags=no_in

22941

* @param src cast=(const void *)

22942

* @param size cast=(size_t)

22943

*/

22944

-public static final native void memmove(GdkEventVisibility dest, int /*long*/ src, int /*long*/ size);

22945

+public static final native void memmove(GdkEventVisibility dest, long /*int*/ src, long /*int*/ size);

22946

/**

22947

* @param dest cast=(void *),flags=no_in

22948

* @param src cast=(const void *)

22949

* @param size cast=(size_t)

22950

*/

22951

-public static final native void memmove(GdkEventWindowState dest, int /*long*/ src, int /*long*/ size);

22952

-public static final native void memmove(int /*long*/ dest, GtkCellRendererClass src);

22953

-public static final native void memmove(GtkCellRendererClass dest, int /*long*/ src);

22954

+public static final native void memmove(GdkEventWindowState dest, long /*int*/ src, long /*int*/ size);

22955

+public static final native void memmove(long /*int*/ dest, GtkCellRendererClass src);

22956

+public static final native void memmove(GtkCellRendererClass dest, long /*int*/ src);

22957

/**

22958

* @param dest cast=(void *),flags=no_in

22959

* @param src cast=(const void *)

22960

*/

22961

-public static final native void memmove(GtkFixed dest, int /*long*/ src);

22962

+public static final native void memmove(GtkFixed dest, long /*int*/ src);

22963

/**

22964

* @param dest cast=(void *),flags=no_in

22965

* @param src cast=(const void *),flags=no_out

22966

*/

22967

-public static final native void memmove(int /*long*/ dest, GtkFixed src);

22968

+public static final native void memmove(long /*int*/ dest, GtkFixed src);

22969

/**

22970

* @param dest cast=(void *),flags=no_in

22971

* @param src cast=(const void *)

22972

*/

22973

-public static final native void memmove(GdkVisual dest, int /*long*/ src);

22974

+public static final native void memmove(GdkVisual dest, long /*int*/ src);

22975

/**

22976

* @param dest cast=(void *),flags=no_in

22977

* @param src cast=(const void *)

22978

*/

22979

-public static final native void memmove(GdkImage dest, int /*long*/ src);

22980

+public static final native void memmove(GdkImage dest, long /*int*/ src);

22981

/**

22982

* @param dest cast=(void *),flags=no_in

22983

* @param src cast=(const void *)

22984

* @param size cast=(size_t)

22985

*/

22986

-public static final native void memmove(GdkRectangle dest, int /*long*/ src, int /*long*/ size);

22987

+public static final native void memmove(GdkRectangle dest, long /*int*/ src, long /*int*/ size);

22988

/**

22989

* @param dest cast=(void *),flags=no_in

22990

* @param src cast=(const void *)

22991

* @param size cast=(size_t)

22992

*/

22993

-public static final native void memmove(PangoAttribute dest, int /*long*/ src, int /*long*/ size);

22994

+public static final native void memmove(PangoAttribute dest, long /*int*/ src, long /*int*/ size);

22995

/**

22996

* @param dest cast=(void *),flags=no_in

22997

* @param src cast=(const void *)

22998

* @param size cast=(size_t)

22999

*/

23000

-public static final native void memmove(PangoAttrColor dest, int /*long*/ src, int /*long*/ size);

23001

+public static final native void memmove(PangoAttrColor dest, long /*int*/ src, long /*int*/ size);

23002

/**

23003

* @param dest cast=(void *),flags=no_in

23004

* @param src cast=(const void *)

23005

* @param size cast=(size_t)

23006

*/

23007

-public static final native void memmove(PangoAttrInt dest, int /*long*/ src, int /*long*/ size);

23008

+public static final native void memmove(PangoAttrInt dest, long /*int*/ src, long /*int*/ size);

23009

/**

23010

* @param dest cast=(void *),flags=no_in

23011

* @param src cast=(const void *)

23012

* @param size cast=(size_t)

23013

*/

23014

-public static final native void memmove(PangoItem dest, int /*long*/ src, int /*long*/ size);

23015

+public static final native void memmove(PangoItem dest, long /*int*/ src, long /*int*/ size);

23016

/**

23017

* @param dest cast=(void *),flags=no_in

23018

* @param src cast=(const void *)

23019

* @param size cast=(size_t)

23020

*/

23021

-public static final native void memmove(PangoLayoutLine dest, int /*long*/ src, int /*long*/ size);

23022

+public static final native void memmove(PangoLayoutLine dest, long /*int*/ src, long /*int*/ size);

23023

/**

23024

* @param dest cast=(void *),flags=no_in

23025

* @param src cast=(const void *)

23026

* @param size cast=(size_t)

23027

*/

23028

-public static final native void memmove(PangoLayoutRun dest, int /*long*/ src, int /*long*/ size);

23029

+public static final native void memmove(PangoLayoutRun dest, long /*int*/ src, long /*int*/ size);

23030

/**

23031

* @param dest cast=(void *),flags=no_in

23032

* @param src cast=(const void *)

23033

* @param size cast=(size_t)

23034

*/

23035

-public static final native void memmove(PangoLogAttr dest, int /*long*/ src, int /*long*/ size);

23036

-public static final native int /*long*/ _pango_attr_background_new (short red, short green, short blue);

23037

-public static final int /*long*/ pango_attr_background_new (short red, short green, short blue) {

23038

+public static final native void memmove(PangoLogAttr dest, long /*int*/ src, long /*int*/ size);

23039

+public static final native long /*int*/ _pango_attr_background_new (short red, short green, short blue);

23040

+public static final long /*int*/ pango_attr_background_new (short red, short green, short blue) {

23041

lock.lock();

23042

try {

23043

return _pango_attr_background_new(red, green, blue);

23044

@@ -13235,8 +13235,8 @@

23045

}

23046

}

23047

/** @param desc cast=(const PangoFontDescription *) */

23048

-public static final native int /*long*/ _pango_attr_font_desc_new(int /*long*/ desc);

23049

-public static final int /*long*/ pango_attr_font_desc_new(int /*long*/ desc) {

23050

+public static final native long /*int*/ _pango_attr_font_desc_new(long /*int*/ desc);

23051

+public static final long /*int*/ pango_attr_font_desc_new(long /*int*/ desc) {

23052

lock.lock();

23053

try {

23054

return _pango_attr_font_desc_new(desc);

23055

@@ -13244,8 +13244,8 @@

23056

lock.unlock();

23057

}

23058

}

23059

-public static final native int /*long*/ _pango_attr_foreground_new (short red, short green, short blue);

23060

-public static final int /*long*/ pango_attr_foreground_new (short red, short green, short blue) {

23061

+public static final native long /*int*/ _pango_attr_foreground_new (short red, short green, short blue);

23062

+public static final long /*int*/ pango_attr_foreground_new (short red, short green, short blue) {

23063

lock.lock();

23064

try {

23065

return _pango_attr_foreground_new(red, green, blue);

23066

@@ -13253,8 +13253,8 @@

23067

lock.unlock();

23068

}

23069

}

23070

-public static final native int /*long*/ _pango_attr_rise_new(int rise);

23071

-public static final int /*long*/ pango_attr_rise_new(int rise) {

23072

+public static final native long /*int*/ _pango_attr_rise_new(int rise);

23073

+public static final long /*int*/ pango_attr_rise_new(int rise) {

23074

lock.lock();

23075

try {

23076

return _pango_attr_rise_new(rise);

23077

@@ -13266,8 +13266,8 @@

23078

* @param ink_rect flags=no_out

23079

* @param logical_rect flags=no_out

23080

*/

23081

-public static final native int /*long*/ _pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect);

23082

-public static final int /*long*/ pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect) {

23083

+public static final native long /*int*/ _pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect);

23084

+public static final long /*int*/ pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect) {

23085

lock.lock();

23086

try {

23087

return _pango_attr_shape_new(ink_rect, logical_rect);

23088

@@ -13279,8 +13279,8 @@

23089

* @param list cast=(PangoAttrList *)

23090

* @param attr cast=(PangoAttribute *)

23091

*/

23092

-public static final native void _pango_attr_list_insert(int /*long*/ list, int /*long*/ attr);

23093

-public static final void pango_attr_list_insert(int /*long*/ list, int /*long*/ attr) {

23094

+public static final native void _pango_attr_list_insert(long /*int*/ list, long /*int*/ attr);

23095

+public static final void pango_attr_list_insert(long /*int*/ list, long /*int*/ attr) {

23096

lock.lock();

23097

try {

23098

_pango_attr_list_insert(list, attr);

23099

@@ -13292,8 +13292,8 @@

23100

* @param list cast=(PangoAttrList *)

23101

* @param attr cast=(PangoAttribute *)

23102

*/

23103

-public static final native void _pango_attr_list_change(int /*long*/ list, int /*long*/ attr);

23104

-public static final void pango_attr_list_change(int /*long*/ list, int /*long*/ attr) {

23105

+public static final native void _pango_attr_list_change(long /*int*/ list, long /*int*/ attr);

23106

+public static final void pango_attr_list_change(long /*int*/ list, long /*int*/ attr) {

23107

lock.lock();

23108

try {

23109

_pango_attr_list_change(list, attr);

23110

@@ -13302,8 +13302,8 @@

23111

}

23112

}

23113

/** @param list cast=(PangoAttrList *) */

23114

-public static final native int /*long*/ _pango_attr_list_get_iterator(int /*long*/ list);

23115

-public static final int /*long*/ pango_attr_list_get_iterator(int /*long*/ list) {

23116

+public static final native long /*int*/ _pango_attr_list_get_iterator(long /*int*/ list);

23117

+public static final long /*int*/ pango_attr_list_get_iterator(long /*int*/ list) {

23118

lock.lock();

23119

try {

23120

return _pango_attr_list_get_iterator(list);

23121

@@ -13312,8 +13312,8 @@

23122

}

23123

}

23124

/** @param iterator cast=(PangoAttrIterator *) */

23125

-public static final native boolean _pango_attr_iterator_next(int /*long*/ iterator);

23126

-public static final boolean pango_attr_iterator_next(int /*long*/ iterator) {

23127

+public static final native boolean _pango_attr_iterator_next(long /*int*/ iterator);

23128

+public static final boolean pango_attr_iterator_next(long /*int*/ iterator) {

23129

lock.lock();

23130

try {

23131

return _pango_attr_iterator_next(iterator);

23132

@@ -13322,8 +13322,8 @@

23133

}

23134

}

23135

/** @param iterator cast=(PangoAttrIterator *) */

23136

-public static final native void _pango_attr_iterator_range(int /*long*/ iterator, int[] start, int[] end);

23137

-public static final void pango_attr_iterator_range(int /*long*/ iterator, int[] start, int[] end) {

23138

+public static final native void _pango_attr_iterator_range(long /*int*/ iterator, int[] start, int[] end);

23139

+public static final void pango_attr_iterator_range(long /*int*/ iterator, int[] start, int[] end) {

23140

lock.lock();

23141

try {

23142

_pango_attr_iterator_range(iterator, start, end);

23143

@@ -13335,8 +13335,8 @@

23144

* @param iterator cast=(PangoAttrIterator *)

23145

* @param type cast=(PangoAttrType)

23146

*/

23147

-public static final native int /*long*/ _pango_attr_iterator_get(int /*long*/ iterator, int type);

23148

-public static final int /*long*/ pango_attr_iterator_get(int /*long*/ iterator, int type) {

23149

+public static final native long /*int*/ _pango_attr_iterator_get(long /*int*/ iterator, int type);

23150

+public static final long /*int*/ pango_attr_iterator_get(long /*int*/ iterator, int type) {

23151

lock.lock();

23152

try {

23153

return _pango_attr_iterator_get(iterator, type);

23154

@@ -13345,8 +13345,8 @@

23155

}

23156

}

23157

/** @param iterator cast=(PangoAttrIterator *) */

23158

-public static final native int /*long*/ _pango_attr_iterator_get_attrs(int /*long*/ iterator);

23159

-public static final int /*long*/ pango_attr_iterator_get_attrs(int /*long*/ iterator) {

23160

+public static final native long /*int*/ _pango_attr_iterator_get_attrs(long /*int*/ iterator);

23161

+public static final long /*int*/ pango_attr_iterator_get_attrs(long /*int*/ iterator) {

23162

lock.lock();

23163

try {

23164

return _pango_attr_iterator_get_attrs(iterator);

23165

@@ -13356,8 +13356,8 @@

23166

}

23167

23168

/** @param iterator cast=(PangoAttrIterator *) */

23169

-public static final native void _pango_attr_iterator_destroy(int /*long*/ iterator);

23170

-public static final void pango_attr_iterator_destroy(int /*long*/ iterator) {

23171

+public static final native void _pango_attr_iterator_destroy(long /*int*/ iterator);

23172

+public static final void pango_attr_iterator_destroy(long /*int*/ iterator) {

23173

lock.lock();

23174

try {

23175

_pango_attr_iterator_destroy(iterator);

23176

@@ -13365,8 +13365,8 @@

23177

lock.unlock();

23178

}

23179

}

23180

-public static final native int /*long*/ _pango_attr_list_new();

23181

-public static final int /*long*/ pango_attr_list_new() {

23182

+public static final native long /*int*/ _pango_attr_list_new();

23183

+public static final long /*int*/ pango_attr_list_new() {

23184

lock.lock();

23185

try {

23186

return _pango_attr_list_new();

23187

@@ -13375,8 +13375,8 @@

23188

}

23189

}

23190

/** @param list cast=(PangoAttrList *) */

23191

-public static final native void _pango_attr_list_unref(int /*long*/ list);

23192

-public static final void pango_attr_list_unref(int /*long*/ list) {

23193

+public static final native void _pango_attr_list_unref(long /*int*/ list);

23194

+public static final void pango_attr_list_unref(long /*int*/ list) {

23195

lock.lock();

23196

try {

23197

_pango_attr_list_unref(list);

23198

@@ -13385,8 +13385,8 @@

23199

}

23200

}

23201

/** @method flags=dynamic */

23202

-public static final native int /*long*/ _pango_attr_strikethrough_color_new(short red, short green, short blue);

23203

-public static final int /*long*/ pango_attr_strikethrough_color_new(short red, short green, short blue) {

23204

+public static final native long /*int*/ _pango_attr_strikethrough_color_new(short red, short green, short blue);

23205

+public static final long /*int*/ pango_attr_strikethrough_color_new(short red, short green, short blue) {

23206

lock.lock();

23207

try {

23208

return _pango_attr_strikethrough_color_new(red, green, blue);

23209

@@ -13394,8 +13394,8 @@

23210

lock.unlock();

23211

}

23212

}

23213

-public static final native int /*long*/ _pango_attr_strikethrough_new(boolean strikethrough);

23214

-public static final int /*long*/ pango_attr_strikethrough_new(boolean strikethrough) {

23215

+public static final native long /*int*/ _pango_attr_strikethrough_new(boolean strikethrough);

23216

+public static final long /*int*/ pango_attr_strikethrough_new(boolean strikethrough) {

23217

lock.lock();

23218

try {

23219

return _pango_attr_strikethrough_new(strikethrough);

23220

@@ -13404,8 +13404,8 @@

23221

}

23222

}

23223

/** @method flags=dynamic */

23224

-public static final native int /*long*/ _pango_attr_underline_color_new(short red, short green, short blue);

23225

-public static final int /*long*/ pango_attr_underline_color_new(short red, short green, short blue) {

23226

+public static final native long /*int*/ _pango_attr_underline_color_new(short red, short green, short blue);

23227

+public static final long /*int*/ pango_attr_underline_color_new(short red, short green, short blue) {

23228

lock.lock();

23229

try {

23230

return _pango_attr_underline_color_new(red, green, blue);

23231

@@ -13413,8 +13413,8 @@

23232

lock.unlock();

23233

}

23234

}

23235

-public static final native int /*long*/ _pango_attr_underline_new(int underline);

23236

-public static final int /*long*/ pango_attr_underline_new(int underline) {

23237

+public static final native long /*int*/ _pango_attr_underline_new(int underline);

23238

+public static final long /*int*/ pango_attr_underline_new(int underline) {

23239

lock.lock();

23240

try {

23241

return _pango_attr_underline_new(underline);

23242

@@ -13422,8 +13422,8 @@

23243

lock.unlock();

23244

}

23245

}

23246

-public static final native int /*long*/ _pango_attr_weight_new(int weight);

23247

-public static final int /*long*/ pango_attr_weight_new(int weight) {

23248

+public static final native long /*int*/ _pango_attr_weight_new(int weight);

23249

+public static final long /*int*/ pango_attr_weight_new(int weight) {

23250

lock.lock();

23251

try {

23252

return _pango_attr_weight_new(weight);

23253

@@ -13432,8 +13432,8 @@

23254

}

23255

}

23256

/** @method flags=dynamic */

23257

-public static final native int /*long*/ _pango_cairo_font_map_get_default();

23258

-public static final int /*long*/ pango_cairo_font_map_get_default() {

23259

+public static final native long /*int*/ _pango_cairo_font_map_get_default();

23260

+public static final long /*int*/ pango_cairo_font_map_get_default() {

23261

lock.lock();

23262

try {

23263

return _pango_cairo_font_map_get_default();

23264

@@ -13442,8 +13442,8 @@

23265

}

23266

}

23267

/** @method flags=dynamic */

23268

-public static final native int /*long*/ _pango_cairo_font_map_new();

23269

-public static final int /*long*/ pango_cairo_font_map_new() {

23270

+public static final native long /*int*/ _pango_cairo_font_map_new();

23271

+public static final long /*int*/ pango_cairo_font_map_new() {

23272

lock.lock();

23273

try {

23274

return _pango_cairo_font_map_new();

23275

@@ -13452,8 +13452,8 @@

23276

}

23277

}

23278

/** @method flags=dynamic */

23279

-public static final native int /*long*/ _pango_cairo_font_map_create_context(int /*long*/ fontmap);

23280

-public static final int /*long*/ pango_cairo_font_map_create_context(int /*long*/ fontmap) {

23281

+public static final native long /*int*/ _pango_cairo_font_map_create_context(long /*int*/ fontmap);

23282

+public static final long /*int*/ pango_cairo_font_map_create_context(long /*int*/ fontmap) {

23283

lock.lock();

23284

try {

23285

return _pango_cairo_font_map_create_context(fontmap);

23286

@@ -13462,8 +13462,8 @@

23287

}

23288

}

23289

/** @method flags=dynamic */

23290

-public static final native int /*long*/ _pango_cairo_create_layout(int /*long*/ cairo);

23291

-public static final int /*long*/ pango_cairo_create_layout(int /*long*/ cairo) {

23292

+public static final native long /*int*/ _pango_cairo_create_layout(long /*int*/ cairo);

23293

+public static final long /*int*/ pango_cairo_create_layout(long /*int*/ cairo) {

23294

lock.lock();

23295

try {

23296

return _pango_cairo_create_layout(cairo);

23297

@@ -13475,8 +13475,8 @@

23298

* @method flags=dynamic

23299

* @param context cast=(PangoContext *)

23300

*/

23301

-public static final native int /*long*/ _pango_cairo_context_get_font_options(int /*long*/ context);

23302

-public static final int /*long*/ pango_cairo_context_get_font_options(int /*long*/ context) {

23303

+public static final native long /*int*/ _pango_cairo_context_get_font_options(long /*int*/ context);

23304

+public static final long /*int*/ pango_cairo_context_get_font_options(long /*int*/ context) {

23305

lock.lock();

23306

try {

23307

return _pango_cairo_context_get_font_options(context);

23308

@@ -13488,8 +13488,8 @@

23309

* @method flags=dynamic

23310

* @param context cast=(PangoContext *)

23311

*/

23312

-public static final native void _pango_cairo_context_set_font_options(int /*long*/ context, int /*long*/ options);

23313

-public static final void pango_cairo_context_set_font_options(int /*long*/ context, int /*long*/ options) {

23314

+public static final native void _pango_cairo_context_set_font_options(long /*int*/ context, long /*int*/ options);

23315

+public static final void pango_cairo_context_set_font_options(long /*int*/ context, long /*int*/ options) {

23316

lock.lock();

23317

try {

23318

_pango_cairo_context_set_font_options(context, options);

23319

@@ -13498,8 +13498,8 @@

23320

}

23321

}

23322

/** @method flags=dynamic */

23323

-public static final native void _pango_cairo_font_map_set_resolution(int /*long*/ fontmap, double dpi);

23324

-public static final void pango_cairo_font_map_set_resolution(int /*long*/ fontmap, double dpi) {

23325

+public static final native void _pango_cairo_font_map_set_resolution(long /*int*/ fontmap, double dpi);

23326

+public static final void pango_cairo_font_map_set_resolution(long /*int*/ fontmap, double dpi) {

23327

lock.lock();

23328

try {

23329

_pango_cairo_font_map_set_resolution(fontmap, dpi);

23330

@@ -13508,8 +13508,8 @@

23331

}

23332

}

23333

/** @method flags=dynamic */

23334

-public static final native void _pango_cairo_layout_path(int /*long*/ cairo, int /*long*/ layout);

23335

-public static final void pango_cairo_layout_path(int /*long*/ cairo, int /*long*/ layout) {

23336

+public static final native void _pango_cairo_layout_path(long /*int*/ cairo, long /*int*/ layout);

23337

+public static final void pango_cairo_layout_path(long /*int*/ cairo, long /*int*/ layout) {

23338

lock.lock();

23339

try {

23340

_pango_cairo_layout_path(cairo, layout);

23341

@@ -13518,8 +13518,8 @@

23342

}

23343

}

23344

/** @method flags=dynamic */

23345

-public static final native void _pango_cairo_show_layout(int /*long*/ cairo, int /*long*/ layout);

23346

-public static final void pango_cairo_show_layout(int /*long*/ cairo, int /*long*/ layout) {

23347

+public static final native void _pango_cairo_show_layout(long /*int*/ cairo, long /*int*/ layout);

23348

+public static final void pango_cairo_show_layout(long /*int*/ cairo, long /*int*/ layout) {

23349

lock.lock();

23350

try {

23351

_pango_cairo_show_layout(cairo, layout);

23352

@@ -13528,8 +13528,8 @@

23353

}

23354

}

23355

/** @param context cast=(PangoContext *) */

23356

-public static final native int _pango_context_get_base_dir(int /*long*/ context);

23357

-public static final int pango_context_get_base_dir(int /*long*/ context) {

23358

+public static final native int _pango_context_get_base_dir(long /*int*/ context);

23359

+public static final int pango_context_get_base_dir(long /*int*/ context) {

23360

lock.lock();

23361

try {

23362

return _pango_context_get_base_dir(context);

23363

@@ -13538,8 +13538,8 @@

23364

}

23365

}

23366

/** @param context cast=(PangoContext *) */

23367

-public static final native int /*long*/ _pango_context_get_language(int /*long*/ context);

23368

-public static final int /*long*/ pango_context_get_language(int /*long*/ context) {

23369

+public static final native long /*int*/ _pango_context_get_language(long /*int*/ context);

23370

+public static final long /*int*/ pango_context_get_language(long /*int*/ context) {

23371

lock.lock();

23372

try {

23373

return _pango_context_get_language(context);

23374

@@ -13552,8 +13552,8 @@

23375

* @param desc cast=(const PangoFontDescription *)

23376

* @param language cast=(PangoLanguage *)

23377

*/

23378

-public static final native int /*long*/ _pango_context_get_metrics(int /*long*/ context, int /*long*/ desc, int /*long*/ language);

23379

-public static final int /*long*/ pango_context_get_metrics(int /*long*/ context, int /*long*/ desc, int /*long*/ language) {

23380

+public static final native long /*int*/ _pango_context_get_metrics(long /*int*/ context, long /*int*/ desc, long /*int*/ language);

23381

+public static final long /*int*/ pango_context_get_metrics(long /*int*/ context, long /*int*/ desc, long /*int*/ language) {

23382

lock.lock();

23383

try {

23384

return _pango_context_get_metrics(context, desc, language);

23385

@@ -13566,8 +13566,8 @@

23386

* @param families cast=(PangoFontFamily ***)

23387

* @param n_families cast=(int *)

23388

*/

23389

-public static final native void _pango_context_list_families(int /*long*/ context, int /*long*/[] families, int[] n_families);

23390

-public static final void pango_context_list_families(int /*long*/ context, int /*long*/[] families, int[] n_families) {

23391

+public static final native void _pango_context_list_families(long /*int*/ context, long /*int*/[] families, int[] n_families);

23392

+public static final void pango_context_list_families(long /*int*/ context, long /*int*/[] families, int[] n_families) {

23393

lock.lock();

23394

try {

23395

_pango_context_list_families(context, families, n_families);

23396

@@ -13576,8 +13576,8 @@

23397

}

23398

}

23399

/** @param context cast=(PangoContext *) */

23400

-public static final native void _pango_context_set_base_dir(int /*long*/ context, int direction);

23401

-public static final void pango_context_set_base_dir(int /*long*/ context, int direction) {

23402

+public static final native void _pango_context_set_base_dir(long /*int*/ context, int direction);

23403

+public static final void pango_context_set_base_dir(long /*int*/ context, int direction) {

23404

lock.lock();

23405

try {

23406

_pango_context_set_base_dir(context, direction);

23407

@@ -13589,8 +13589,8 @@

23408

* @param context cast=(PangoContext *)

23409

* @param language cast=(PangoLanguage *)

23410

*/

23411

-public static final native void _pango_context_set_language(int /*long*/ context, int /*long*/ language);

23412

-public static final void pango_context_set_language(int /*long*/ context, int /*long*/ language) {

23413

+public static final native void _pango_context_set_language(long /*int*/ context, long /*int*/ language);

23414

+public static final void pango_context_set_language(long /*int*/ context, long /*int*/ language) {

23415

lock.lock();

23416

try {

23417

_pango_context_set_language(context, language);

23418

@@ -13599,8 +13599,8 @@

23419

}

23420

}

23421

/** @param desc cast=(PangoFontDescription *) */

23422

-public static final native int /*long*/ _pango_font_description_copy(int /*long*/ desc);

23423

-public static final int /*long*/ pango_font_description_copy(int /*long*/ desc) {

23424

+public static final native long /*int*/ _pango_font_description_copy(long /*int*/ desc);

23425

+public static final long /*int*/ pango_font_description_copy(long /*int*/ desc) {

23426

lock.lock();

23427

try {

23428

return _pango_font_description_copy(desc);

23429

@@ -13609,8 +13609,8 @@

23430

}

23431

}

23432

/** @param desc cast=(PangoFontDescription *) */

23433

-public static final native void _pango_font_description_free(int /*long*/ desc);

23434

-public static final void pango_font_description_free(int /*long*/ desc) {

23435

+public static final native void _pango_font_description_free(long /*int*/ desc);

23436

+public static final void pango_font_description_free(long /*int*/ desc) {

23437

lock.lock();

23438

try {

23439

_pango_font_description_free(desc);

23440

@@ -13619,8 +13619,8 @@

23441

}

23442

}

23443

/** @param str cast=(const char *),flags=no_out critical */

23444

-public static final native int /*long*/ _pango_font_description_from_string(byte[] str);

23445

-public static final int /*long*/ pango_font_description_from_string(byte[] str) {

23446

+public static final native long /*int*/ _pango_font_description_from_string(byte[] str);

23447

+public static final long /*int*/ pango_font_description_from_string(byte[] str) {

23448

lock.lock();

23449

try {

23450

return _pango_font_description_from_string(str);

23451

@@ -13629,8 +13629,8 @@

23452

}

23453

}

23454

/** @param desc cast=(PangoFontDescription *) */

23455

-public static final native int /*long*/ _pango_font_description_get_family(int /*long*/ desc);

23456

-public static final int /*long*/ pango_font_description_get_family(int /*long*/ desc) {

23457

+public static final native long /*int*/ _pango_font_description_get_family(long /*int*/ desc);

23458

+public static final long /*int*/ pango_font_description_get_family(long /*int*/ desc) {

23459

lock.lock();

23460

try {

23461

return _pango_font_description_get_family(desc);

23462

@@ -13639,8 +13639,8 @@

23463

}

23464

}

23465

/** @param desc cast=(PangoFontDescription *) */

23466

-public static final native int _pango_font_description_get_size(int /*long*/ desc);

23467

-public static final int pango_font_description_get_size(int /*long*/ desc) {

23468

+public static final native int _pango_font_description_get_size(long /*int*/ desc);

23469

+public static final int pango_font_description_get_size(long /*int*/ desc) {

23470

lock.lock();

23471

try {

23472

return _pango_font_description_get_size(desc);

23473

@@ -13649,8 +13649,8 @@

23474

}

23475

}

23476

/** @param desc cast=(PangoFontDescription *) */

23477

-public static final native int _pango_font_description_get_style(int /*long*/ desc);

23478

-public static final int pango_font_description_get_style(int /*long*/ desc) {

23479

+public static final native int _pango_font_description_get_style(long /*int*/ desc);

23480

+public static final int pango_font_description_get_style(long /*int*/ desc) {

23481

lock.lock();

23482

try {

23483

return _pango_font_description_get_style(desc);

23484

@@ -13659,8 +13659,8 @@

23485

}

23486

}

23487

/** @param desc cast=(PangoFontDescription *) */

23488

-public static final native int _pango_font_description_get_weight(int /*long*/ desc);

23489

-public static final int pango_font_description_get_weight(int /*long*/ desc) {

23490

+public static final native int _pango_font_description_get_weight(long /*int*/ desc);

23491

+public static final int pango_font_description_get_weight(long /*int*/ desc) {

23492

lock.lock();

23493

try {

23494

return _pango_font_description_get_weight(desc);

23495

@@ -13668,8 +13668,8 @@

23496

lock.unlock();

23497

}

23498

}

23499

-public static final native int /*long*/ _pango_font_description_new();

23500

-public static final int /*long*/ pango_font_description_new() {

23501

+public static final native long /*int*/ _pango_font_description_new();

23502

+public static final long /*int*/ pango_font_description_new() {

23503

lock.lock();

23504

try {

23505

return _pango_font_description_new();

23506

@@ -13681,8 +13681,8 @@

23507

* @param desc cast=(PangoFontDescription *)

23508

* @param family cast=(const char *),flags=no_out critical

23509

*/

23510

-public static final native void _pango_font_description_set_family(int /*long*/ desc, byte[] family);

23511

-public static final void pango_font_description_set_family(int /*long*/ desc, byte[] family) {

23512

+public static final native void _pango_font_description_set_family(long /*int*/ desc, byte[] family);

23513

+public static final void pango_font_description_set_family(long /*int*/ desc, byte[] family) {

23514

lock.lock();

23515

try {

23516

_pango_font_description_set_family(desc, family);

23517

@@ -13694,8 +13694,8 @@

23518

* @param desc cast=(PangoFontDescription *)

23519

* @param size cast=(gint)

23520

*/

23521

-public static final native void _pango_font_description_set_size(int /*long*/ desc, int size);

23522

-public static final void pango_font_description_set_size(int /*long*/ desc, int size) {

23523

+public static final native void _pango_font_description_set_size(long /*int*/ desc, int size);

23524

+public static final void pango_font_description_set_size(long /*int*/ desc, int size) {

23525

lock.lock();

23526

try {

23527

_pango_font_description_set_size(desc, size);

23528

@@ -13707,8 +13707,8 @@

23529

* @param desc cast=(PangoFontDescription *)

23530

* @param stretch cast=(PangoStretch)

23531

*/

23532

-public static final native void _pango_font_description_set_stretch(int /*long*/ desc, int stretch);

23533

-public static final void pango_font_description_set_stretch(int /*long*/ desc, int stretch) {

23534

+public static final native void _pango_font_description_set_stretch(long /*int*/ desc, int stretch);

23535

+public static final void pango_font_description_set_stretch(long /*int*/ desc, int stretch) {

23536

lock.lock();

23537

try {

23538

_pango_font_description_set_stretch(desc, stretch);

23539

@@ -13720,8 +13720,8 @@

23540

* @param desc cast=(PangoFontDescription *)

23541

* @param weight cast=(PangoStyle)

23542

*/

23543

-public static final native void _pango_font_description_set_style(int /*long*/ desc, int weight);

23544

-public static final void pango_font_description_set_style(int /*long*/ desc, int weight) {

23545

+public static final native void _pango_font_description_set_style(long /*int*/ desc, int weight);

23546

+public static final void pango_font_description_set_style(long /*int*/ desc, int weight) {

23547

lock.lock();

23548

try {

23549

_pango_font_description_set_style(desc, weight);

23550

@@ -13733,8 +13733,8 @@

23551

* @param desc cast=(PangoFontDescription *)

23552

* @param weight cast=(PangoWeight)

23553

*/

23554

-public static final native void _pango_font_description_set_weight(int /*long*/ desc, int weight);

23555

-public static final void pango_font_description_set_weight(int /*long*/ desc, int weight) {

23556

+public static final native void _pango_font_description_set_weight(long /*int*/ desc, int weight);

23557

+public static final void pango_font_description_set_weight(long /*int*/ desc, int weight) {

23558

lock.lock();

23559

try {

23560

_pango_font_description_set_weight(desc, weight);

23561

@@ -13743,8 +13743,8 @@

23562

}

23563

}

23564

/** @param desc cast=(PangoFontDescription *) */

23565

-public static final native int /*long*/ _pango_font_description_to_string(int /*long*/ desc);

23566

-public static final int /*long*/ pango_font_description_to_string(int /*long*/ desc) {

23567

+public static final native long /*int*/ _pango_font_description_to_string(long /*int*/ desc);

23568

+public static final long /*int*/ pango_font_description_to_string(long /*int*/ desc) {

23569

lock.lock();

23570

try {

23571

return _pango_font_description_to_string(desc);

23572

@@ -13753,8 +13753,8 @@

23573

}

23574

}

23575

/** @param face cast=(PangoFontFace *) */

23576

-public static final native int /*long*/ _pango_font_face_describe(int /*long*/ face);

23577

-public static final int /*long*/ pango_font_face_describe(int /*long*/ face) {

23578

+public static final native long /*int*/ _pango_font_face_describe(long /*int*/ face);

23579

+public static final long /*int*/ pango_font_face_describe(long /*int*/ face) {

23580

lock.lock();

23581

try {

23582

return _pango_font_face_describe(face);

23583

@@ -13763,8 +13763,8 @@

23584

}

23585

}

23586

/** @param family cast=(PangoFontFamily *) */

23587

-public static final native int /*long*/ _pango_font_family_get_name(int /*long*/ family);

23588

-public static final int /*long*/ pango_font_family_get_name(int /*long*/ family) {

23589

+public static final native long /*int*/ _pango_font_family_get_name(long /*int*/ family);

23590

+public static final long /*int*/ pango_font_family_get_name(long /*int*/ family) {

23591

lock.lock();

23592

try {

23593

return _pango_font_family_get_name(family);

23594

@@ -13777,8 +13777,8 @@

23595

* @param faces cast=(PangoFontFace ***)

23596

* @param n_faces cast=(int *)

23597

*/

23598

-public static final native void _pango_font_family_list_faces(int /*long*/ family, int /*long*/[] faces, int[] n_faces);

23599

-public static final void pango_font_family_list_faces(int /*long*/ family, int /*long*/[] faces, int[] n_faces) {

23600

+public static final native void _pango_font_family_list_faces(long /*int*/ family, long /*int*/[] faces, int[] n_faces);

23601

+public static final void pango_font_family_list_faces(long /*int*/ family, long /*int*/[] faces, int[] n_faces) {

23602

lock.lock();

23603

try {

23604

_pango_font_family_list_faces(family, faces, n_faces);

23605

@@ -13790,8 +13790,8 @@

23606

* @param font cast=(PangoFont *)

23607

* @param language cast=(PangoLanguage *)

23608

*/

23609

-public static final native int /*long*/ _pango_font_get_metrics(int /*long*/ font, int /*long*/ language);

23610

-public static final int /*long*/ pango_font_get_metrics(int /*long*/ font, int /*long*/ language) {

23611

+public static final native long /*int*/ _pango_font_get_metrics(long /*int*/ font, long /*int*/ language);

23612

+public static final long /*int*/ pango_font_get_metrics(long /*int*/ font, long /*int*/ language) {

23613

lock.lock();

23614

try {

23615

return _pango_font_get_metrics(font, language);

23616

@@ -13800,8 +13800,8 @@

23617

}

23618

}

23619

/** @param metrics cast=(PangoFontMetrics *) */

23620

-public static final native int _pango_font_metrics_get_approximate_char_width(int /*long*/ metrics);

23621

-public static final int pango_font_metrics_get_approximate_char_width(int /*long*/ metrics) {

23622

+public static final native int _pango_font_metrics_get_approximate_char_width(long /*int*/ metrics);

23623

+public static final int pango_font_metrics_get_approximate_char_width(long /*int*/ metrics) {

23624

lock.lock();

23625

try {

23626

return _pango_font_metrics_get_approximate_char_width(metrics);

23627

@@ -13810,8 +13810,8 @@

23628

}

23629

}

23630

/** @param metrics cast=(PangoFontMetrics *) */

23631

-public static final native int _pango_font_metrics_get_ascent(int /*long*/ metrics);

23632

-public static final int pango_font_metrics_get_ascent(int /*long*/ metrics) {

23633

+public static final native int _pango_font_metrics_get_ascent(long /*int*/ metrics);

23634

+public static final int pango_font_metrics_get_ascent(long /*int*/ metrics) {

23635

lock.lock();

23636

try {

23637

return _pango_font_metrics_get_ascent(metrics);

23638

@@ -13820,8 +13820,8 @@

23639

}

23640

}

23641

/** @param metrics cast=(PangoFontMetrics *) */

23642

-public static final native int _pango_font_metrics_get_descent(int /*long*/ metrics);

23643

-public static final int pango_font_metrics_get_descent(int /*long*/ metrics) {

23644

+public static final native int _pango_font_metrics_get_descent(long /*int*/ metrics);

23645

+public static final int pango_font_metrics_get_descent(long /*int*/ metrics) {

23646

lock.lock();

23647

try {

23648

return _pango_font_metrics_get_descent(metrics);

23649

@@ -13830,8 +13830,8 @@

23650

}

23651

}

23652

/** @method flags=dynamic */

23653

-public static final native int _pango_font_metrics_get_underline_thickness(int /*long*/ metrics);

23654

-public static final int pango_font_metrics_get_underline_thickness(int /*long*/ metrics) {

23655

+public static final native int _pango_font_metrics_get_underline_thickness(long /*int*/ metrics);

23656

+public static final int pango_font_metrics_get_underline_thickness(long /*int*/ metrics) {

23657

lock.lock();

23658

try {

23659

return _pango_font_metrics_get_underline_thickness(metrics);

23660

@@ -13840,8 +13840,8 @@

23661

}

23662

}

23663

/** @method flags=dynamic */

23664

-public static final native int _pango_font_metrics_get_underline_position(int /*long*/ metrics);

23665

-public static final int pango_font_metrics_get_underline_position(int /*long*/ metrics) {

23666

+public static final native int _pango_font_metrics_get_underline_position(long /*int*/ metrics);

23667

+public static final int pango_font_metrics_get_underline_position(long /*int*/ metrics) {

23668

lock.lock();

23669

try {

23670

return _pango_font_metrics_get_underline_position(metrics);

23671

@@ -13850,8 +13850,8 @@

23672

}

23673

}

23674

/** @method flags=dynamic */

23675

-public static final native int _pango_font_metrics_get_strikethrough_thickness(int /*long*/ metrics);

23676

-public static final int pango_font_metrics_get_strikethrough_thickness(int /*long*/ metrics) {

23677

+public static final native int _pango_font_metrics_get_strikethrough_thickness(long /*int*/ metrics);

23678

+public static final int pango_font_metrics_get_strikethrough_thickness(long /*int*/ metrics) {

23679

lock.lock();

23680

try {

23681

return _pango_font_metrics_get_strikethrough_thickness(metrics);

23682

@@ -13860,8 +13860,8 @@

23683

}

23684

}

23685

/** @method flags=dynamic */

23686

-public static final native int _pango_font_metrics_get_strikethrough_position(int /*long*/ metrics);

23687

-public static final int pango_font_metrics_get_strikethrough_position(int /*long*/ metrics) {

23688

+public static final native int _pango_font_metrics_get_strikethrough_position(long /*int*/ metrics);

23689

+public static final int pango_font_metrics_get_strikethrough_position(long /*int*/ metrics) {

23690

lock.lock();

23691

try {

23692

return _pango_font_metrics_get_strikethrough_position(metrics);

23693

@@ -13870,8 +13870,8 @@

23694

}

23695

}

23696

/** @param metrics cast=(PangoFontMetrics *) */

23697

-public static final native void _pango_font_metrics_unref(int /*long*/ metrics);

23698

-public static final void pango_font_metrics_unref(int /*long*/ metrics) {

23699

+public static final native void _pango_font_metrics_unref(long /*int*/ metrics);

23700

+public static final void pango_font_metrics_unref(long /*int*/ metrics) {

23701

lock.lock();

23702

try {

23703

_pango_font_metrics_unref(metrics);

23704

@@ -13880,8 +13880,8 @@

23705

}

23706

}

23707

/** @param language cast=(const char *),flags=no_out */

23708

-public static final native int /*long*/ _pango_language_from_string(byte[] language);

23709

-public static final int /*long*/ pango_language_from_string(byte[] language) {

23710

+public static final native long /*int*/ _pango_language_from_string(byte[] language);

23711

+public static final long /*int*/ pango_language_from_string(byte[] language) {

23712

lock.lock();

23713

try {

23714

return _pango_language_from_string(language);

23715

@@ -13890,8 +13890,8 @@

23716

}

23717

}

23718

/** @param layout cast=(PangoLayout *) */

23719

-public static final native void _pango_layout_context_changed(int /*long*/ layout);

23720

-public static final void pango_layout_context_changed(int /*long*/ layout) {

23721

+public static final native void _pango_layout_context_changed(long /*int*/ layout);

23722

+public static final void pango_layout_context_changed(long /*int*/ layout) {

23723

lock.lock();

23724

try {

23725

_pango_layout_context_changed(layout);

23726

@@ -13900,8 +13900,8 @@

23727

}

23728

}

23729

/** @param layout cast=(PangoLayout*) */

23730

-public static final native int _pango_layout_get_alignment(int /*long*/ layout);

23731

-public static final int pango_layout_get_alignment(int /*long*/ layout) {

23732

+public static final native int _pango_layout_get_alignment(long /*int*/ layout);

23733

+public static final int pango_layout_get_alignment(long /*int*/ layout) {

23734

lock.lock();

23735

try {

23736

return _pango_layout_get_alignment(layout);

23737

@@ -13910,8 +13910,8 @@

23738

}

23739

}

23740

/** @param layout cast=(PangoLayout *) */

23741

-public static final native int /*long*/ _pango_layout_get_context(int /*long*/ layout);

23742

-public static final int /*long*/ pango_layout_get_context(int /*long*/ layout) {

23743

+public static final native long /*int*/ _pango_layout_get_context(long /*int*/ layout);

23744

+public static final long /*int*/ pango_layout_get_context(long /*int*/ layout) {

23745

lock.lock();

23746

try {

23747

return _pango_layout_get_context(layout);

23748

@@ -13920,8 +13920,8 @@

23749

}

23750

}

23751

/** @param layout cast=(PangoLayout *) */

23752

-public static final native int /*long*/ _pango_layout_get_attributes(int /*long*/ layout);

23753

-public static final int /*long*/ pango_layout_get_attributes(int /*long*/ layout) {

23754

+public static final native long /*int*/ _pango_layout_get_attributes(long /*int*/ layout);

23755

+public static final long /*int*/ pango_layout_get_attributes(long /*int*/ layout) {

23756

lock.lock();

23757

try {

23758

return _pango_layout_get_attributes(layout);

23759

@@ -13930,8 +13930,8 @@

23760

}

23761

}

23762

/** @param layout cast=(PangoLayout*) */

23763

-public static final native int _pango_layout_get_indent(int /*long*/ layout);

23764

-public static final int pango_layout_get_indent(int /*long*/ layout) {

23765

+public static final native int _pango_layout_get_indent(long /*int*/ layout);

23766

+public static final int pango_layout_get_indent(long /*int*/ layout) {

23767

lock.lock();

23768

try {

23769

return _pango_layout_get_indent(layout);

23770

@@ -13940,8 +13940,8 @@

23771

}

23772

}

23773

/** @param layout cast=(PangoLayout*) */

23774

-public static final native int /*long*/ _pango_layout_get_iter(int /*long*/ layout);

23775

-public static final int /*long*/ pango_layout_get_iter(int /*long*/ layout) {

23776

+public static final native long /*int*/ _pango_layout_get_iter(long /*int*/ layout);

23777

+public static final long /*int*/ pango_layout_get_iter(long /*int*/ layout) {

23778

lock.lock();

23779

try {

23780

return _pango_layout_get_iter(layout);

23781

@@ -13950,8 +13950,8 @@

23782

}

23783

}

23784

/** @param layout cast=(PangoLayout*) */

23785

-public static final native boolean _pango_layout_get_justify(int /*long*/ layout);

23786

-public static final boolean pango_layout_get_justify(int /*long*/ layout) {

23787

+public static final native boolean _pango_layout_get_justify(long /*int*/ layout);

23788

+public static final boolean pango_layout_get_justify(long /*int*/ layout) {

23789

lock.lock();

23790

try {

23791

return _pango_layout_get_justify(layout);

23792

@@ -13960,8 +13960,8 @@

23793

}

23794

}

23795

/** @param layout cast=(PangoLayout *) */

23796

-public static final native int /*long*/ _pango_layout_get_line(int /*long*/ layout, int line);

23797

-public static final int /*long*/ pango_layout_get_line(int /*long*/ layout, int line) {

23798

+public static final native long /*int*/ _pango_layout_get_line(long /*int*/ layout, int line);

23799

+public static final long /*int*/ pango_layout_get_line(long /*int*/ layout, int line) {

23800

lock.lock();

23801

try {

23802

return _pango_layout_get_line(layout, line);

23803

@@ -13970,8 +13970,8 @@

23804

}

23805

}

23806

/** @param layout cast=(PangoLayout*) */

23807

-public static final native int _pango_layout_get_line_count(int /*long*/ layout);

23808

-public static final int pango_layout_get_line_count(int /*long*/ layout) {

23809

+public static final native int _pango_layout_get_line_count(long /*int*/ layout);

23810

+public static final int pango_layout_get_line_count(long /*int*/ layout) {

23811

lock.lock();

23812

try {

23813

return _pango_layout_get_line_count(layout);

23814

@@ -13984,8 +13984,8 @@

23815

* @param attrs cast=(PangoLogAttr **)

23816

* @param n_attrs cast=(int *)

23817

*/

23818

-public static final native void _pango_layout_get_log_attrs(int /*long*/ layout, int /*long*/[] attrs, int[] n_attrs);

23819

-public static final void pango_layout_get_log_attrs(int /*long*/ layout, int /*long*/[] attrs, int[] n_attrs) {

23820

+public static final native void _pango_layout_get_log_attrs(long /*int*/ layout, long /*int*/[] attrs, int[] n_attrs);

23821

+public static final void pango_layout_get_log_attrs(long /*int*/ layout, long /*int*/[] attrs, int[] n_attrs) {

23822

lock.lock();

23823

try {

23824

_pango_layout_get_log_attrs(layout, attrs, n_attrs);

23825

@@ -13998,8 +13998,8 @@

23826

* @param width cast=(int *)

23827

* @param height cast=(int *)

23828

*/

23829

-public static final native void _pango_layout_get_size(int /*long*/ layout, int[] width, int[] height);

23830

-public static final void pango_layout_get_size(int /*long*/ layout, int[] width, int[] height) {

23831

+public static final native void _pango_layout_get_size(long /*int*/ layout, int[] width, int[] height);

23832

+public static final void pango_layout_get_size(long /*int*/ layout, int[] width, int[] height) {

23833

lock.lock();

23834

try {

23835

_pango_layout_get_size(layout, width, height);

23836

@@ -14008,8 +14008,8 @@

23837

}

23838

}

23839

/** @param layout cast=(PangoLayout*) */

23840

-public static final native int _pango_layout_get_spacing(int /*long*/ layout);

23841

-public static final int pango_layout_get_spacing(int /*long*/ layout) {

23842

+public static final native int _pango_layout_get_spacing(long /*int*/ layout);

23843

+public static final int pango_layout_get_spacing(long /*int*/ layout) {

23844

lock.lock();

23845

try {

23846

return _pango_layout_get_spacing(layout);

23847

@@ -14018,8 +14018,8 @@

23848

}

23849

}

23850

/** @param layout cast=(PangoLayout*) */

23851

-public static final native int /*long*/ _pango_layout_get_tabs(int /*long*/ layout);

23852

-public static final int /*long*/ pango_layout_get_tabs(int /*long*/ layout) {

23853

+public static final native long /*int*/ _pango_layout_get_tabs(long /*int*/ layout);

23854

+public static final long /*int*/ pango_layout_get_tabs(long /*int*/ layout) {

23855

lock.lock();

23856

try {

23857

return _pango_layout_get_tabs(layout);

23858

@@ -14028,8 +14028,8 @@

23859

}

23860

}

23861

/** @param layout cast=(PangoLayout *) */

23862

-public static final native int /*long*/ _pango_layout_get_text(int /*long*/ layout);

23863

-public static final int /*long*/ pango_layout_get_text(int /*long*/ layout) {

23864

+public static final native long /*int*/ _pango_layout_get_text(long /*int*/ layout);

23865

+public static final long /*int*/ pango_layout_get_text(long /*int*/ layout) {

23866

lock.lock();

23867

try {

23868

return _pango_layout_get_text(layout);

23869

@@ -14038,8 +14038,8 @@

23870

}

23871

}

23872

/** @param layout cast=(PangoLayout *) */

23873

-public static final native int _pango_layout_get_width(int /*long*/ layout);

23874

-public static final int pango_layout_get_width(int /*long*/ layout) {

23875

+public static final native int _pango_layout_get_width(long /*int*/ layout);

23876

+public static final int pango_layout_get_width(long /*int*/ layout) {

23877

lock.lock();

23878

try {

23879

return _pango_layout_get_width(layout);

23880

@@ -14051,8 +14051,8 @@

23881

* @param layout cast=(PangoLayout*)

23882

* @param pos flags=no_in

23883

*/

23884

-public static final native void _pango_layout_index_to_pos(int /*long*/ layout, int index, PangoRectangle pos);

23885

-public static final void pango_layout_index_to_pos(int /*long*/ layout, int index, PangoRectangle pos) {

23886

+public static final native void _pango_layout_index_to_pos(long /*int*/ layout, int index, PangoRectangle pos);

23887

+public static final void pango_layout_index_to_pos(long /*int*/ layout, int index, PangoRectangle pos) {

23888

lock.lock();

23889

try {

23890

_pango_layout_index_to_pos(layout, index, pos);

23891

@@ -14061,8 +14061,8 @@

23892

}

23893

}

23894

/** @param iter cast=(PangoLayoutIter*) */

23895

-public static final native void _pango_layout_iter_free(int /*long*/ iter);

23896

-public static final void pango_layout_iter_free(int /*long*/ iter) {

23897

+public static final native void _pango_layout_iter_free(long /*int*/ iter);

23898

+public static final void pango_layout_iter_free(long /*int*/ iter) {

23899

lock.lock();

23900

try {

23901

_pango_layout_iter_free(iter);

23902

@@ -14075,8 +14075,8 @@

23903

* @param ink_rect flags=no_in

23904

* @param logical_rect flags=no_in

23905

*/

23906

-public static final native void _pango_layout_iter_get_line_extents(int /*long*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect);

23907

-public static final void pango_layout_iter_get_line_extents(int /*long*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect) {

23908

+public static final native void _pango_layout_iter_get_line_extents(long /*int*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect);

23909

+public static final void pango_layout_iter_get_line_extents(long /*int*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect) {

23910

lock.lock();

23911

try {

23912

_pango_layout_iter_get_line_extents(iter, ink_rect, logical_rect);

23913

@@ -14085,8 +14085,8 @@

23914

}

23915

}

23916

/** @param iter cast=(PangoLayoutIter*) */

23917

-public static final native int _pango_layout_iter_get_index(int /*long*/ iter);

23918

-public static final int pango_layout_iter_get_index(int /*long*/ iter) {

23919

+public static final native int _pango_layout_iter_get_index(long /*int*/ iter);

23920

+public static final int pango_layout_iter_get_index(long /*int*/ iter) {

23921

lock.lock();

23922

try {

23923

return _pango_layout_iter_get_index(iter);

23924

@@ -14095,8 +14095,8 @@

23925

}

23926

}

23927

/** @param iter cast=(PangoLayoutIter*) */

23928

-public static final native int /*long*/ _pango_layout_iter_get_run(int /*long*/ iter);

23929

-public static final int /*long*/ pango_layout_iter_get_run(int /*long*/ iter) {

23930

+public static final native long /*int*/ _pango_layout_iter_get_run(long /*int*/ iter);

23931

+public static final long /*int*/ pango_layout_iter_get_run(long /*int*/ iter) {

23932

lock.lock();

23933

try {

23934

return _pango_layout_iter_get_run(iter);

23935

@@ -14105,8 +14105,8 @@

23936

}

23937

}

23938

/** @param iter cast=(PangoLayoutIter*) */

23939

-public static final native boolean _pango_layout_iter_next_line(int /*long*/ iter);

23940

-public static final boolean pango_layout_iter_next_line(int /*long*/ iter) {

23941

+public static final native boolean _pango_layout_iter_next_line(long /*int*/ iter);

23942

+public static final boolean pango_layout_iter_next_line(long /*int*/ iter) {

23943

lock.lock();

23944

try {

23945

return _pango_layout_iter_next_line(iter);

23946

@@ -14115,8 +14115,8 @@

23947

}

23948

}

23949

/** @param iter cast=(PangoLayoutIter*) */

23950

-public static final native boolean _pango_layout_iter_next_run(int /*long*/ iter);

23951

-public static final boolean pango_layout_iter_next_run(int /*long*/ iter) {

23952

+public static final native boolean _pango_layout_iter_next_run(long /*int*/ iter);

23953

+public static final boolean pango_layout_iter_next_run(long /*int*/ iter) {

23954

lock.lock();

23955

try {

23956

return _pango_layout_iter_next_run(iter);

23957

@@ -14129,8 +14129,8 @@

23958

* @param ink_rect cast=(PangoRectangle *),flags=no_in

23959

* @param logical_rect cast=(PangoRectangle *),flags=no_in

23960

*/

23961

-public static final native void _pango_layout_line_get_extents(int /*long*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect);

23962

-public static final void pango_layout_line_get_extents(int /*long*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect) {

23963

+public static final native void _pango_layout_line_get_extents(long /*int*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect);

23964

+public static final void pango_layout_line_get_extents(long /*int*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect) {

23965

lock.lock();

23966

try {

23967

_pango_layout_line_get_extents(line, ink_rect, logical_rect);

23968

@@ -14143,8 +14143,8 @@

23969

* @param index_ cast=(int *)

23970

* @param trailing cast=(int *)

23971

*/

23972

-public static final native boolean _pango_layout_line_x_to_index(int /*long*/ line, int x_pos, int[] index_, int[] trailing);

23973

-public static final boolean pango_layout_line_x_to_index(int /*long*/ line, int x_pos, int[] index_, int[] trailing) {

23974

+public static final native boolean _pango_layout_line_x_to_index(long /*int*/ line, int x_pos, int[] index_, int[] trailing);

23975

+public static final boolean pango_layout_line_x_to_index(long /*int*/ line, int x_pos, int[] index_, int[] trailing) {

23976

lock.lock();

23977

try {

23978

return _pango_layout_line_x_to_index(line, x_pos, index_, trailing);

23979

@@ -14153,8 +14153,8 @@

23980

}

23981

}

23982

/** @param context cast=(PangoContext *) */

23983

-public static final native int /*long*/ _pango_layout_new(int /*long*/ context);

23984

-public static final int /*long*/ pango_layout_new(int /*long*/ context) {

23985

+public static final native long /*int*/ _pango_layout_new(long /*int*/ context);

23986

+public static final long /*int*/ pango_layout_new(long /*int*/ context) {

23987

lock.lock();

23988

try {

23989

return _pango_layout_new(context);

23990

@@ -14163,8 +14163,8 @@

23991

}

23992

}

23993

/** @param layout cast=(PangoLayout *) */

23994

-public static final native void _pango_layout_set_alignment (int /*long*/ layout, int alignment);

23995

-public static final void pango_layout_set_alignment (int /*long*/ layout, int alignment) {

23996

+public static final native void _pango_layout_set_alignment (long /*int*/ layout, int alignment);

23997

+public static final void pango_layout_set_alignment (long /*int*/ layout, int alignment) {

23998

lock.lock();

23999

try {

24000

_pango_layout_set_alignment(layout, alignment);

24001

@@ -14176,8 +14176,8 @@

24002

* @param layout cast=(PangoLayout *)

24003

* @param attrs cast=(PangoAttrList *)

24004

*/

24005

-public static final native void _pango_layout_set_attributes(int /*long*/ layout, int /*long*/ attrs);

24006

-public static final void pango_layout_set_attributes(int /*long*/ layout, int /*long*/ attrs) {

24007

+public static final native void _pango_layout_set_attributes(long /*int*/ layout, long /*int*/ attrs);

24008

+public static final void pango_layout_set_attributes(long /*int*/ layout, long /*int*/ attrs) {

24009

lock.lock();

24010

try {

24011

_pango_layout_set_attributes(layout, attrs);

24012

@@ -14186,8 +14186,8 @@

24013

}

24014

}

24015

/** @method flags=dynamic */

24016

-public static final native void _pango_layout_set_auto_dir(int /*long*/ layout, boolean auto_dir);

24017

-public static final void pango_layout_set_auto_dir(int /*long*/ layout, boolean auto_dir) {

24018

+public static final native void _pango_layout_set_auto_dir(long /*int*/ layout, boolean auto_dir);

24019

+public static final void pango_layout_set_auto_dir(long /*int*/ layout, boolean auto_dir) {

24020

lock.lock();

24021

try {

24022

_pango_layout_set_auto_dir(layout, auto_dir);

24023

@@ -14199,8 +14199,8 @@

24024

* @param context cast=(PangoLayout *)

24025

* @param descr cast=(PangoFontDescription *)

24026

*/

24027

-public static final native void _pango_layout_set_font_description(int /*long*/ context, int /*long*/ descr);

24028

-public static final void pango_layout_set_font_description(int /*long*/ context, int /*long*/ descr) {

24029

+public static final native void _pango_layout_set_font_description(long /*int*/ context, long /*int*/ descr);

24030

+public static final void pango_layout_set_font_description(long /*int*/ context, long /*int*/ descr) {

24031

lock.lock();

24032

try {

24033

_pango_layout_set_font_description(context, descr);

24034

@@ -14209,8 +14209,8 @@

24035

}

24036

}

24037

/** @param layout cast=(PangoLayout*) */

24038

-public static final native void _pango_layout_set_indent(int /*long*/ layout, int indent);

24039

-public static final void pango_layout_set_indent(int /*long*/ layout, int indent) {

24040

+public static final native void _pango_layout_set_indent(long /*int*/ layout, int indent);

24041

+public static final void pango_layout_set_indent(long /*int*/ layout, int indent) {

24042

lock.lock();

24043

try {

24044

_pango_layout_set_indent(layout, indent);

24045

@@ -14219,8 +14219,8 @@

24046

}

24047

}

24048

/** @param layout cast=(PangoLayout*) */

24049

-public static final native void _pango_layout_set_justify(int /*long*/ layout, boolean justify);

24050

-public static final void pango_layout_set_justify(int /*long*/ layout, boolean justify) {

24051

+public static final native void _pango_layout_set_justify(long /*int*/ layout, boolean justify);

24052

+public static final void pango_layout_set_justify(long /*int*/ layout, boolean justify) {

24053

lock.lock();

24054

try {

24055

_pango_layout_set_justify(layout, justify);

24056

@@ -14232,8 +14232,8 @@

24057

* @param context cast=(PangoLayout *)

24058

* @param setting cast=(gboolean)

24059

*/

24060

-public static final native void _pango_layout_set_single_paragraph_mode(int /*long*/ context, boolean setting);

24061

-public static final void pango_layout_set_single_paragraph_mode(int /*long*/ context, boolean setting) {

24062

+public static final native void _pango_layout_set_single_paragraph_mode(long /*int*/ context, boolean setting);

24063

+public static final void pango_layout_set_single_paragraph_mode(long /*int*/ context, boolean setting) {

24064

lock.lock();

24065

try {

24066

_pango_layout_set_single_paragraph_mode(context, setting);

24067

@@ -14242,8 +14242,8 @@

24068

}

24069

}

24070

/** @param layout cast=(PangoLayout *) */

24071

-public static final native void _pango_layout_set_spacing(int /*long*/ layout, int spacing);

24072

-public static final void pango_layout_set_spacing(int /*long*/ layout, int spacing) {

24073

+public static final native void _pango_layout_set_spacing(long /*int*/ layout, int spacing);

24074

+public static final void pango_layout_set_spacing(long /*int*/ layout, int spacing) {

24075

lock.lock();

24076

try {

24077

_pango_layout_set_spacing(layout, spacing);

24078

@@ -14255,8 +14255,8 @@

24079

* @param layout cast=(PangoLayout *)

24080

* @param tabs cast=(PangoTabArray *)

24081

*/

24082

-public static final native void _pango_layout_set_tabs(int /*long*/ layout, int /*long*/ tabs);

24083

-public static final void pango_layout_set_tabs(int /*long*/ layout, int /*long*/ tabs) {

24084

+public static final native void _pango_layout_set_tabs(long /*int*/ layout, long /*int*/ tabs);

24085

+public static final void pango_layout_set_tabs(long /*int*/ layout, long /*int*/ tabs) {

24086

lock.lock();

24087

try {

24088

_pango_layout_set_tabs(layout, tabs);

24089

@@ -14269,8 +14269,8 @@

24090

* @param text cast=(const char *),flags=no_out critical

24091

* @param length cast=(int)

24092

*/

24093

-public static final native void _pango_layout_set_text(int /*long*/ layout, byte[] text, int length);

24094

-public static final void pango_layout_set_text(int /*long*/ layout, byte[] text, int length) {

24095

+public static final native void _pango_layout_set_text(long /*int*/ layout, byte[] text, int length);

24096

+public static final void pango_layout_set_text(long /*int*/ layout, byte[] text, int length) {

24097

lock.lock();

24098

try {

24099

_pango_layout_set_text(layout, text, length);

24100

@@ -14279,8 +14279,8 @@

24101

}

24102

}

24103

/** @param layout cast=(PangoLayout *) */

24104

-public static final native void _pango_layout_set_width(int /*long*/ layout, int width);

24105

-public static final void pango_layout_set_width(int /*long*/ layout, int width) {

24106

+public static final native void _pango_layout_set_width(long /*int*/ layout, int width);

24107

+public static final void pango_layout_set_width(long /*int*/ layout, int width) {

24108

lock.lock();

24109

try {

24110

_pango_layout_set_width(layout, width);

24111

@@ -14289,8 +14289,8 @@

24112

}

24113

}

24114

/** @param layout cast=(PangoLayout *) */

24115

-public static final native void _pango_layout_set_wrap (int /*long*/ layout, int wrap);

24116

-public static final void pango_layout_set_wrap (int /*long*/ layout, int wrap) {

24117

+public static final native void _pango_layout_set_wrap (long /*int*/ layout, int wrap);

24118

+public static final void pango_layout_set_wrap (long /*int*/ layout, int wrap) {

24119

lock.lock();

24120

try {

24121

_pango_layout_set_wrap(layout, wrap);

24122

@@ -14303,8 +14303,8 @@

24123

* @param index cast=(int *)

24124

* @param trailing cast=(int *)

24125

*/

24126

-public static final native boolean _pango_layout_xy_to_index(int /*long*/ layout, int x, int y, int[] index, int[] trailing);

24127

-public static final boolean pango_layout_xy_to_index(int /*long*/ layout, int x, int y, int[] index, int[] trailing) {

24128

+public static final native boolean _pango_layout_xy_to_index(long /*int*/ layout, int x, int y, int[] index, int[] trailing);

24129

+public static final boolean pango_layout_xy_to_index(long /*int*/ layout, int x, int y, int[] index, int[] trailing) {

24130

lock.lock();

24131

try {

24132

return _pango_layout_xy_to_index(layout, x, y, index, trailing);

24133

@@ -14313,8 +14313,8 @@

24134

}

24135

}

24136

/** @param tab_array cast=(PangoTabArray *) */

24137

-public static final native int _pango_tab_array_get_size(int /*long*/ tab_array);

24138

-public static final int pango_tab_array_get_size(int /*long*/ tab_array) {

24139

+public static final native int _pango_tab_array_get_size(long /*int*/ tab_array);

24140

+public static final int pango_tab_array_get_size(long /*int*/ tab_array) {

24141

lock.lock();

24142

try {

24143

return _pango_tab_array_get_size(tab_array);

24144

@@ -14327,8 +14327,8 @@

24145

* @param alignments cast=(PangoTabAlign **)

24146

* @param locations cast=(int **)

24147

*/

24148

-public static final native void _pango_tab_array_get_tabs(int /*long*/ tab_array, int /*long*/[] alignments, int /*long*/[] locations);

24149

-public static final void pango_tab_array_get_tabs(int /*long*/ tab_array, int /*long*/[] alignments, int /*long*/[] locations) {

24150

+public static final native void _pango_tab_array_get_tabs(long /*int*/ tab_array, long /*int*/[] alignments, long /*int*/[] locations);

24151

+public static final void pango_tab_array_get_tabs(long /*int*/ tab_array, long /*int*/[] alignments, long /*int*/[] locations) {

24152

lock.lock();

24153

try {

24154

_pango_tab_array_get_tabs(tab_array, alignments, locations);

24155

@@ -14337,8 +14337,8 @@

24156

}

24157

}

24158

/** @param tab_array cast=(PangoTabArray *) */

24159

-public static final native void _pango_tab_array_free(int /*long*/ tab_array);

24160

-public static final void pango_tab_array_free(int /*long*/ tab_array) {

24161

+public static final native void _pango_tab_array_free(long /*int*/ tab_array);

24162

+public static final void pango_tab_array_free(long /*int*/ tab_array) {

24163

lock.lock();

24164

try {

24165

_pango_tab_array_free(tab_array);

24166

@@ -14350,8 +14350,8 @@

24167

* @param initial_size cast=(gint)

24168

* @param positions_in_pixels cast=(gboolean)

24169

*/

24170

-public static final native int /*long*/ _pango_tab_array_new(int initial_size, boolean positions_in_pixels);

24171

-public static final int /*long*/ pango_tab_array_new(int initial_size, boolean positions_in_pixels) {

24172

+public static final native long /*int*/ _pango_tab_array_new(int initial_size, boolean positions_in_pixels);

24173

+public static final long /*int*/ pango_tab_array_new(int initial_size, boolean positions_in_pixels) {

24174

lock.lock();

24175

try {

24176

return _pango_tab_array_new(initial_size, positions_in_pixels);

24177

@@ -14365,8 +14365,8 @@

24178

* @param alignment cast=(PangoTabAlign)

24179

* @param location cast=(gint)

24180

*/

24181

-public static final native void _pango_tab_array_set_tab(int /*long*/ tab_array, int tab_index, int /*long*/ alignment, int location);

24182

-public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab_index, int /*long*/ alignment, int location) {

24183

+public static final native void _pango_tab_array_set_tab(long /*int*/ tab_array, int tab_index, long /*int*/ alignment, int location);

24184

+public static final void pango_tab_array_set_tab(long /*int*/ tab_array, int tab_index, long /*int*/ alignment, int location) {

24185

lock.lock();

24186

try {

24187

_pango_tab_array_set_tab(tab_array, tab_index, alignment, location);

24188

@@ -14380,8 +14380,8 @@

24189

* @param relationship cast=(AtkRelationType)

24190

* @param target cast=(AtkObject *)

24191

*/

24192

-public static final native boolean _atk_object_add_relationship (int /*long*/ object, int relationship, int /*long*/ target);

24193

-public static final boolean atk_object_add_relationship (int /*long*/ object, int relationship, int /*long*/ target) {

24194

+public static final native boolean _atk_object_add_relationship (long /*int*/ object, int relationship, long /*int*/ target);

24195

+public static final boolean atk_object_add_relationship (long /*int*/ object, int relationship, long /*int*/ target) {

24196

lock.lock();

24197

try {

24198

return _atk_object_add_relationship(object, relationship, target);

24199

diff -urN x86/org/eclipse/swt/internal/gtk/PangoAttribute.java x86_64/org/eclipse/swt/internal/gtk/PangoAttribute.java

24200

--- x86/org/eclipse/swt/internal/gtk/PangoAttribute.java 2009-05-29 17:30:08.000000000 -0400

24201

+++ x86_64/org/eclipse/swt/internal/gtk/PangoAttribute.java 2009-09-17 08:48:24.000000000 -0400

24202

@@ -17,7 +17,7 @@

24203

24204

public class PangoAttribute {

24205

/** @field cast=(const PangoAttrClass *) */

24206

- public int /*long*/ klass;

24207

+ public long /*int*/ klass;

24208

public int start_index;

24209

public int end_index;

24210

public static final int sizeof = OS.PangoAttribute_sizeof();

24211

diff -urN x86/org/eclipse/swt/internal/gtk/PangoItem.java x86_64/org/eclipse/swt/internal/gtk/PangoItem.java

24212

--- x86/org/eclipse/swt/internal/gtk/PangoItem.java 2009-05-29 17:30:08.000000000 -0400

24213

+++ x86_64/org/eclipse/swt/internal/gtk/PangoItem.java 2009-09-17 08:48:24.000000000 -0400

24214

@@ -19,16 +19,16 @@

24215

public int length;

24216

public int num_chars;

24217

/** @field accessor=analysis.shape_engine,cast=(PangoEngineShape *) */

24218

- public int /*long*/ analysis_shape_engine;

24219

+ public long /*int*/ analysis_shape_engine;

24220

/** @field accessor=analysis.lang_engine,cast=(PangoEngineLang *) */

24221

- public int /*long*/ analysis_lang_engine;

24222

+ public long /*int*/ analysis_lang_engine;

24223

/** @field accessor=analysis.font,cast=(PangoFont *) */

24224

- public int /*long*/ analysis_font;

24225

+ public long /*int*/ analysis_font;

24226

/** @field accessor=analysis.level */

24227

public byte analysis_level;

24228

/** @field accessor=analysis.language,cast=(PangoLanguage *) */

24229

- public int /*long*/ analysis_language;

24230

+ public long /*int*/ analysis_language;

24231

/** @field accessor=analysis.extra_attrs,cast=(GSList *) */

24232

- public int /*long*/ analysis_extra_attrs;

24233

+ public long /*int*/ analysis_extra_attrs;

24234

public static final int sizeof = OS.PangoItem_sizeof();

24235

}

24236

diff -urN x86/org/eclipse/swt/internal/gtk/PangoLayoutLine.java x86_64/org/eclipse/swt/internal/gtk/PangoLayoutLine.java

24237

--- x86/org/eclipse/swt/internal/gtk/PangoLayoutLine.java 2008-09-10 18:29:30.000000000 -0400

24238

+++ x86_64/org/eclipse/swt/internal/gtk/PangoLayoutLine.java 2009-09-17 08:48:24.000000000 -0400

24239

@@ -16,11 +16,11 @@

24240

24241

public class PangoLayoutLine {

24242

/** @field cast=(PangoLayout *) */

24243

- public int /*long*/ layout;

24244

+ public long /*int*/ layout;

24245

public int start_index;

24246

public int length;

24247

/** @field cast=(GSList *) */

24248

- public int /*long*/ runs;

24249

+ public long /*int*/ runs;

24250

// public boolean is_paragraph_start;

24251

// public byte resolved_dir;

24252

public static final int sizeof = OS.PangoLayoutLine_sizeof();

24253

diff -urN x86/org/eclipse/swt/internal/gtk/PangoLayoutRun.java x86_64/org/eclipse/swt/internal/gtk/PangoLayoutRun.java

24254

--- x86/org/eclipse/swt/internal/gtk/PangoLayoutRun.java 2009-05-29 17:30:08.000000000 -0400

24255

+++ x86_64/org/eclipse/swt/internal/gtk/PangoLayoutRun.java 2009-09-17 08:48:24.000000000 -0400

24256

@@ -16,8 +16,8 @@

24257

24258

public class PangoLayoutRun {

24259

/** @field cast=(PangoItem *) */

24260

- public int /*long*/ item;

24261

+ public long /*int*/ item;

24262

/** @field cast=(PangoGlyphString *) */

24263

- public int /*long*/ glyphs;

24264

+ public long /*int*/ glyphs;

24265

public static final int sizeof = OS.PangoLayoutRun_sizeof();

24266

}

24267

diff -urN x86/org/eclipse/swt/internal/gtk/XAnyEvent.java x86_64/org/eclipse/swt/internal/gtk/XAnyEvent.java

24268

--- x86/org/eclipse/swt/internal/gtk/XAnyEvent.java 2009-05-29 17:30:08.000000000 -0400

24269

+++ x86_64/org/eclipse/swt/internal/gtk/XAnyEvent.java 2009-09-17 08:48:24.000000000 -0400

24270

@@ -12,11 +12,11 @@

24271

24272

24273

public abstract class XAnyEvent extends XEvent {

24274

- public int /*long*/ serial;

24275

+ public long /*int*/ serial;

24276

public int send_event;

24277

/** @field cast=(Display *) */

24278

- public int /*long*/ display;

24279

+ public long /*int*/ display;

24280

/** @field cast=(Window) */

24281

- public int /*long*/ window;

24282

+ public long /*int*/ window;

24283

public static final int sizeof = OS.XAnyEvent_sizeof();

24284

}

24285

diff -urN x86/org/eclipse/swt/internal/gtk/XClientMessageEvent.java x86_64/org/eclipse/swt/internal/gtk/XClientMessageEvent.java

24286

--- x86/org/eclipse/swt/internal/gtk/XClientMessageEvent.java 2009-05-29 17:30:10.000000000 -0400

24287

+++ x86_64/org/eclipse/swt/internal/gtk/XClientMessageEvent.java 2009-09-17 08:48:24.000000000 -0400

24288

@@ -13,16 +13,16 @@

24289

24290

public class XClientMessageEvent {

24291

public int type;

24292

- public int /*long*/ serial;

24293

+ public long /*int*/ serial;

24294

public boolean send_event;

24295

/** @field cast=(Display *) */

24296

- public int /*long*/ display;

24297

+ public long /*int*/ display;

24298

/** @field cast=(Window) */

24299

- public int /*long*/ window;

24300

+ public long /*int*/ window;

24301

/** @field cast=(Atom) */

24302

- public int /*long*/ message_type;

24303

+ public long /*int*/ message_type;

24304

public int format;

24305

/** @field accessor=data.l,cast=(long *) */

24306

- public int /*long*/[] data = new int /*long*/[5];

24307

+ public long /*int*/[] data = new long /*int*/[5];

24308

public static final int sizeof = OS.XClientMessageEvent_sizeof();

24309

}

24310

diff -urN x86/org/eclipse/swt/internal/gtk/XCrossingEvent.java x86_64/org/eclipse/swt/internal/gtk/XCrossingEvent.java

24311

--- x86/org/eclipse/swt/internal/gtk/XCrossingEvent.java 2009-05-29 17:30:08.000000000 -0400

24312

+++ x86_64/org/eclipse/swt/internal/gtk/XCrossingEvent.java 2009-09-17 08:48:24.000000000 -0400

24313

@@ -13,9 +13,9 @@

24314

24315

public class XCrossingEvent extends XAnyEvent {

24316

/** @field cast=(Window) */

24317

- public int /*long*/ root;

24318

+ public long /*int*/ root;

24319

/** @field cast=(Window) */

24320

- public int /*long*/ subwindow;

24321

+ public long /*int*/ subwindow;

24322

/** @field cast=(Time) */

24323

public int time;

24324

public int x;

24325

diff -urN x86/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java x86_64/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java

24326

--- x86/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java 2006-05-09 15:46:50.000000000 -0400

24327

+++ x86_64/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java 2009-09-17 08:48:24.000000000 -0400

24328

@@ -13,17 +13,17 @@

24329

24330

public class XRenderPictureAttributes {

24331

public boolean repeat;

24332

- public int /*long*/ alpha_map;

24333

+ public long /*int*/ alpha_map;

24334

public int alpha_x_origin;

24335

public int alpha_y_origin;

24336

public int clip_x_origin;

24337

public int clip_y_origin;

24338

- public int /*long*/ clip_mask;

24339

+ public long /*int*/ clip_mask;

24340

public boolean graphics_exposures;

24341

public int subwindow_mode;

24342

public int poly_edge;

24343

public int poly_mode;

24344

- public int /*long*/ dither;

24345

+ public long /*int*/ dither;

24346

public boolean component_alpha;

24347

public static final int sizeof = OS.XRenderPictureAttributes_sizeof();

24348

}

24349

diff -urN x86/org/eclipse/swt/internal/gtk/XWindowChanges.java x86_64/org/eclipse/swt/internal/gtk/XWindowChanges.java

24350

--- x86/org/eclipse/swt/internal/gtk/XWindowChanges.java 2009-05-29 17:30:08.000000000 -0400

24351

+++ x86_64/org/eclipse/swt/internal/gtk/XWindowChanges.java 2009-09-17 08:48:24.000000000 -0400

24352

@@ -17,7 +17,7 @@

24353

public int width;

24354

public int height;

24355

public int border_width;

24356

- public int /*long*/ sibling;

24357

+ public long /*int*/ sibling;

24358

public int stack_mode;

24359

public static final int sizeof = OS.XWindowChanges_sizeof();

24360

}

24361

diff -urN x86/org/eclipse/swt/internal/Library.java x86_64/org/eclipse/swt/internal/Library.java

24362

--- x86/org/eclipse/swt/internal/Library.java 2009-09-09 15:57:44.000000000 -0400

24363

+++ x86_64/org/eclipse/swt/internal/Library.java 2009-09-17 08:48:24.000000000 -0400

24364

@@ -39,7 +39,7 @@

24365

static final String SEPARATOR;

24366

24367

/* 64-bit support */

24368

- static /*final*/ boolean IS_64 = 0x1FFFFFFFFL == (int /*long*/)0x1FFFFFFFFL;

24369

+ static /*final*/ boolean IS_64 = 0x1FFFFFFFFL == (long /*int*/)0x1FFFFFFFFL;

24370

static final String SUFFIX_64 = "-64"; //$NON-NLS-1$

24371

static final String SWTDIR_32 = "swtlib-32"; //$NON-NLS-1$

24372

static final String SWTDIR_64 = "swtlib-64"; //$NON-NLS-1$

24373

diff -urN x86/org/eclipse/swt/internal/LONG.java x86_64/org/eclipse/swt/internal/LONG.java

24374

--- x86/org/eclipse/swt/internal/LONG.java 2009-05-29 17:30:14.000000000 -0400

24375

+++ x86_64/org/eclipse/swt/internal/LONG.java 2009-09-17 08:48:24.000000000 -0400

24376

@@ -12,9 +12,9 @@

24377

24378

/** @jniclass flags=no_gen */

24379

public class LONG {

24380

- public int /*long*/ value;

24381

+ public long /*int*/ value;

24382

24383

- public LONG (int /*long*/ value) {

24384

+ public LONG (long /*int*/ value) {

24385

this.value = value;

24386

}

24387

24388

diff -urN x86/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java x86_64/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java

24389

--- x86/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java 2009-05-29 17:30:32.000000000 -0400

24390

+++ x86_64/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java 2009-09-17 08:48:20.000000000 -0400

24391

@@ -13,10 +13,10 @@

24392

/** @jniclass flags=cpp */

24393

public class GREVersionRange {

24394

/** @field cast=(const char *) */

24395

- public int /*long*/ lower;

24396

+ public long /*int*/ lower;

24397

public boolean lowerInclusive;

24398

/** @field cast=(const char *) */

24399

- public int /*long*/ upper;

24400

+ public long /*int*/ upper;

24401

public boolean upperInclusive;

24402

public static final int sizeof = XPCOMInit.GREVersionRange_sizeof();

24403

}

24404

diff -urN x86/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java x86_64/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java

24405

--- x86/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java 2008-09-10 18:29:32.000000000 -0400

24406

+++ x86_64/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java 2009-09-17 08:48:20.000000000 -0400

24407

@@ -40,8 +40,8 @@

24408

* @param properties cast=(const GREProperty *)

24409

* @param buffer cast=(char *)

24410

*/

24411

-public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen);

24412

-public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen) {

24413

+public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, long /*int*/ properties, int propertiesLength, long /*int*/ buffer, int buflen);

24414

+public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, long /*int*/ properties, int propertiesLength, long /*int*/ buffer, int buflen) {

24415

lock.lock();

24416

try {

24417

return _GRE_GetGREPathWithProperties(versions, versionsLength, properties, propertiesLength, buffer, buflen);

24418

diff -urN x86/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java x86_64/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java

24419

--- x86/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java 2009-04-01 14:55:54.000000000 -0400

24420

+++ x86_64/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java 2009-09-17 08:48:20.000000000 -0400

24421

@@ -12,7 +12,7 @@

24422

24423

public class nsDynamicFunctionLoad {

24424

/** @field cast=(const char *) */

24425

- public int /*long*/ functionName;

24426

+ public long /*int*/ functionName;

24427

/** @field cast=(NSFuncPtr *) */

24428

- public int /*long*/ function;

24429

+ public long /*int*/ function;

24430

}

24431

diff -urN x86/org/eclipse/swt/internal/mozilla/nsEmbedString.java x86_64/org/eclipse/swt/internal/mozilla/nsEmbedString.java

24432

--- x86/org/eclipse/swt/internal/mozilla/nsEmbedString.java 2006-05-09 14:54:24.000000000 -0400

24433

+++ x86_64/org/eclipse/swt/internal/mozilla/nsEmbedString.java 2009-09-17 08:48:20.000000000 -0400

24434

@@ -28,7 +28,7 @@

24435

package org.eclipse.swt.internal.mozilla;

24436

24437

public class nsEmbedString {

24438

- int /*long*/ handle;

24439

+ long /*int*/ handle;

24440

24441

public nsEmbedString() {

24442

handle = XPCOM.nsEmbedString_new();

24443

@@ -42,14 +42,14 @@

24444

}

24445

}

24446

24447

-public int /*long*/ getAddress() {

24448

+public long /*int*/ getAddress() {

24449

return handle;

24450

}

24451

24452

public String toString() {

24453

if (handle == 0) return null;

24454

int length = XPCOM.nsEmbedString_Length(handle);

24455

- int /*long*/ buffer = XPCOM.nsEmbedString_get(handle);

24456

+ long /*int*/ buffer = XPCOM.nsEmbedString_get(handle);

24457

char[] dest = new char[length];

24458

XPCOM.memmove(dest, buffer, length * 2);

24459

return new String(dest);

24460

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIAppShell.java x86_64/org/eclipse/swt/internal/mozilla/nsIAppShell.java

24461

--- x86/org/eclipse/swt/internal/mozilla/nsIAppShell.java 2008-10-22 16:19:54.000000000 -0400

24462

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIAppShell.java 2009-09-17 08:48:20.000000000 -0400

24463

@@ -37,11 +37,11 @@

24464

public static final nsID NS_IAPPSHELL_IID =

24465

new nsID(NS_IAPPSHELL_IID_STR);

24466

24467

- public nsIAppShell(int /*long*/ address) {

24468

+ public nsIAppShell(long /*int*/ address) {

24469

super(address);

24470

}

24471

24472

- public int Create(int /*long*/ argc, int /*long*/[] argv) {

24473

+ public int Create(long /*int*/ argc, long /*int*/[] argv) {

24474

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);

24475

}

24476

24477

@@ -57,15 +57,15 @@

24478

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());

24479

}

24480

24481

- public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {

24482

+ public int ListenToEventQueue(long /*int*/ aQueue, int aListen) {

24483

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);

24484

}

24485

24486

- public int GetNativeEvent(int /*long*/ aRealEvent, int /*long*/[] aEvent) {

24487

+ public int GetNativeEvent(long /*int*/ aRealEvent, long /*int*/[] aEvent) {

24488

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);

24489

}

24490

24491

- public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {

24492

+ public int DispatchNativeEvent(int aRealEvent, long /*int*/ aEvent) {

24493

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);

24494

}

24495

24496

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java x86_64/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java

24497

--- x86/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java 2008-03-04 12:13:06.000000000 -0500

24498

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java 2009-09-17 08:48:20.000000000 -0400

24499

@@ -37,7 +37,7 @@

24500

public static final nsID NS_IAUTHINFORMATION_IID =

24501

new nsID(NS_IAUTHINFORMATION_IID_STR);

24502

24503

- public nsIAuthInformation(int /*long*/ address) {

24504

+ public nsIAuthInformation(long /*int*/ address) {

24505

super(address);

24506

}

24507

24508

@@ -53,35 +53,35 @@

24509

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFlags);

24510

}

24511

24512

- public int GetRealm(int /*long*/ aRealm) {

24513

+ public int GetRealm(long /*int*/ aRealm) {

24514

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aRealm);

24515

}

24516

24517

- public int GetAuthenticationScheme(int /*long*/ aAuthenticationScheme) {

24518

+ public int GetAuthenticationScheme(long /*int*/ aAuthenticationScheme) {

24519

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aAuthenticationScheme);

24520

}

24521

24522

- public int GetUsername(int /*long*/ aUsername) {

24523

+ public int GetUsername(long /*int*/ aUsername) {

24524

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aUsername);

24525

}

24526

24527

- public int SetUsername(int /*long*/ aUsername) {

24528

+ public int SetUsername(long /*int*/ aUsername) {

24529

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aUsername);

24530

}

24531

24532

- public int GetPassword(int /*long*/ aPassword) {

24533

+ public int GetPassword(long /*int*/ aPassword) {

24534

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPassword);

24535

}

24536

24537

- public int SetPassword(int /*long*/ aPassword) {

24538

+ public int SetPassword(long /*int*/ aPassword) {

24539

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aPassword);

24540

}

24541

24542

- public int GetDomain(int /*long*/ aDomain) {

24543

+ public int GetDomain(long /*int*/ aDomain) {

24544

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aDomain);

24545

}

24546

24547

- public int SetDomain(int /*long*/ aDomain) {

24548

+ public int SetDomain(long /*int*/ aDomain) {

24549

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDomain);

24550

}

24551

}

24552

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java x86_64/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java

24553

--- x86/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java 2009-08-19 16:24:48.000000000 -0400

24554

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java 2009-09-17 08:48:20.000000000 -0400

24555

@@ -37,11 +37,11 @@

24556

public static final nsID NS_IBADCERTLISTENER2_IID =

24557

new nsID(NS_IBADCERTLISTENER2_IID_STR);

24558

24559

- public nsIBadCertListener2(int /*long*/ address) {

24560

+ public nsIBadCertListener2(long /*int*/ address) {

24561

super(address);

24562

}

24563

24564

- public int NotifyCertProblem(int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int[] _retval) {

24565

+ public int NotifyCertProblem(long /*int*/ socketInfo, long /*int*/ status, long /*int*/ targetSite, int[] _retval) {

24566

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), socketInfo, status, targetSite, _retval);

24567

}

24568

}

24569

\ No newline at end of file

24570

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java

24571

--- x86/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java 2008-10-22 16:19:54.000000000 -0400

24572

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java 2009-09-17 08:48:20.000000000 -0400

24573

@@ -37,11 +37,11 @@

24574

public static final nsID NS_IBASEWINDOW_IID =

24575

new nsID(NS_IBASEWINDOW_IID_STR);

24576

24577

- public nsIBaseWindow(int /*long*/ address) {

24578

+ public nsIBaseWindow(long /*int*/ address) {

24579

super(address);

24580

}

24581

24582

- public int InitWindow(int /*long*/ parentNativeWindow, int /*long*/ parentWidget, int x, int y, int cx, int cy) {

24583

+ public int InitWindow(long /*int*/ parentNativeWindow, long /*int*/ parentWidget, int x, int y, int cx, int cy) {

24584

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);

24585

}

24586

24587

@@ -81,19 +81,19 @@

24588

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force);

24589

}

24590

24591

- public int GetParentWidget(int /*long*/[] aParentWidget) {

24592

+ public int GetParentWidget(long /*int*/[] aParentWidget) {

24593

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aParentWidget);

24594

}

24595

24596

- public int SetParentWidget(int /*long*/ aParentWidget) {

24597

+ public int SetParentWidget(long /*int*/ aParentWidget) {

24598

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aParentWidget);

24599

}

24600

24601

- public int GetParentNativeWindow(int /*long*/[] aParentNativeWindow) {

24602

+ public int GetParentNativeWindow(long /*int*/[] aParentNativeWindow) {

24603

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aParentNativeWindow);

24604

}

24605

24606

- public int SetParentNativeWindow(int /*long*/ aParentNativeWindow) {

24607

+ public int SetParentNativeWindow(long /*int*/ aParentNativeWindow) {

24608

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);

24609

}

24610

24611

@@ -121,7 +121,7 @@

24612

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);

24613

}

24614

24615

- public int GetMainWidget(int /*long*/[] aMainWidget) {

24616

+ public int GetMainWidget(long /*int*/[] aMainWidget) {

24617

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aMainWidget);

24618

}

24619

24620

@@ -129,7 +129,7 @@

24621

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress());

24622

}

24623

24624

- public int GetTitle(int /*long*/[] aTitle) {

24625

+ public int GetTitle(long /*int*/[] aTitle) {

24626

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aTitle);

24627

}

24628

24629

diff -urN x86/org/eclipse/swt/internal/mozilla/nsICancelable.java x86_64/org/eclipse/swt/internal/mozilla/nsICancelable.java

24630

--- x86/org/eclipse/swt/internal/mozilla/nsICancelable.java 2006-10-26 11:24:38.000000000 -0400

24631

+++ x86_64/org/eclipse/swt/internal/mozilla/nsICancelable.java 2009-09-17 08:48:20.000000000 -0400

24632

@@ -37,7 +37,7 @@

24633

public static final nsID NS_ICANCELABLE_IID =

24634

new nsID(NS_ICANCELABLE_IID_STR);

24635

24636

- public nsICancelable(int /*long*/ address) {

24637

+ public nsICancelable(long /*int*/ address) {

24638

super(address);

24639

}

24640

24641

diff -urN x86/org/eclipse/swt/internal/mozilla/nsICategoryManager.java x86_64/org/eclipse/swt/internal/mozilla/nsICategoryManager.java

24642

--- x86/org/eclipse/swt/internal/mozilla/nsICategoryManager.java 2008-10-22 16:19:54.000000000 -0400

24643

+++ x86_64/org/eclipse/swt/internal/mozilla/nsICategoryManager.java 2009-09-17 08:48:20.000000000 -0400

24644

@@ -37,15 +37,15 @@

24645

public static final nsID NS_ICATEGORYMANAGER_IID =

24646

new nsID(NS_ICATEGORYMANAGER_IID_STR);

24647

24648

- public nsICategoryManager(int /*long*/ address) {

24649

+ public nsICategoryManager(long /*int*/ address) {

24650

super(address);

24651

}

24652

24653

- public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, int /*long*/[] _retval) {

24654

+ public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, long /*int*/[] _retval) {

24655

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCategory, aEntry, _retval);

24656

}

24657

24658

- public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, int /*long*/[] _retval) {

24659

+ public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, long /*int*/[] _retval) {

24660

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval);

24661

}

24662

24663

@@ -57,11 +57,11 @@

24664

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aCategory);

24665

}

24666

24667

- public int EnumerateCategory(byte[] aCategory, int /*long*/[] _retval) {

24668

+ public int EnumerateCategory(byte[] aCategory, long /*int*/[] _retval) {

24669

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCategory, _retval);

24670

}

24671

24672

- public int EnumerateCategories(int /*long*/[] _retval) {

24673

+ public int EnumerateCategories(long /*int*/[] _retval) {

24674

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);

24675

}

24676

}

24677

diff -urN x86/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java x86_64/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java

24678

--- x86/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java 2009-08-19 16:24:48.000000000 -0400

24679

+++ x86_64/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java 2009-09-17 08:48:20.000000000 -0400

24680

@@ -37,31 +37,31 @@

24681

public static final nsID NS_ICERTIFICATEDIALOGS_IID =

24682

new nsID(NS_ICERTIFICATEDIALOGS_IID_STR);

24683

24684

- public nsICertificateDialogs(int /*long*/ address) {

24685

+ public nsICertificateDialogs(long /*int*/ address) {

24686

super(address);

24687

}

24688

24689

- public int ConfirmDownloadCACert(int /*long*/ ctx, int /*long*/ cert, int[] trust, int[] _retval) {

24690

+ public int ConfirmDownloadCACert(long /*int*/ ctx, long /*int*/ cert, int[] trust, int[] _retval) {

24691

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), ctx, cert, trust, _retval);

24692

}

24693

24694

- public int NotifyCACertExists(int /*long*/ ctx) {

24695

+ public int NotifyCACertExists(long /*int*/ ctx) {

24696

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ctx);

24697

}

24698

24699

- public int SetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {

24700

+ public int SetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) {

24701

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ctx, password, _retval);

24702

}

24703

24704

- public int GetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {

24705

+ public int GetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) {

24706

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), ctx, password, _retval);

24707

}

24708

24709

- public int ViewCert(int /*long*/ ctx, int /*long*/ cert) {

24710

+ public int ViewCert(long /*int*/ ctx, long /*int*/ cert) {

24711

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), ctx, cert);

24712

}

24713

24714

- public int CrlImportStatusDialog(int /*long*/ ctx, int /*long*/ crl) {

24715

+ public int CrlImportStatusDialog(long /*int*/ ctx, long /*int*/ crl) {

24716

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), ctx, crl);

24717

}

24718

}

24719

\ No newline at end of file

24720

diff -urN x86/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java x86_64/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java

24721

--- x86/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java 2009-08-19 16:24:46.000000000 -0400

24722

+++ x86_64/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java 2009-09-17 08:48:20.000000000 -0400

24723

@@ -37,7 +37,7 @@

24724

public static final nsID NS_ICERTOVERRIDESERVICE_IID =

24725

new nsID(NS_ICERTOVERRIDESERVICE_IID_STR);

24726

24727

- public nsICertOverrideService(int /*long*/ address) {

24728

+ public nsICertOverrideService(long /*int*/ address) {

24729

super(address);

24730

}

24731

24732

@@ -47,27 +47,27 @@

24733

24734

public static final int ERROR_TIME = 4;

24735

24736

- public int RememberValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int aOverrideBits, int aTemporary) {

24737

+ public int RememberValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int aOverrideBits, int aTemporary) {

24738

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aHostName, aPort, aCert, aOverrideBits, aTemporary);

24739

}

24740

24741

- public int HasMatchingOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {

24742

+ public int HasMatchingOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {

24743

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aHostName, aPort, aCert, aOverrideBits, aIsTemporary, _retval);

24744

}

24745

24746

- public int GetValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aHashAlg, int /*long*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {

24747

+ public int GetValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aHashAlg, long /*int*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {

24748

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aHostName, aPort, aHashAlg, aFingerprint, aOverrideBits, aIsTemporary, _retval);

24749

}

24750

24751

- public int ClearValidityOverride(int /*long*/ aHostName, int aPort) {

24752

+ public int ClearValidityOverride(long /*int*/ aHostName, int aPort) {

24753

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHostName, aPort);

24754

}

24755

24756

- public int GetAllOverrideHostsWithPorts(int[] aCount, int /*long*/[] aHostsWithPortsArray) {

24757

+ public int GetAllOverrideHostsWithPorts(int[] aCount, long /*int*/[] aHostsWithPortsArray) {

24758

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCount, aHostsWithPortsArray);

24759

}

24760

24761

- public int IsCertUsedForOverrides(int /*long*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {

24762

+ public int IsCertUsedForOverrides(long /*int*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {

24763

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCert, aCheckTemporaries, aCheckPermanents, _retval);

24764

}

24765

}

24766

\ No newline at end of file

24767

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIChannel.java x86_64/org/eclipse/swt/internal/mozilla/nsIChannel.java

24768

--- x86/org/eclipse/swt/internal/mozilla/nsIChannel.java 2008-03-04 12:13:06.000000000 -0500

24769

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIChannel.java 2009-09-17 08:48:20.000000000 -0400

24770

@@ -37,55 +37,55 @@

24771

public static final nsID NS_ICHANNEL_IID =

24772

new nsID(NS_ICHANNEL_IID_STR);

24773

24774

- public nsIChannel(int /*long*/ address) {

24775

+ public nsIChannel(long /*int*/ address) {

24776

super(address);

24777

}

24778

24779

- public int GetOriginalURI(int /*long*/[] aOriginalURI) {

24780

+ public int GetOriginalURI(long /*int*/[] aOriginalURI) {

24781

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 1, getAddress(), aOriginalURI);

24782

}

24783

24784

- public int SetOriginalURI(int /*long*/ aOriginalURI) {

24785

+ public int SetOriginalURI(long /*int*/ aOriginalURI) {

24786

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 2, getAddress(), aOriginalURI);

24787

}

24788

24789

- public int GetURI(int /*long*/[] aURI) {

24790

+ public int GetURI(long /*int*/[] aURI) {

24791

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 3, getAddress(), aURI);

24792

}

24793

24794

- public int GetOwner(int /*long*/[] aOwner) {

24795

+ public int GetOwner(long /*int*/[] aOwner) {

24796

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 4, getAddress(), aOwner);

24797

}

24798

24799

- public int SetOwner(int /*long*/ aOwner) {

24800

+ public int SetOwner(long /*int*/ aOwner) {

24801

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 5, getAddress(), aOwner);

24802

}

24803

24804

- public int GetNotificationCallbacks(int /*long*/[] aNotificationCallbacks) {

24805

+ public int GetNotificationCallbacks(long /*int*/[] aNotificationCallbacks) {

24806

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 6, getAddress(), aNotificationCallbacks);

24807

}

24808

24809

- public int SetNotificationCallbacks(int /*long*/ aNotificationCallbacks) {

24810

+ public int SetNotificationCallbacks(long /*int*/ aNotificationCallbacks) {

24811

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 7, getAddress(), aNotificationCallbacks);

24812

}

24813

24814

- public int GetSecurityInfo(int /*long*/[] aSecurityInfo) {

24815

+ public int GetSecurityInfo(long /*int*/[] aSecurityInfo) {

24816

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 8, getAddress(), aSecurityInfo);

24817

}

24818

24819

- public int GetContentType(int /*long*/ aContentType) {

24820

+ public int GetContentType(long /*int*/ aContentType) {

24821

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 9, getAddress(), aContentType);

24822

}

24823

24824

- public int SetContentType(int /*long*/ aContentType) {

24825

+ public int SetContentType(long /*int*/ aContentType) {

24826

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 10, getAddress(), aContentType);

24827

}

24828

24829

- public int GetContentCharset(int /*long*/ aContentCharset) {

24830

+ public int GetContentCharset(long /*int*/ aContentCharset) {

24831

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 11, getAddress(), aContentCharset);

24832

}

24833

24834

- public int SetContentCharset(int /*long*/ aContentCharset) {

24835

+ public int SetContentCharset(long /*int*/ aContentCharset) {

24836

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 12, getAddress(), aContentCharset);

24837

}

24838

24839

@@ -97,11 +97,11 @@

24840

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 14, getAddress(), aContentLength);

24841

}

24842

24843

- public int Open(int /*long*/[] _retval) {

24844

+ public int Open(long /*int*/[] _retval) {

24845

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 15, getAddress(), _retval);

24846

}

24847

24848

- public int AsyncOpen(int /*long*/ aListener, int /*long*/ aContext) {

24849

+ public int AsyncOpen(long /*int*/ aListener, long /*int*/ aContext) {

24850

return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 16, getAddress(), aListener, aContext);

24851

}

24852

24853

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIClassInfo.java x86_64/org/eclipse/swt/internal/mozilla/nsIClassInfo.java

24854

--- x86/org/eclipse/swt/internal/mozilla/nsIClassInfo.java 2008-12-02 11:18:44.000000000 -0500

24855

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIClassInfo.java 2009-09-17 08:48:20.000000000 -0400

24856

@@ -37,27 +37,27 @@

24857

public static final nsID NS_ICLASSINFO_IID =

24858

new nsID(NS_ICLASSINFO_IID_STR);

24859

24860

- public nsIClassInfo(int /*long*/ address) {

24861

+ public nsIClassInfo(long /*int*/ address) {

24862

super(address);

24863

}

24864

24865

- public int GetInterfaces(int[] count, int /*long*/[] array) {

24866

+ public int GetInterfaces(int[] count, long /*int*/[] array) {

24867

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), count, array);

24868

}

24869

24870

- public int GetHelperForLanguage(int language, int /*long*/[] _retval) {

24871

+ public int GetHelperForLanguage(int language, long /*int*/[] _retval) {

24872

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), language, _retval);

24873

}

24874

24875

- public int GetContractID(int /*long*/[] aContractID) {

24876

+ public int GetContractID(long /*int*/[] aContractID) {

24877

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContractID);

24878

}

24879

24880

- public int GetClassDescription(int /*long*/[] aClassDescription) {

24881

+ public int GetClassDescription(long /*int*/[] aClassDescription) {

24882

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClassDescription);

24883

}

24884

24885

- public int GetClassID(int /*long*/ aClassID) {

24886

+ public int GetClassID(long /*int*/ aClassID) {

24887

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClassID);

24888

}

24889

24890

@@ -85,7 +85,7 @@

24891

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFlags);

24892

}

24893

24894

- public int GetClassIDNoAlloc(int /*long*/ aClassIDNoAlloc) {

24895

+ public int GetClassIDNoAlloc(long /*int*/ aClassIDNoAlloc) {

24896

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aClassIDNoAlloc);

24897

}

24898

}

24899

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIComponentManager.java x86_64/org/eclipse/swt/internal/mozilla/nsIComponentManager.java

24900

--- x86/org/eclipse/swt/internal/mozilla/nsIComponentManager.java 2006-05-09 14:54:24.000000000 -0400

24901

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIComponentManager.java 2009-09-17 08:48:20.000000000 -0400

24902

@@ -37,23 +37,23 @@

24903

public static final nsID NS_ICOMPONENTMANAGER_IID =

24904

new nsID(NS_ICOMPONENTMANAGER_IID_STR);

24905

24906

- public nsIComponentManager(int /*long*/ address) {

24907

+ public nsIComponentManager(long /*int*/ address) {

24908

super(address);

24909

}

24910

24911

- public int GetClassObject(nsID aClass, nsID aIID, int /*long*/[] result) {

24912

+ public int GetClassObject(nsID aClass, nsID aIID, long /*int*/[] result) {

24913

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);

24914

}

24915

24916

- public int GetClassObjectByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {

24917

+ public int GetClassObjectByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) {

24918

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);

24919

}

24920

24921

- public int CreateInstance(nsID aClass, int /*long*/ aDelegate, nsID aIID, int /*long*/[] result) {

24922

+ public int CreateInstance(nsID aClass, long /*int*/ aDelegate, nsID aIID, long /*int*/[] result) {

24923

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aDelegate, aIID, result);

24924

}

24925

24926

- public int CreateInstanceByContractID(byte[] aContractID, int /*long*/ aDelegate, nsID aIID, int /*long*/[] result) {

24927

+ public int CreateInstanceByContractID(byte[] aContractID, long /*int*/ aDelegate, nsID aIID, long /*int*/[] result) {

24928

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aDelegate, aIID, result);

24929

}

24930

}

24931

\ No newline at end of file

24932

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java x86_64/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java

24933

--- x86/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java 2008-10-22 16:19:54.000000000 -0400

24934

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java 2009-09-17 08:48:20.000000000 -0400

24935

@@ -37,31 +37,31 @@

24936

public static final nsID NS_ICOMPONENTREGISTRAR_IID =

24937

new nsID(NS_ICOMPONENTREGISTRAR_IID_STR);

24938

24939

- public nsIComponentRegistrar(int /*long*/ address) {

24940

+ public nsIComponentRegistrar(long /*int*/ address) {

24941

super(address);

24942

}

24943

24944

- public int AutoRegister(int /*long*/ aSpec) {

24945

+ public int AutoRegister(long /*int*/ aSpec) {

24946

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);

24947

}

24948

24949

- public int AutoUnregister(int /*long*/ aSpec) {

24950

+ public int AutoUnregister(long /*int*/ aSpec) {

24951

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);

24952

}

24953

24954

- public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFactory) {

24955

+ public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFactory) {

24956

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory);

24957

}

24958

24959

- public int UnregisterFactory(nsID aClass, int /*long*/ aFactory) {

24960

+ public int UnregisterFactory(nsID aClass, long /*int*/ aFactory) {

24961

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClass, aFactory);

24962

}

24963

24964

- public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFile, byte[] aLoaderStr, byte[] aType) {

24965

+ public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFile, byte[] aLoaderStr, byte[] aType) {

24966

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClass, aClassName, aContractID, aFile, aLoaderStr, aType);

24967

}

24968

24969

- public int UnregisterFactoryLocation(nsID aClass, int /*long*/ aFile) {

24970

+ public int UnregisterFactoryLocation(nsID aClass, long /*int*/ aFile) {

24971

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile);

24972

}

24973

24974

@@ -73,19 +73,19 @@

24975

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval);

24976

}

24977

24978

- public int EnumerateCIDs(int /*long*/[] _retval) {

24979

+ public int EnumerateCIDs(long /*int*/[] _retval) {

24980

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);

24981

}

24982

24983

- public int EnumerateContractIDs(int /*long*/[] _retval) {

24984

+ public int EnumerateContractIDs(long /*int*/[] _retval) {

24985

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);

24986

}

24987

24988

- public int CIDToContractID(nsID aClass, int /*long*/[] _retval) {

24989

+ public int CIDToContractID(nsID aClass, long /*int*/[] _retval) {

24990

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aClass, _retval);

24991

}

24992

24993

- public int ContractIDToCID(byte[] aContractID, int /*long*/ _retval) {

24994

+ public int ContractIDToCID(byte[] aContractID, long /*int*/ _retval) {

24995

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval);

24996

}

24997

}

24998

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java

24999

--- x86/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java 2006-05-09 14:54:24.000000000 -0400

25000

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java 2009-09-17 08:48:20.000000000 -0400

25001

@@ -37,7 +37,7 @@

25002

public static final nsID NS_ICONTEXTMENULISTENER_IID =

25003

new nsID(NS_ICONTEXTMENULISTENER_IID_STR);

25004

25005

- public nsIContextMenuListener(int /*long*/ address) {

25006

+ public nsIContextMenuListener(long /*int*/ address) {

25007

super(address);

25008

}

25009

25010

@@ -53,7 +53,7 @@

25011

25012

public static final int CONTEXT_INPUT = 16;

25013

25014

- public int OnShowContextMenu(int aContextFlags, int /*long*/ aEvent, int /*long*/ aNode) {

25015

+ public int OnShowContextMenu(int aContextFlags, long /*int*/ aEvent, long /*int*/ aNode) {

25016

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aContextFlags, aEvent, aNode);

25017

}

25018

}

25019

\ No newline at end of file

25020

diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookie.java x86_64/org/eclipse/swt/internal/mozilla/nsICookie.java

25021

--- x86/org/eclipse/swt/internal/mozilla/nsICookie.java 2008-10-22 16:17:00.000000000 -0400

25022

+++ x86_64/org/eclipse/swt/internal/mozilla/nsICookie.java 2009-09-17 08:48:20.000000000 -0400

25023

@@ -37,15 +37,15 @@

25024

public static final nsID NS_ICOOKIE_IID =

25025

new nsID(NS_ICOOKIE_IID_STR);

25026

25027

- public nsICookie(int /*long*/ address) {

25028

+ public nsICookie(long /*int*/ address) {

25029

super(address);

25030

}

25031

25032

- public int GetName(int /*long*/ aName) {

25033

+ public int GetName(long /*int*/ aName) {

25034

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);

25035

}

25036

25037

- public int GetValue(int /*long*/ aValue) {

25038

+ public int GetValue(long /*int*/ aValue) {

25039

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue);

25040

}

25041

25042

@@ -53,11 +53,11 @@

25043

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain);

25044

}

25045

25046

- public int GetHost(int /*long*/ aHost) {

25047

+ public int GetHost(long /*int*/ aHost) {

25048

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHost);

25049

}

25050

25051

- public int GetPath(int /*long*/ aPath) {

25052

+ public int GetPath(long /*int*/ aPath) {

25053

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath);

25054

}

25055

25056

@@ -79,7 +79,7 @@

25057

25058

public static final int STATUS_REJECTED = 4;

25059

25060

- public int GetStatus(int /*long*/ aStatus) {

25061

+ public int GetStatus(long /*int*/ aStatus) {

25062

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus);

25063

}

25064

25065

@@ -95,7 +95,7 @@

25066

25067

public static final int POLICY_NO_II = 5;

25068

25069

- public int GetPolicy(int /*long*/ aPolicy) {

25070

+ public int GetPolicy(long /*int*/ aPolicy) {

25071

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy);

25072

}

25073

}

25074

diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieManager.java x86_64/org/eclipse/swt/internal/mozilla/nsICookieManager.java

25075

--- x86/org/eclipse/swt/internal/mozilla/nsICookieManager.java 2008-10-22 16:17:00.000000000 -0400

25076

+++ x86_64/org/eclipse/swt/internal/mozilla/nsICookieManager.java 2009-09-17 08:48:20.000000000 -0400

25077

@@ -37,7 +37,7 @@

25078

public static final nsID NS_ICOOKIEMANAGER_IID =

25079

new nsID(NS_ICOOKIEMANAGER_IID_STR);

25080

25081

- public nsICookieManager(int /*long*/ address) {

25082

+ public nsICookieManager(long /*int*/ address) {

25083

super(address);

25084

}

25085

25086

@@ -45,11 +45,11 @@

25087

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());

25088

}

25089

25090

- public int GetEnumerator(int /*long*/[] aEnumerator) {

25091

+ public int GetEnumerator(long /*int*/[] aEnumerator) {

25092

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator);

25093

}

25094

25095

- public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) {

25096

+ public int Remove(long /*int*/ aDomain, long /*int*/ aName, long /*int*/ aPath, int aBlocked) {

25097

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked);

25098

}

25099

}

25100

diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java

25101

--- x86/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java 2009-02-27 16:59:42.000000000 -0500

25102

+++ x86_64/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java 2009-09-17 08:48:20.000000000 -0400

25103

@@ -37,23 +37,23 @@

25104

public static final nsID NS_ICOOKIESERVICE_IID =

25105

new nsID(NS_ICOOKIESERVICE_IID_STR);

25106

25107

- public nsICookieService_1_9(int /*long*/ address) {

25108

+ public nsICookieService_1_9(long /*int*/ address) {

25109

super(address);

25110

}

25111

25112

- public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {

25113

+ public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) {

25114

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);

25115

}

25116

25117

- public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {

25118

+ public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) {

25119

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);

25120

}

25121

25122

- public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {

25123

+ public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) {

25124

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);

25125

}

25126

25127

- public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {

25128

+ public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) {

25129

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);

25130

}

25131

}

25132

diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieService.java x86_64/org/eclipse/swt/internal/mozilla/nsICookieService.java

25133

--- x86/org/eclipse/swt/internal/mozilla/nsICookieService.java 2009-02-27 16:59:42.000000000 -0500

25134

+++ x86_64/org/eclipse/swt/internal/mozilla/nsICookieService.java 2009-09-17 08:48:20.000000000 -0400

25135

@@ -38,23 +38,23 @@

25136

public static final nsID NS_ICOOKIESERVICE_IID =

25137

new nsID(NS_ICOOKIESERVICE_IID_STR);

25138

25139

- public nsICookieService(int /*long*/ address) {

25140

+ public nsICookieService(long /*int*/ address) {

25141

super(address);

25142

}

25143

25144

- public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {

25145

+ public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) {

25146

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);

25147

}

25148

25149

- public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {

25150

+ public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) {

25151

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);

25152

}

25153

25154

- public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {

25155

+ public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) {

25156

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);

25157

}

25158

25159

- public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {

25160

+ public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) {

25161

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);

25162

}

25163

25164

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDataType.java x86_64/org/eclipse/swt/internal/mozilla/nsIDataType.java

25165

--- x86/org/eclipse/swt/internal/mozilla/nsIDataType.java 2008-12-02 11:18:44.000000000 -0500

25166

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDataType.java 2009-09-17 08:48:20.000000000 -0400

25167

@@ -11,7 +11,7 @@

25168

public static final nsID NS_IDATATYPE_IID =

25169

new nsID(NS_IDATATYPE_IID_STR);

25170

25171

- public nsIDataType(int /*long*/ address) {

25172

+ public nsIDataType(long /*int*/ address) {

25173

super(address);

25174

}

25175

25176

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java

25177

--- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java 2008-10-22 16:17:00.000000000 -0400

25178

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java 2009-09-17 08:48:20.000000000 -0400

25179

@@ -37,7 +37,7 @@

25180

public static final nsID NS_IDIRECTORYSERVICE_IID =

25181

new nsID(NS_IDIRECTORYSERVICE_IID_STR);

25182

25183

- public nsIDirectoryService(int /*long*/ address) {

25184

+ public nsIDirectoryService(long /*int*/ address) {

25185

super(address);

25186

}

25187

25188

@@ -45,11 +45,11 @@

25189

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());

25190

}

25191

25192

- public int RegisterProvider(int /*long*/ prov) {

25193

+ public int RegisterProvider(long /*int*/ prov) {

25194

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov);

25195

}

25196

25197

- public int UnregisterProvider(int /*long*/ prov) {

25198

+ public int UnregisterProvider(long /*int*/ prov) {

25199

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);

25200

}

25201

}

25202

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java

25203

--- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java 2007-03-02 11:13:26.000000000 -0500

25204

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java 2009-09-17 08:48:20.000000000 -0400

25205

@@ -37,11 +37,11 @@

25206

public static final nsID NS_IDIRECTORYSERVICEPROVIDER2_IID =

25207

new nsID(NS_IDIRECTORYSERVICEPROVIDER2_IID_STRING);

25208

25209

- public nsIDirectoryServiceProvider2(int /*long*/ address) {

25210

+ public nsIDirectoryServiceProvider2(long /*int*/ address) {

25211

super(address);

25212

}

25213

25214

- public int GetFiles(byte[] prop, int /*long*/[] _retval) {

25215

+ public int GetFiles(byte[] prop, long /*int*/[] _retval) {

25216

return XPCOM.VtblCall(nsIDirectoryServiceProvider.LAST_METHOD_ID + 1, getAddress(), prop, _retval);

25217

}

25218

}

25219

\ No newline at end of file

25220

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java

25221

--- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java 2008-10-22 16:17:00.000000000 -0400

25222

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java 2009-09-17 08:48:20.000000000 -0400

25223

@@ -37,11 +37,11 @@

25224

public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =

25225

new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);

25226

25227

- public nsIDirectoryServiceProvider(int /*long*/ address) {

25228

+ public nsIDirectoryServiceProvider(long /*int*/ address) {

25229

super(address);

25230

}

25231

25232

- public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) {

25233

+ public int GetFile(byte[] prop, int[] persistent, long /*int*/[] _retval) {

25234

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);

25235

}

25236

}

25237

diff -urN x86/org/eclipse/swt/internal/mozilla/nsID.java x86_64/org/eclipse/swt/internal/mozilla/nsID.java

25238

--- x86/org/eclipse/swt/internal/mozilla/nsID.java 2008-09-10 18:29:30.000000000 -0400

25239

+++ x86_64/org/eclipse/swt/internal/mozilla/nsID.java 2009-09-17 08:48:20.000000000 -0400

25240

@@ -44,9 +44,9 @@

25241

}

25242

25243

public boolean Equals(nsID other) {

25244

- int /*long*/ ptr = XPCOM.nsID_new ();

25245

+ long /*int*/ ptr = XPCOM.nsID_new ();

25246

XPCOM.memmove (ptr, this, nsID.sizeof);

25247

- int /*long*/ otherPtr = XPCOM.nsID_new ();

25248

+ long /*int*/ otherPtr = XPCOM.nsID_new ();

25249

XPCOM.memmove (otherPtr, other, nsID.sizeof);

25250

boolean result = XPCOM.nsID_Equals (ptr, otherPtr) != 0;

25251

XPCOM.nsID_delete (ptr);

25252

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java

25253

--- x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java 2008-10-22 16:17:00.000000000 -0400

25254

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java 2009-09-17 08:48:20.000000000 -0400

25255

@@ -37,15 +37,15 @@

25256

public static final nsID NS_IDOCSHELL_IID =

25257

new nsID(NS_IDOCSHELL_IID_STR);

25258

25259

- public nsIDocShell_1_8(int /*long*/ address) {

25260

+ public nsIDocShell_1_8(long /*int*/ address) {

25261

super(address);

25262

}

25263

25264

- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {

25265

+ public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) {

25266

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);

25267

}

25268

25269

- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {

25270

+ public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) {

25271

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);

25272

}

25273

25274

@@ -55,11 +55,11 @@

25275

25276

public static final int INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER = 2;

25277

25278

- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {

25279

+ public int InternalLoad(long /*int*/ aURI, long /*int*/ aReferrer, long /*int*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, long /*int*/ aPostDataStream, long /*int*/ aHeadersStream, int aLoadFlags, long /*int*/ aSHEntry, int firstParty, long /*int*/[] aDocShell, long /*int*/[] aRequest) {

25280

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aFlags, aWindowTarget, aTypeHint, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);

25281

}

25282

25283

- public int CreateLoadInfo(int /*long*/[] loadInfo) {

25284

+ public int CreateLoadInfo(long /*int*/[] loadInfo) {

25285

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);

25286

}

25287

25288

@@ -67,7 +67,7 @@

25289

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());

25290

}

25291

25292

- public int SetCurrentURI(int /*long*/ aURI) {

25293

+ public int SetCurrentURI(long /*int*/ aURI) {

25294

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);

25295

}

25296

25297

@@ -75,35 +75,35 @@

25298

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), isUnload);

25299

}

25300

25301

- public int GetPresContext(int /*long*/[] aPresContext) {

25302

+ public int GetPresContext(long /*int*/[] aPresContext) {

25303

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);

25304

}

25305

25306

- public int GetPresShell(int /*long*/[] aPresShell) {

25307

+ public int GetPresShell(long /*int*/[] aPresShell) {

25308

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);

25309

}

25310

25311

- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {

25312

+ public int GetEldestPresShell(long /*int*/[] aEldestPresShell) {

25313

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);

25314

}

25315

25316

- public int GetContentViewer(int /*long*/[] aContentViewer) {

25317

+ public int GetContentViewer(long /*int*/[] aContentViewer) {

25318

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);

25319

}

25320

25321

- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {

25322

+ public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) {

25323

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);

25324

}

25325

25326

- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {

25327

+ public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) {

25328

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);

25329

}

25330

25331

- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {

25332

+ public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) {

25333

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocumentCharsetInfo);

25334

}

25335

25336

- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {

25337

+ public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) {

25338

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo);

25339

}

25340

25341

@@ -151,7 +151,7 @@

25342

25343

public static final int ENUMERATE_BACKWARDS = 1;

25344

25345

- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {

25346

+ public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) {

25347

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aItemType, aDirection, _retval);

25348

}

25349

25350

@@ -255,11 +255,11 @@

25351

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aIsExecutingOnLoadHandler);

25352

}

25353

25354

- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {

25355

+ public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) {

25356

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), aLayoutHistoryState);

25357

}

25358

25359

- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {

25360

+ public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) {

25361

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState);

25362

}

25363

25364

@@ -267,11 +267,11 @@

25365

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aShouldSaveLayoutState);

25366

}

25367

25368

- public int GetSecurityUI(int /*long*/[] aSecurityUI) {

25369

+ public int GetSecurityUI(long /*int*/[] aSecurityUI) {

25370

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aSecurityUI);

25371

}

25372

25373

- public int SetSecurityUI(int /*long*/ aSecurityUI) {

25374

+ public int SetSecurityUI(long /*int*/ aSecurityUI) {

25375

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aSecurityUI);

25376

}

25377

25378

@@ -283,7 +283,7 @@

25379

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress());

25380

}

25381

25382

- public int BeginRestore(int /*long*/ viewer, int top) {

25383

+ public int BeginRestore(long /*int*/ viewer, int top) {

25384

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), viewer, top);

25385

}

25386

25387

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell.java

25388

--- x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java 2008-10-22 16:17:00.000000000 -0400

25389

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell.java 2009-09-17 08:48:20.000000000 -0400

25390

@@ -37,23 +37,23 @@

25391

public static final nsID NS_IDOCSHELL_IID =

25392

new nsID(NS_IDOCSHELL_IID_STR);

25393

25394

- public nsIDocShell(int /*long*/ address) {

25395

+ public nsIDocShell(long /*int*/ address) {

25396

super(address);

25397

}

25398

25399

- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {

25400

+ public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) {

25401

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);

25402

}

25403

25404

- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {

25405

+ public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) {

25406

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);

25407

}

25408

25409

- 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) {

25410

+ 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) {

25411

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aInheritOwner, aWindowTarget, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);

25412

}

25413

25414

- public int CreateLoadInfo(int /*long*/[] loadInfo) {

25415

+ public int CreateLoadInfo(long /*int*/[] loadInfo) {

25416

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);

25417

}

25418

25419

@@ -61,7 +61,7 @@

25420

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());

25421

}

25422

25423

- public int SetCurrentURI(int /*long*/ aURI) {

25424

+ public int SetCurrentURI(long /*int*/ aURI) {

25425

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);

25426

}

25427

25428

@@ -69,43 +69,43 @@

25429

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress());

25430

}

25431

25432

- public int GetPresContext(int /*long*/[] aPresContext) {

25433

+ public int GetPresContext(long /*int*/[] aPresContext) {

25434

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);

25435

}

25436

25437

- public int GetPresShell(int /*long*/[] aPresShell) {

25438

+ public int GetPresShell(long /*int*/[] aPresShell) {

25439

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);

25440

}

25441

25442

- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {

25443

+ public int GetEldestPresShell(long /*int*/[] aEldestPresShell) {

25444

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);

25445

}

25446

25447

- public int GetContentViewer(int /*long*/[] aContentViewer) {

25448

+ public int GetContentViewer(long /*int*/[] aContentViewer) {

25449

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);

25450

}

25451

25452

- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {

25453

+ public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) {

25454

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);

25455

}

25456

25457

- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {

25458

+ public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) {

25459

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);

25460

}

25461

25462

- public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {

25463

+ public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) {

25464

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentURIContentListener);

25465

}

25466

25467

- public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {

25468

+ public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) {

25469

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aParentURIContentListener);

25470

}

25471

25472

- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {

25473

+ public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) {

25474

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aDocumentCharsetInfo);

25475

}

25476

25477

- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {

25478

+ public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) {

25479

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);

25480

}

25481

25482

@@ -153,7 +153,7 @@

25483

25484

public static final int ENUMERATE_BACKWARDS = 1;

25485

25486

- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {

25487

+ public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) {

25488

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);

25489

}

25490

25491

@@ -255,11 +255,11 @@

25492

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);

25493

}

25494

25495

- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {

25496

+ public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) {

25497

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aLayoutHistoryState);

25498

}

25499

25500

- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {

25501

+ public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) {

25502

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);

25503

}

25504

25505

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java

25506

--- x86/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java 2008-10-22 16:17:02.000000000 -0400

25507

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java 2009-09-17 08:48:20.000000000 -0400

25508

@@ -37,7 +37,7 @@

25509

public static final nsID NS_IDOMEVENT_IID =

25510

new nsID(NS_IDOMEVENT_IID_STR);

25511

25512

- public nsIDOMEvent(int /*long*/ address) {

25513

+ public nsIDOMEvent(long /*int*/ address) {

25514

super(address);

25515

}

25516

25517

@@ -47,15 +47,15 @@

25518

25519

public static final int BUBBLING_PHASE = 3;

25520

25521

- public int GetType(int /*long*/ aType) {

25522

+ public int GetType(long /*int*/ aType) {

25523

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType);

25524

}

25525

25526

- public int GetTarget(int /*long*/[] aTarget) {

25527

+ public int GetTarget(long /*int*/[] aTarget) {

25528

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aTarget);

25529

}

25530

25531

- public int GetCurrentTarget(int /*long*/[] aCurrentTarget) {

25532

+ public int GetCurrentTarget(long /*int*/[] aCurrentTarget) {

25533

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);

25534

}

25535

25536

@@ -71,7 +71,7 @@

25537

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);

25538

}

25539

25540

- public int GetTimeStamp(int /*long*/[] aTimeStamp) {

25541

+ public int GetTimeStamp(long /*int*/[] aTimeStamp) {

25542

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);

25543

}

25544

25545

@@ -83,7 +83,7 @@

25546

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());

25547

}

25548

25549

- public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) {

25550

+ public int InitEvent(long /*int*/ eventTypeArg, int canBubbleArg, int cancelableArg) {

25551

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);

25552

}

25553

}

25554

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java

25555

--- x86/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java 2008-10-22 16:17:00.000000000 -0400

25556

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java 2009-09-17 08:48:20.000000000 -0400

25557

@@ -37,19 +37,19 @@

25558

public static final nsID NS_IDOMEVENTTARGET_IID =

25559

new nsID(NS_IDOMEVENTTARGET_IID_STR);

25560

25561

- public nsIDOMEventTarget(int /*long*/ address) {

25562

+ public nsIDOMEventTarget(long /*int*/ address) {

25563

super(address);

25564

}

25565

25566

- public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {

25567

+ public int AddEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {

25568

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture);

25569

}

25570

25571

- public int RemoveEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {

25572

+ public int RemoveEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {

25573

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture);

25574

}

25575

25576

- public int DispatchEvent(int /*long*/ evt, int[] _retval) {

25577

+ public int DispatchEvent(long /*int*/ evt, int[] _retval) {

25578

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval);

25579

}

25580

}

25581

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java

25582

--- x86/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java 2008-10-22 16:17:00.000000000 -0400

25583

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java 2009-09-17 08:48:20.000000000 -0400

25584

@@ -37,7 +37,7 @@

25585

public static final nsID NS_IDOMKEYEVENT_IID =

25586

new nsID(NS_IDOMKEYEVENT_IID_STR);

25587

25588

- public nsIDOMKeyEvent(int /*long*/ address) {

25589

+ public nsIDOMKeyEvent(long /*int*/ address) {

25590

super(address);

25591

}

25592

25593

@@ -293,7 +293,7 @@

25594

return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey);

25595

}

25596

25597

- 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) {

25598

+ 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) {

25599

return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg);

25600

}

25601

}

25602

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java

25603

--- x86/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java 2008-10-22 16:17:02.000000000 -0400

25604

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java 2009-09-17 08:48:20.000000000 -0400

25605

@@ -37,7 +37,7 @@

25606

public static final nsID NS_IDOMMOUSEEVENT_IID =

25607

new nsID(NS_IDOMMOUSEEVENT_IID_STR);

25608

25609

- public nsIDOMMouseEvent(int /*long*/ address) {

25610

+ public nsIDOMMouseEvent(long /*int*/ address) {

25611

super(address);

25612

}

25613

25614

@@ -77,11 +77,11 @@

25615

return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton);

25616

}

25617

25618

- public int GetRelatedTarget(int /*long*/[] aRelatedTarget) {

25619

+ public int GetRelatedTarget(long /*int*/[] aRelatedTarget) {

25620

return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget);

25621

}

25622

25623

- 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) {

25624

+ 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) {

25625

return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg);

25626

}

25627

}

25628

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java

25629

--- x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java 2007-08-23 15:58:58.000000000 -0400

25630

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java 2009-09-17 08:48:20.000000000 -0400

25631

@@ -37,15 +37,15 @@

25632

public static final nsID NS_IDOMSERIALIZER_IID =

25633

new nsID(NS_IDOMSERIALIZER_IID_STR);

25634

25635

- public nsIDOMSerializer_1_7(int /*long*/ address) {

25636

+ public nsIDOMSerializer_1_7(long /*int*/ address) {

25637

super(address);

25638

}

25639

25640

- public int SerializeToString(int /*long*/ root, int /*long*/ _retval) {

25641

+ public int SerializeToString(long /*int*/ root, long /*int*/ _retval) {

25642

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), root, _retval);

25643

}

25644

25645

- public int SerializeToStream(int /*long*/ root, int /*long*/ stream, int /*long*/ charset) {

25646

+ public int SerializeToStream(long /*int*/ root, long /*int*/ stream, long /*int*/ charset) {

25647

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset);

25648

}

25649

}

25650

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java

25651

--- x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java 2007-08-23 15:58:58.000000000 -0400

25652

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java 2009-09-17 08:48:20.000000000 -0400

25653

@@ -37,15 +37,15 @@

25654

public static final nsID NS_IDOMSERIALIZER_IID =

25655

new nsID(NS_IDOMSERIALIZER_IID_STR);

25656

25657

- public nsIDOMSerializer(int /*long*/ address) {

25658

+ public nsIDOMSerializer(long /*int*/ address) {

25659

super(address);

25660

}

25661

25662

- public int SerializeToString(int /*long*/ root, int /*long*/[] _retval) {

25663

+ public int SerializeToString(long /*int*/ root, long /*int*/[] _retval) {

25664

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), root, _retval);

25665

}

25666

25667

- public int SerializeToStream(int /*long*/ root, int /*long*/ stream, byte[] charset) {

25668

+ public int SerializeToStream(long /*int*/ root, long /*int*/ stream, byte[] charset) {

25669

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset);

25670

}

25671

}

25672

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java

25673

--- x86/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java 2008-10-22 16:17:00.000000000 -0400

25674

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java 2009-09-17 08:48:20.000000000 -0400

25675

@@ -37,11 +37,11 @@

25676

public static final nsID NS_IDOMUIEVENT_IID =

25677

new nsID(NS_IDOMUIEVENT_IID_STR);

25678

25679

- public nsIDOMUIEvent(int /*long*/ address) {

25680

+ public nsIDOMUIEvent(long /*int*/ address) {

25681

super(address);

25682

}

25683

25684

- public int GetView(int /*long*/[] aView) {

25685

+ public int GetView(long /*int*/[] aView) {

25686

return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView);

25687

}

25688

25689

@@ -49,7 +49,7 @@

25690

return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);

25691

}

25692

25693

- public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {

25694

+ public int InitUIEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg) {

25695

return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);

25696

}

25697

}

25698

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java

25699

--- x86/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java 2008-10-22 16:17:02.000000000 -0400

25700

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java 2009-09-17 08:48:20.000000000 -0400

25701

@@ -37,7 +37,7 @@

25702

public static final nsID NS_IDOMWINDOWCOLLECTION_IID =

25703

new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR);

25704

25705

- public nsIDOMWindowCollection(int /*long*/ address) {

25706

+ public nsIDOMWindowCollection(long /*int*/ address) {

25707

super(address);

25708

}

25709

25710

@@ -45,11 +45,11 @@

25711

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength);

25712

}

25713

25714

- public int Item(int index, int /*long*/[] _retval) {

25715

+ public int Item(int index, long /*int*/[] _retval) {

25716

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval);

25717

}

25718

25719

- public int NamedItem(int /*long*/ name, int /*long*/[] _retval) {

25720

+ public int NamedItem(long /*int*/ name, long /*int*/[] _retval) {

25721

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval);

25722

}

25723

}

25724

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java

25725

--- x86/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java 2006-05-09 14:54:24.000000000 -0400

25726

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java 2009-09-17 08:48:20.000000000 -0400

25727

@@ -37,35 +37,35 @@

25728

public static final nsID NS_IDOMWINDOW_IID =

25729

new nsID(NS_IDOMWINDOW_IID_STR);

25730

25731

- public nsIDOMWindow(int /*long*/ address) {

25732

+ public nsIDOMWindow(long /*int*/ address) {

25733

super(address);

25734

}

25735

25736

- public int GetDocument(int /*long*/[] aDocument) {

25737

+ public int GetDocument(long /*int*/[] aDocument) {

25738

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDocument);

25739

}

25740

25741

- public int GetParent(int /*long*/[] aParent) {

25742

+ public int GetParent(long /*int*/[] aParent) {

25743

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent);

25744

}

25745

25746

- public int GetTop(int /*long*/[] aTop) {

25747

+ public int GetTop(long /*int*/[] aTop) {

25748

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aTop);

25749

}

25750

25751

- public int GetScrollbars(int /*long*/[] aScrollbars) {

25752

+ public int GetScrollbars(long /*int*/[] aScrollbars) {

25753

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScrollbars);

25754

}

25755

25756

- public int GetFrames(int /*long*/[] aFrames) {

25757

+ public int GetFrames(long /*int*/[] aFrames) {

25758

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFrames);

25759

}

25760

25761

- public int GetName(int /*long*/ aName) {

25762

+ public int GetName(long /*int*/ aName) {

25763

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aName);

25764

}

25765

25766

- public int SetName(int /*long*/ aName) {

25767

+ public int SetName(long /*int*/ aName) {

25768

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aName);

25769

}

25770

25771

@@ -93,7 +93,7 @@

25772

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), xScrollDif, yScrollDif);

25773

}

25774

25775

- public int GetSelection(int /*long*/[] _retval) {

25776

+ public int GetSelection(long /*int*/[] _retval) {

25777

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);

25778

}

25779

25780

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java

25781

--- x86/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java 2006-10-26 11:24:38.000000000 -0400

25782

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java 2009-09-17 08:48:20.000000000 -0400

25783

@@ -37,11 +37,11 @@

25784

public static final nsID NS_IDOWNLOAD_IID =

25785

new nsID(NS_IDOWNLOAD_IID_STR);

25786

25787

- public nsIDownload_1_8(int /*long*/ address) {

25788

+ public nsIDownload_1_8(long /*int*/ address) {

25789

super(address);

25790

}

25791

25792

- public int GetTargetFile(int /*long*/[] aTargetFile) {

25793

+ public int GetTargetFile(long /*int*/[] aTargetFile) {

25794

return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 1, getAddress(), aTargetFile);

25795

}

25796

25797

@@ -49,27 +49,27 @@

25798

return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 2, getAddress(), aPercentComplete);

25799

}

25800

25801

- public int GetAmountTransferred(int /*long*/ aAmountTransferred) {

25802

+ public int GetAmountTransferred(long /*int*/ aAmountTransferred) {

25803

return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 3, getAddress(), aAmountTransferred);

25804

}

25805

25806

- public int GetSize(int /*long*/ aSize) {

25807

+ public int GetSize(long /*int*/ aSize) {

25808

return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 4, getAddress(), aSize);

25809

}

25810

25811

- public int GetSource(int /*long*/[] aSource) {

25812

+ public int GetSource(long /*int*/[] aSource) {

25813

return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 5, getAddress(), aSource);

25814

}

25815

25816

- public int GetTarget(int /*long*/[] aTarget) {

25817

+ public int GetTarget(long /*int*/[] aTarget) {

25818

return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 6, getAddress(), aTarget);

25819

}

25820

25821

- public int GetCancelable(int /*long*/[] aCancelable) {

25822

+ public int GetCancelable(long /*int*/[] aCancelable) {

25823

return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 7, getAddress(), aCancelable);

25824

}

25825

25826

- public int GetDisplayName(int /*long*/[] aDisplayName) {

25827

+ public int GetDisplayName(long /*int*/[] aDisplayName) {

25828

return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 8, getAddress(), aDisplayName);

25829

}

25830

25831

@@ -77,7 +77,7 @@

25832

return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 9, getAddress(), aStartTime);

25833

}

25834

25835

- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {

25836

+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {

25837

return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 10, getAddress(), aMIMEInfo);

25838

}

25839

}

25840

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDownload.java x86_64/org/eclipse/swt/internal/mozilla/nsIDownload.java

25841

--- x86/org/eclipse/swt/internal/mozilla/nsIDownload.java 2006-05-09 14:54:24.000000000 -0400

25842

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDownload.java 2009-09-17 08:48:20.000000000 -0400

25843

@@ -37,23 +37,23 @@

25844

public static final nsID NS_IDOWNLOAD_IID =

25845

new nsID(NS_IDOWNLOAD_IID_STR);

25846

25847

- public nsIDownload(int /*long*/ address) {

25848

+ public nsIDownload(long /*int*/ address) {

25849

super(address);

25850

}

25851

25852

- public int Init(int /*long*/ aSource, int /*long*/ aTarget, char[] aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aPersist) {

25853

+ public int Init(long /*int*/ aSource, long /*int*/ aTarget, char[] aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aPersist) {

25854

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aPersist);

25855

}

25856

25857

- public int GetSource(int /*long*/[] aSource) {

25858

+ public int GetSource(long /*int*/[] aSource) {

25859

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);

25860

}

25861

25862

- public int GetTarget(int /*long*/[] aTarget) {

25863

+ public int GetTarget(long /*int*/[] aTarget) {

25864

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aTarget);

25865

}

25866

25867

- public int GetPersist(int /*long*/[] aPersist) {

25868

+ public int GetPersist(long /*int*/[] aPersist) {

25869

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPersist);

25870

}

25871

25872

@@ -61,7 +61,7 @@

25873

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPercentComplete);

25874

}

25875

25876

- public int GetDisplayName(int /*long*/[] aDisplayName) {

25877

+ public int GetDisplayName(long /*int*/[] aDisplayName) {

25878

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDisplayName);

25879

}

25880

25881

@@ -73,23 +73,23 @@

25882

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStartTime);

25883

}

25884

25885

- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {

25886

+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {

25887

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aMIMEInfo);

25888

}

25889

25890

- public int GetListener(int /*long*/[] aListener) {

25891

+ public int GetListener(long /*int*/[] aListener) {

25892

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aListener);

25893

}

25894

25895

- public int SetListener(int /*long*/ aListener) {

25896

+ public int SetListener(long /*int*/ aListener) {

25897

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aListener);

25898

}

25899

25900

- public int GetObserver(int /*long*/[] aObserver) {

25901

+ public int GetObserver(long /*int*/[] aObserver) {

25902

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aObserver);

25903

}

25904

25905

- public int SetObserver(int /*long*/ aObserver) {

25906

+ public int SetObserver(long /*int*/ aObserver) {

25907

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aObserver);

25908

}

25909

}

25910

\ No newline at end of file

25911

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java

25912

--- x86/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java 2008-10-22 16:17:02.000000000 -0400

25913

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java 2009-09-17 08:48:20.000000000 -0400

25914

@@ -37,7 +37,7 @@

25915

public static final nsID NS_IEMBEDDINGSITEWINDOW_IID =

25916

new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR);

25917

25918

- public nsIEmbeddingSiteWindow(int /*long*/ address) {

25919

+ public nsIEmbeddingSiteWindow(long /*int*/ address) {

25920

super(address);

25921

}

25922

25923

@@ -67,7 +67,7 @@

25924

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);

25925

}

25926

25927

- public int GetTitle(int /*long*/[] aTitle) {

25928

+ public int GetTitle(long /*int*/[] aTitle) {

25929

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle);

25930

}

25931

25932

@@ -75,7 +75,7 @@

25933

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle);

25934

}

25935

25936

- public int GetSiteWindow(int /*long*/[] aSiteWindow) {

25937

+ public int GetSiteWindow(long /*int*/[] aSiteWindow) {

25938

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);

25939

}

25940

}

25941

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFactory.java x86_64/org/eclipse/swt/internal/mozilla/nsIFactory.java

25942

--- x86/org/eclipse/swt/internal/mozilla/nsIFactory.java 2008-10-22 16:17:00.000000000 -0400

25943

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFactory.java 2009-09-17 08:48:20.000000000 -0400

25944

@@ -37,11 +37,11 @@

25945

public static final nsID NS_IFACTORY_IID =

25946

new nsID(NS_IFACTORY_IID_STR);

25947

25948

- public nsIFactory(int /*long*/ address) {

25949

+ public nsIFactory(long /*int*/ address) {

25950

super(address);

25951

}

25952

25953

- public int CreateInstance(int /*long*/ aOuter, nsID iid, int /*long*/[] result) {

25954

+ public int CreateInstance(long /*int*/ aOuter, nsID iid, long /*int*/[] result) {

25955

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);

25956

}

25957

25958

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFile.java x86_64/org/eclipse/swt/internal/mozilla/nsIFile.java

25959

--- x86/org/eclipse/swt/internal/mozilla/nsIFile.java 2008-10-22 16:17:02.000000000 -0400

25960

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFile.java 2009-09-17 08:48:20.000000000 -0400

25961

@@ -37,7 +37,7 @@

25962

public static final nsID NS_IFILE_IID =

25963

new nsID(NS_IFILE_IID_STR);

25964

25965

- public nsIFile(int /*long*/ address) {

25966

+ public nsIFile(long /*int*/ address) {

25967

super(address);

25968

}

25969

25970

@@ -45,11 +45,11 @@

25971

25972

public static final int DIRECTORY_TYPE = 1;

25973

25974

- public int Append(int /*long*/ node) {

25975

+ public int Append(long /*int*/ node) {

25976

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), node);

25977

}

25978

25979

- public int AppendNative(int /*long*/ node) {

25980

+ public int AppendNative(long /*int*/ node) {

25981

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), node);

25982

}

25983

25984

@@ -61,43 +61,43 @@

25985

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions);

25986

}

25987

25988

- public int GetLeafName(int /*long*/ aLeafName) {

25989

+ public int GetLeafName(long /*int*/ aLeafName) {

25990

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLeafName);

25991

}

25992

25993

- public int SetLeafName(int /*long*/ aLeafName) {

25994

+ public int SetLeafName(long /*int*/ aLeafName) {

25995

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLeafName);

25996

}

25997

25998

- public int GetNativeLeafName(int /*long*/ aNativeLeafName) {

25999

+ public int GetNativeLeafName(long /*int*/ aNativeLeafName) {

26000

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNativeLeafName);

26001

}

26002

26003

- public int SetNativeLeafName(int /*long*/ aNativeLeafName) {

26004

+ public int SetNativeLeafName(long /*int*/ aNativeLeafName) {

26005

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNativeLeafName);

26006

}

26007

26008

- public int CopyTo(int /*long*/ newParentDir, int /*long*/ newName) {

26009

+ public int CopyTo(long /*int*/ newParentDir, long /*int*/ newName) {

26010

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), newParentDir, newName);

26011

}

26012

26013

- public int CopyToNative(int /*long*/ newParentDir, int /*long*/ newName) {

26014

+ public int CopyToNative(long /*int*/ newParentDir, long /*int*/ newName) {

26015

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), newParentDir, newName);

26016

}

26017

26018

- public int CopyToFollowingLinks(int /*long*/ newParentDir, int /*long*/ newName) {

26019

+ public int CopyToFollowingLinks(long /*int*/ newParentDir, long /*int*/ newName) {

26020

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), newParentDir, newName);

26021

}

26022

26023

- public int CopyToFollowingLinksNative(int /*long*/ newParentDir, int /*long*/ newName) {

26024

+ public int CopyToFollowingLinksNative(long /*int*/ newParentDir, long /*int*/ newName) {

26025

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), newParentDir, newName);

26026

}

26027

26028

- public int MoveTo(int /*long*/ newParentDir, int /*long*/ newName) {

26029

+ public int MoveTo(long /*int*/ newParentDir, long /*int*/ newName) {

26030

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), newParentDir, newName);

26031

}

26032

26033

- public int MoveToNative(int /*long*/ newParentDir, int /*long*/ newName) {

26034

+ public int MoveToNative(long /*int*/ newParentDir, long /*int*/ newName) {

26035

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);

26036

}

26037

26038

@@ -149,19 +149,19 @@

26039

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink);

26040

}

26041

26042

- public int GetTarget(int /*long*/ aTarget) {

26043

+ public int GetTarget(long /*int*/ aTarget) {

26044

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aTarget);

26045

}

26046

26047

- public int GetNativeTarget(int /*long*/ aNativeTarget) {

26048

+ public int GetNativeTarget(long /*int*/ aNativeTarget) {

26049

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aNativeTarget);

26050

}

26051

26052

- public int GetPath(int /*long*/ aPath) {

26053

+ public int GetPath(long /*int*/ aPath) {

26054

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aPath);

26055

}

26056

26057

- public int GetNativePath(int /*long*/ aNativePath) {

26058

+ public int GetNativePath(long /*int*/ aNativePath) {

26059

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath);

26060

}

26061

26062

@@ -205,23 +205,23 @@

26063

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), type, permissions);

26064

}

26065

26066

- public int Clone(int /*long*/[] _retval) {

26067

+ public int Clone(long /*int*/[] _retval) {

26068

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), _retval);

26069

}

26070

26071

- public int Equals(int /*long*/ inFile, int[] _retval) {

26072

+ public int Equals(long /*int*/ inFile, int[] _retval) {

26073

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);

26074

}

26075

26076

- public int Contains(int /*long*/ inFile, int recur, int[] _retval) {

26077

+ public int Contains(long /*int*/ inFile, int recur, int[] _retval) {

26078

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval);

26079

}

26080

26081

- public int GetParent(int /*long*/[] aParent) {

26082

+ public int GetParent(long /*int*/[] aParent) {

26083

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aParent);

26084

}

26085

26086

- public int GetDirectoryEntries(int /*long*/[] aDirectoryEntries) {

26087

+ public int GetDirectoryEntries(long /*int*/[] aDirectoryEntries) {

26088

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries);

26089

}

26090

}

26091

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java

26092

--- x86/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java 2008-10-22 16:17:00.000000000 -0400

26093

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java 2009-09-17 08:48:22.000000000 -0400

26094

@@ -37,7 +37,7 @@

26095

public static final nsID NS_IFILEPICKER_IID =

26096

new nsID(NS_IFILEPICKER_IID_STR);

26097

26098

- public nsIFilePicker_1_8(int /*long*/ address) {

26099

+ public nsIFilePicker_1_8(long /*int*/ address) {

26100

super(address);

26101

}

26102

26103

@@ -56,7 +56,7 @@

26104

public static final int filterXUL = 32;

26105

public static final int filterApps = 64;

26106

26107

- public int Init(int /*long*/ parent, int /*long*/ title, int mode) {

26108

+ public int Init(long /*int*/ parent, long /*int*/ title, int mode) {

26109

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);

26110

}

26111

26112

@@ -64,23 +64,23 @@

26113

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask);

26114

}

26115

26116

- public int AppendFilter(int /*long*/ title, int /*long*/ filter) {

26117

+ public int AppendFilter(long /*int*/ title, long /*int*/ filter) {

26118

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);

26119

}

26120

26121

- public int GetDefaultString(int /*long*/ aDefaultString) {

26122

+ public int GetDefaultString(long /*int*/ aDefaultString) {

26123

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);

26124

}

26125

26126

- public int SetDefaultString(int /*long*/ aDefaultString) {

26127

+ public int SetDefaultString(long /*int*/ aDefaultString) {

26128

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);

26129

}

26130

26131

- public int GetDefaultExtension(int /*long*/ aDefaultExtension) {

26132

+ public int GetDefaultExtension(long /*int*/ aDefaultExtension) {

26133

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);

26134

}

26135

26136

- public int SetDefaultExtension(int /*long*/ aDefaultExtension) {

26137

+ public int SetDefaultExtension(long /*int*/ aDefaultExtension) {

26138

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension);

26139

}

26140

26141

@@ -92,27 +92,27 @@

26142

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);

26143

}

26144

26145

- public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {

26146

+ public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) {

26147

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);

26148

}

26149

26150

- public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {

26151

+ public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) {

26152

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);

26153

}

26154

26155

- public int GetFile(int /*long*/[] aFile) {

26156

+ public int GetFile(long /*int*/[] aFile) {

26157

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);

26158

}

26159

26160

- public int GetFileURL(int /*long*/[] aFileURL) {

26161

+ public int GetFileURL(long /*int*/[] aFileURL) {

26162

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);

26163

}

26164

26165

- public int GetFiles(int /*long*/[] aFiles) {

26166

+ public int GetFiles(long /*int*/[] aFiles) {

26167

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);

26168

}

26169

26170

- public int Show(int /*long*/ _retval) {

26171

+ public int Show(long /*int*/ _retval) {

26172

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);

26173

}

26174

}

26175

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker.java

26176

--- x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java 2006-05-09 14:54:24.000000000 -0400

26177

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker.java 2009-09-17 08:48:20.000000000 -0400

26178

@@ -37,7 +37,7 @@

26179

public static final nsID NS_IFILEPICKER_IID =

26180

new nsID(NS_IFILEPICKER_IID_STR);

26181

26182

- public nsIFilePicker(int /*long*/ address) {

26183

+ public nsIFilePicker(long /*int*/ address) {

26184

super(address);

26185

}

26186

26187

@@ -56,7 +56,7 @@

26188

public static final int filterXUL = 32;

26189

public static final int filterApps = 64;

26190

26191

- public int Init(int /*long*/ parent, char[] title, int mode) {

26192

+ public int Init(long /*int*/ parent, char[] title, int mode) {

26193

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);

26194

}

26195

26196

@@ -68,7 +68,7 @@

26197

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);

26198

}

26199

26200

- public int GetDefaultString(int /*long*/[] aDefaultString) {

26201

+ public int GetDefaultString(long /*int*/[] aDefaultString) {

26202

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);

26203

}

26204

26205

@@ -76,7 +76,7 @@

26206

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);

26207

}

26208

26209

- public int GetDefaultExtension(int /*long*/[] aDefaultExtension) {

26210

+ public int GetDefaultExtension(long /*int*/[] aDefaultExtension) {

26211

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);

26212

}

26213

26214

@@ -92,27 +92,27 @@

26215

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);

26216

}

26217

26218

- public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {

26219

+ public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) {

26220

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);

26221

}

26222

26223

- public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {

26224

+ public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) {

26225

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);

26226

}

26227

26228

- public int GetFile(int /*long*/[] aFile) {

26229

+ public int GetFile(long /*int*/[] aFile) {

26230

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);

26231

}

26232

26233

- public int GetFileURL(int /*long*/[] aFileURL) {

26234

+ public int GetFileURL(long /*int*/[] aFileURL) {

26235

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);

26236

}

26237

26238

- public int GetFiles(int /*long*/[] aFiles) {

26239

+ public int GetFiles(long /*int*/[] aFiles) {

26240

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);

26241

}

26242

26243

- public int Show(int /*long*/ _retval) {

26244

+ public int Show(long /*int*/ _retval) {

26245

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);

26246

}

26247

}

26248

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java

26249

--- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java 2008-10-22 16:17:00.000000000 -0400

26250

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java 2009-09-17 08:48:22.000000000 -0400

26251

@@ -37,31 +37,31 @@

26252

public static final nsID NS_IHELPERAPPLAUNCHER_IID =

26253

new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);

26254

26255

- public nsIHelperAppLauncher_1_8(int /*long*/ address) {

26256

+ public nsIHelperAppLauncher_1_8(long /*int*/ address) {

26257

super(address);

26258

}

26259

26260

- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {

26261

+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {

26262

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);

26263

}

26264

26265

- public int GetSource(int /*long*/[] aSource) {

26266

+ public int GetSource(long /*int*/[] aSource) {

26267

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);

26268

}

26269

26270

- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {

26271

+ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {

26272

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);

26273

}

26274

26275

- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {

26276

+ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {

26277

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);

26278

}

26279

26280

- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {

26281

+ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {

26282

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);

26283

}

26284

26285

- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {

26286

+ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {

26287

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);

26288

}

26289

26290

@@ -69,11 +69,11 @@

26291

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());

26292

}

26293

26294

- public int GetTargetFile(int /*long*/[] aTargetFile) {

26295

+ public int GetTargetFile(long /*int*/[] aTargetFile) {

26296

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);

26297

}

26298

26299

- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {

26300

+ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {

26301

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTimeDownloadStarted);

26302

}

26303

}

26304

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java

26305

--- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java 2008-10-22 16:17:00.000000000 -0400

26306

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java 2009-09-17 08:48:22.000000000 -0400

26307

@@ -37,31 +37,31 @@

26308

public static final nsID NS_IHELPERAPPLAUNCHER_IID =

26309

new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);

26310

26311

- public nsIHelperAppLauncher_1_9(int /*long*/ address) {

26312

+ public nsIHelperAppLauncher_1_9(long /*int*/ address) {

26313

super(address);

26314

}

26315

26316

- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {

26317

+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {

26318

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);

26319

}

26320

26321

- public int GetSource(int /*long*/[] aSource) {

26322

+ public int GetSource(long /*int*/[] aSource) {

26323

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);

26324

}

26325

26326

- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {

26327

+ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {

26328

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);

26329

}

26330

26331

- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {

26332

+ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {

26333

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);

26334

}

26335

26336

- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {

26337

+ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {

26338

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);

26339

}

26340

26341

- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {

26342

+ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {

26343

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);

26344

}

26345

26346

@@ -69,7 +69,7 @@

26347

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());

26348

}

26349

26350

- public int GetTargetFile(int /*long*/[] aTargetFile) {

26351

+ public int GetTargetFile(long /*int*/[] aTargetFile) {

26352

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);

26353

}

26354

26355

@@ -77,7 +77,7 @@

26356

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);

26357

}

26358

26359

- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {

26360

+ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {

26361

return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);

26362

}

26363

}

26364

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java

26365

--- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java 2008-08-20 15:56:28.000000000 -0400

26366

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java 2009-09-17 08:48:22.000000000 -0400

26367

@@ -37,7 +37,7 @@

26368

public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID =

26369

new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR);

26370

26371

- public nsIHelperAppLauncherDialog_1_9(int /*long*/ address) {

26372

+ public nsIHelperAppLauncherDialog_1_9(long /*int*/ address) {

26373

super(address);

26374

}

26375

26376

@@ -47,11 +47,11 @@

26377

26378

public static final int REASON_TYPESNIFFED = 2;

26379

26380

- public int Show(int /*long*/ aLauncher, int /*long*/ aWindowContext, int aReason) {

26381

+ public int Show(long /*int*/ aLauncher, long /*int*/ aWindowContext, int aReason) {

26382

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aWindowContext, aReason);

26383

}

26384

26385

- public int PromptForSaveToFile(int /*long*/ aLauncher, int /*long*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, int /*long*/[] _retval) {

26386

+ public int PromptForSaveToFile(long /*int*/ aLauncher, long /*int*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, long /*int*/[] _retval) {

26387

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aLauncher, aWindowContext, aDefaultFileName, aSuggestedFileExtension, aForcePrompt, _retval);

26388

}

26389

}

26390

\ No newline at end of file

26391

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java

26392

--- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java 2007-03-02 11:13:26.000000000 -0500

26393

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java 2009-09-17 08:48:22.000000000 -0400

26394

@@ -37,19 +37,19 @@

26395

public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID =

26396

new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR);

26397

26398

- public nsIHelperAppLauncherDialog(int /*long*/ address) {

26399

+ public nsIHelperAppLauncherDialog(long /*int*/ address) {

26400

super(address);

26401

}

26402

26403

- public int Show(int /*long*/ aLauncher, int /*long*/ aContext) {

26404

+ public int Show(long /*int*/ aLauncher, long /*int*/ aContext) {

26405

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aContext);

26406

}

26407

26408

- public int PromptForSaveToFile(int /*long*/ aWindowContext, char[] aDefaultFile, char[] aSuggestedFileExtension, int /*long*/[] _retval) {

26409

+ public int PromptForSaveToFile(long /*int*/ aWindowContext, char[] aDefaultFile, char[] aSuggestedFileExtension, long /*int*/[] _retval) {

26410

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWindowContext, aDefaultFile, aSuggestedFileExtension, _retval);

26411

}

26412

26413

- public int ShowProgressDialog(int /*long*/ aLauncher, int /*long*/ aContext) {

26414

+ public int ShowProgressDialog(long /*int*/ aLauncher, long /*int*/ aContext) {

26415

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aLauncher, aContext);

26416

}

26417

}

26418

\ No newline at end of file

26419

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java

26420

--- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java 2008-10-22 16:17:02.000000000 -0400

26421

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java 2009-09-17 08:48:22.000000000 -0400

26422

@@ -37,27 +37,27 @@

26423

public static final nsID NS_IHELPERAPPLAUNCHER_IID =

26424

new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);

26425

26426

- public nsIHelperAppLauncher(int /*long*/ address) {

26427

+ public nsIHelperAppLauncher(long /*int*/ address) {

26428

super(address);

26429

}

26430

26431

- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {

26432

+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {

26433

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);

26434

}

26435

26436

- public int GetSource(int /*long*/[] aSource) {

26437

+ public int GetSource(long /*int*/[] aSource) {

26438

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);

26439

}

26440

26441

- public int GetSuggestedFileName(int /*long*/[] aSuggestedFileName) {

26442

+ public int GetSuggestedFileName(long /*int*/[] aSuggestedFileName) {

26443

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);

26444

}

26445

26446

- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {

26447

+ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {

26448

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);

26449

}

26450

26451

- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {

26452

+ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {

26453

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);

26454

}

26455

26456

@@ -65,7 +65,7 @@

26457

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());

26458

}

26459

26460

- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {

26461

+ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {

26462

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);

26463

}

26464

26465

@@ -73,7 +73,7 @@

26466

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());

26467

}

26468

26469

- public int GetDownloadInfo(int /*long*/[] aSourceUrl, long[] aTimeDownloadStarted, int /*long*/[] _retval) {

26470

+ public int GetDownloadInfo(long /*int*/[] aSourceUrl, long[] aTimeDownloadStarted, long /*int*/[] _retval) {

26471

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval);

26472

}

26473

}

26474

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIInputStream.java x86_64/org/eclipse/swt/internal/mozilla/nsIInputStream.java

26475

--- x86/org/eclipse/swt/internal/mozilla/nsIInputStream.java 2008-10-22 16:17:02.000000000 -0400

26476

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIInputStream.java 2009-09-17 08:48:22.000000000 -0400

26477

@@ -37,7 +37,7 @@

26478

public static final nsID NS_IINPUTSTREAM_IID =

26479

new nsID(NS_IINPUTSTREAM_IID_STR);

26480

26481

- public nsIInputStream(int /*long*/ address) {

26482

+ public nsIInputStream(long /*int*/ address) {

26483

super(address);

26484

}

26485

26486

@@ -53,7 +53,7 @@

26487

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval);

26488

}

26489

26490

- public int ReadSegments(int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int[] _retval) {

26491

+ public int ReadSegments(long /*int*/ aWriter, long /*int*/ aClosure, int aCount, int[] _retval) {

26492

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);

26493

}

26494

26495

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java x86_64/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java

26496

--- x86/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java 2006-05-09 14:54:24.000000000 -0400

26497

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java 2009-09-17 08:48:22.000000000 -0400

26498

@@ -37,11 +37,11 @@

26499

public static final nsID NS_IINTERFACEREQUESTOR_IID =

26500

new nsID(NS_IINTERFACEREQUESTOR_IID_STR);

26501

26502

- public nsIInterfaceRequestor(int /*long*/ address) {

26503

+ public nsIInterfaceRequestor(long /*int*/ address) {

26504

super(address);

26505

}

26506

26507

- public int GetInterface(nsID uuid, int /*long*/[] result) {

26508

+ public int GetInterface(nsID uuid, long /*int*/[] result) {

26509

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);

26510

}

26511

}

26512

\ No newline at end of file

26513

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIIOService.java x86_64/org/eclipse/swt/internal/mozilla/nsIIOService.java

26514

--- x86/org/eclipse/swt/internal/mozilla/nsIIOService.java 2008-10-22 16:17:00.000000000 -0400

26515

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIIOService.java 2009-09-17 08:48:22.000000000 -0400

26516

@@ -37,11 +37,11 @@

26517

public static final nsID NS_IIOSERVICE_IID =

26518

new nsID(NS_IIOSERVICE_IID_STR);

26519

26520

- public nsIIOService(int /*long*/ address) {

26521

+ public nsIIOService(long /*int*/ address) {

26522

super(address);

26523

}

26524

26525

- public int GetProtocolHandler(byte[] aScheme, int /*long*/[] _retval) {

26526

+ public int GetProtocolHandler(byte[] aScheme, long /*int*/[] _retval) {

26527

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval);

26528

}

26529

26530

@@ -49,19 +49,19 @@

26531

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval);

26532

}

26533

26534

- public int NewURI(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {

26535

+ public int NewURI(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {

26536

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);

26537

}

26538

26539

- public int NewFileURI(int /*long*/ aFile, int /*long*/[] _retval) {

26540

+ public int NewFileURI(long /*int*/ aFile, long /*int*/[] _retval) {

26541

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile, _retval);

26542

}

26543

26544

- public int NewChannelFromURI(int /*long*/ aURI, int /*long*/[] _retval) {

26545

+ public int NewChannelFromURI(long /*int*/ aURI, long /*int*/[] _retval) {

26546

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aURI, _retval);

26547

}

26548

26549

- public int NewChannel(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {

26550

+ public int NewChannel(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {

26551

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);

26552

}

26553

26554

@@ -77,7 +77,7 @@

26555

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval);

26556

}

26557

26558

- public int ExtractScheme(int /*long*/ urlString, int /*long*/ _retval) {

26559

+ public int ExtractScheme(long /*int*/ urlString, long /*int*/ _retval) {

26560

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval);

26561

}

26562

}

26563

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java x86_64/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java

26564

--- x86/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java 2008-10-22 16:17:00.000000000 -0400

26565

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java 2009-09-17 08:48:22.000000000 -0400

26566

@@ -37,7 +37,7 @@

26567

public static final nsID NS_IJSCONTEXTSTACK_IID =

26568

new nsID(NS_IJSCONTEXTSTACK_IID_STR);

26569

26570

- public nsIJSContextStack(int /*long*/ address) {

26571

+ public nsIJSContextStack(long /*int*/ address) {

26572

super(address);

26573

}

26574

26575

@@ -45,15 +45,15 @@

26576

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount);

26577

}

26578

26579

- public int Peek(int /*long*/[] _retval) {

26580

+ public int Peek(long /*int*/[] _retval) {

26581

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);

26582

}

26583

26584

- public int Pop(int /*long*/[] _retval) {

26585

+ public int Pop(long /*int*/[] _retval) {

26586

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);

26587

}

26588

26589

- public int Push(int /*long*/ cx) {

26590

+ public int Push(long /*int*/ cx) {

26591

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), cx);

26592

}

26593

}

26594

diff -urN x86/org/eclipse/swt/internal/mozilla/nsILocalFile.java x86_64/org/eclipse/swt/internal/mozilla/nsILocalFile.java

26595

--- x86/org/eclipse/swt/internal/mozilla/nsILocalFile.java 2008-10-22 16:17:00.000000000 -0400

26596

+++ x86_64/org/eclipse/swt/internal/mozilla/nsILocalFile.java 2009-09-17 08:48:22.000000000 -0400

26597

@@ -37,19 +37,19 @@

26598

public static final nsID NS_ILOCALFILE_IID =

26599

new nsID(NS_ILOCALFILE_IID_STR);

26600

26601

- public nsILocalFile(int /*long*/ address) {

26602

+ public nsILocalFile(long /*int*/ address) {

26603

super(address);

26604

}

26605

26606

- public int InitWithPath(int /*long*/ filePath) {

26607

+ public int InitWithPath(long /*int*/ filePath) {

26608

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 1, getAddress(), filePath);

26609

}

26610

26611

- public int InitWithNativePath(int /*long*/ filePath) {

26612

+ public int InitWithNativePath(long /*int*/ filePath) {

26613

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 2, getAddress(), filePath);

26614

}

26615

26616

- public int InitWithFile(int /*long*/ aFile) {

26617

+ public int InitWithFile(long /*int*/ aFile) {

26618

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile);

26619

}

26620

26621

@@ -61,15 +61,15 @@

26622

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks);

26623

}

26624

26625

- public int OpenNSPRFileDesc(int flags, int mode, int /*long*/[] _retval) {

26626

+ public int OpenNSPRFileDesc(int flags, int mode, long /*int*/[] _retval) {

26627

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval);

26628

}

26629

26630

- public int OpenANSIFileDesc(byte[] mode, int /*long*/[] _retval) {

26631

+ public int OpenANSIFileDesc(byte[] mode, long /*int*/[] _retval) {

26632

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 7, getAddress(), mode, _retval);

26633

}

26634

26635

- public int Load(int /*long*/[] _retval) {

26636

+ public int Load(long /*int*/[] _retval) {

26637

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval);

26638

}

26639

26640

@@ -77,19 +77,19 @@

26641

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable);

26642

}

26643

26644

- public int AppendRelativePath(int /*long*/ relativeFilePath) {

26645

+ public int AppendRelativePath(long /*int*/ relativeFilePath) {

26646

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 10, getAddress(), relativeFilePath);

26647

}

26648

26649

- public int AppendRelativeNativePath(int /*long*/ relativeFilePath) {

26650

+ public int AppendRelativeNativePath(long /*int*/ relativeFilePath) {

26651

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 11, getAddress(), relativeFilePath);

26652

}

26653

26654

- public int GetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {

26655

+ public int GetPersistentDescriptor(long /*int*/ aPersistentDescriptor) {

26656

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor);

26657

}

26658

26659

- public int SetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {

26660

+ public int SetPersistentDescriptor(long /*int*/ aPersistentDescriptor) {

26661

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor);

26662

}

26663

26664

@@ -101,11 +101,11 @@

26665

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress());

26666

}

26667

26668

- public int GetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ _retval) {

26669

+ public int GetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ _retval) {

26670

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval);

26671

}

26672

26673

- public int SetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ relativeDesc) {

26674

+ public int SetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ relativeDesc) {

26675

return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);

26676

}

26677

}

26678

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIMemory.java x86_64/org/eclipse/swt/internal/mozilla/nsIMemory.java

26679

--- x86/org/eclipse/swt/internal/mozilla/nsIMemory.java 2008-12-15 10:17:00.000000000 -0500

26680

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIMemory.java 2009-09-17 08:48:22.000000000 -0400

26681

@@ -37,19 +37,19 @@

26682

public static final nsID NS_IMEMORY_IID =

26683

new nsID(NS_IMEMORY_IID_STR);

26684

26685

- public nsIMemory(int /*long*/ address) {

26686

+ public nsIMemory(long /*int*/ address) {

26687

super(address);

26688

}

26689

26690

- public int /*long*/ Alloc(int size) {

26691

+ public long /*int*/ Alloc(int size) {

26692

return XPCOM.nsIMemory_Alloc(getAddress(), size);

26693

}

26694

26695

- public int /*long*/ Realloc(int /*long*/ ptr, int newSize) {

26696

+ public long /*int*/ Realloc(long /*int*/ ptr, int newSize) {

26697

return XPCOM.nsIMemory_Realloc(getAddress(), ptr, newSize);

26698

}

26699

26700

- public int Free(int /*long*/ ptr) {

26701

+ public int Free(long /*int*/ ptr) {

26702

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr);

26703

}

26704

26705

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIObserverService.java x86_64/org/eclipse/swt/internal/mozilla/nsIObserverService.java

26706

--- x86/org/eclipse/swt/internal/mozilla/nsIObserverService.java 2008-10-22 16:17:02.000000000 -0400

26707

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIObserverService.java 2009-09-17 08:48:22.000000000 -0400

26708

@@ -37,23 +37,23 @@

26709

public static final nsID NS_IOBSERVERSERVICE_IID =

26710

new nsID(NS_IOBSERVERSERVICE_IID_STR);

26711

26712

- public nsIObserverService(int /*long*/ address) {

26713

+ public nsIObserverService(long /*int*/ address) {

26714

super(address);

26715

}

26716

26717

- public int AddObserver(int /*long*/ anObserver, byte[] aTopic, int ownsWeak) {

26718

+ public int AddObserver(long /*int*/ anObserver, byte[] aTopic, int ownsWeak) {

26719

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak);

26720

}

26721

26722

- public int RemoveObserver(int /*long*/ anObserver, byte[] aTopic) {

26723

+ public int RemoveObserver(long /*int*/ anObserver, byte[] aTopic) {

26724

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), anObserver, aTopic);

26725

}

26726

26727

- public int NotifyObservers(int /*long*/ aSubject, byte[] aTopic, char[] someData) {

26728

+ public int NotifyObservers(long /*int*/ aSubject, byte[] aTopic, char[] someData) {

26729

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSubject, aTopic, someData);

26730

}

26731

26732

- public int EnumerateObservers(byte[] aTopic, int /*long*/[] _retval) {

26733

+ public int EnumerateObservers(byte[] aTopic, long /*int*/[] _retval) {

26734

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval);

26735

}

26736

}

26737

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java

26738

--- x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java 2008-10-22 16:17:00.000000000 -0400

26739

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java 2009-09-17 08:48:22.000000000 -0400

26740

@@ -37,7 +37,7 @@

26741

public static final nsID NS_IPREFBRANCH_IID =

26742

new nsID(NS_IPREFBRANCH_IID_STR);

26743

26744

- public nsIPrefBranch(int /*long*/ address) {

26745

+ public nsIPrefBranch(long /*int*/ address) {

26746

super(address);

26747

}

26748

26749

@@ -49,7 +49,7 @@

26750

26751

public static final int PREF_BOOL = 128;

26752

26753

- public int GetRoot(int /*long*/[] aRoot) {

26754

+ public int GetRoot(long /*int*/[] aRoot) {

26755

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aRoot);

26756

}

26757

26758

@@ -65,7 +65,7 @@

26759

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPrefName, aValue);

26760

}

26761

26762

- public int GetCharPref(byte[] aPrefName, int /*long*/[] _retval) {

26763

+ public int GetCharPref(byte[] aPrefName, long /*int*/[] _retval) {

26764

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefName, _retval);

26765

}

26766

26767

@@ -81,11 +81,11 @@

26768

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPrefName, aValue);

26769

}

26770

26771

- public int GetComplexValue(byte[] aPrefName, nsID aType, int /*long*/[] aValue) {

26772

+ public int GetComplexValue(byte[] aPrefName, nsID aType, long /*int*/[] aValue) {

26773

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPrefName, aType, aValue);

26774

}

26775

26776

- public int SetComplexValue(byte[] aPrefName, nsID aType, int /*long*/ aValue) {

26777

+ public int SetComplexValue(byte[] aPrefName, nsID aType, long /*int*/ aValue) {

26778

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPrefName, aType, aValue);

26779

}

26780

26781

@@ -113,7 +113,7 @@

26782

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aStartingAt);

26783

}

26784

26785

- public int GetChildList(byte[] aStartingAt, int[] aCount, int /*long*/[] aChildArray) {

26786

+ public int GetChildList(byte[] aStartingAt, int[] aCount, long /*int*/[] aChildArray) {

26787

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aStartingAt, aCount, aChildArray);

26788

}

26789

26790

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java

26791

--- x86/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java 2006-05-09 14:54:24.000000000 -0400

26792

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java 2009-09-17 08:48:22.000000000 -0400

26793

@@ -37,11 +37,11 @@

26794

public static final nsID NS_IPREFLOCALIZEDSTRING_IID =

26795

new nsID(NS_IPREFLOCALIZEDSTRING_IID_STR);

26796

26797

- public nsIPrefLocalizedString(int /*long*/ address) {

26798

+ public nsIPrefLocalizedString(long /*int*/ address) {

26799

super(address);

26800

}

26801

26802

- public int GetData(int /*long*/[] aData) {

26803

+ public int GetData(long /*int*/[] aData) {

26804

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aData);

26805

}

26806

26807

@@ -49,7 +49,7 @@

26808

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData);

26809

}

26810

26811

- public int ToString(int /*long*/[] _retval) {

26812

+ public int ToString(long /*int*/[] _retval) {

26813

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);

26814

}

26815

26816

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefService.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefService.java

26817

--- x86/org/eclipse/swt/internal/mozilla/nsIPrefService.java 2006-05-09 14:54:24.000000000 -0400

26818

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefService.java 2009-09-17 08:48:22.000000000 -0400

26819

@@ -37,11 +37,11 @@

26820

public static final nsID NS_IPREFSERVICE_IID =

26821

new nsID(NS_IPREFSERVICE_IID_STR);

26822

26823

- public nsIPrefService(int /*long*/ address) {

26824

+ public nsIPrefService(long /*int*/ address) {

26825

super(address);

26826

}

26827

26828

- public int ReadUserPrefs(int /*long*/ aFile) {

26829

+ public int ReadUserPrefs(long /*int*/ aFile) {

26830

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFile);

26831

}

26832

26833

@@ -53,15 +53,15 @@

26834

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());

26835

}

26836

26837

- public int SavePrefFile(int /*long*/ aFile) {

26838

+ public int SavePrefFile(long /*int*/ aFile) {

26839

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile);

26840

}

26841

26842

- public int GetBranch(byte[] aPrefRoot, int /*long*/[] _retval) {

26843

+ public int GetBranch(byte[] aPrefRoot, long /*int*/[] _retval) {

26844

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefRoot, _retval);

26845

}

26846

26847

- public int GetDefaultBranch(byte[] aPrefRoot, int /*long*/[] _retval) {

26848

+ public int GetDefaultBranch(byte[] aPrefRoot, long /*int*/[] _retval) {

26849

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPrefRoot, _retval);

26850

}

26851

}

26852

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrincipal.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrincipal.java

26853

--- x86/org/eclipse/swt/internal/mozilla/nsIPrincipal.java 2009-04-08 14:54:52.000000000 -0400

26854

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrincipal.java 2009-09-17 08:48:22.000000000 -0400

26855

@@ -37,7 +37,7 @@

26856

public static final nsID NS_IPRINCIPAL_IID =

26857

new nsID(NS_IPRINCIPAL_IID_STR);

26858

26859

- public nsIPrincipal(int /*long*/ address) {

26860

+ public nsIPrincipal(long /*int*/ address) {

26861

super(address);

26862

}

26863

26864

@@ -49,11 +49,11 @@

26865

26866

public static final int ENABLE_GRANTED = 4;

26867

26868

- public int GetPreferences(int /*long*/[] prefBranch, int /*long*/[] id, int /*long*/[] subjectName, int /*long*/[] grantedList, int /*long*/[] deniedList, int[] isTrusted) {

26869

+ public int GetPreferences(long /*int*/[] prefBranch, long /*int*/[] id, long /*int*/[] subjectName, long /*int*/[] grantedList, long /*int*/[] deniedList, int[] isTrusted) {

26870

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 1, getAddress(), prefBranch, id, subjectName, grantedList, deniedList, isTrusted);

26871

}

26872

26873

- public int Equals(int /*long*/ other, int[] _retval) {

26874

+ public int Equals(long /*int*/ other, int[] _retval) {

26875

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 2, getAddress(), other, _retval);

26876

}

26877

26878

@@ -61,19 +61,19 @@

26879

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 3, getAddress(), aHashValue);

26880

}

26881

26882

- public int GetJSPrincipals(int /*long*/ cx, int /*long*/[] _retval) {

26883

+ public int GetJSPrincipals(long /*int*/ cx, long /*int*/[] _retval) {

26884

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 4, getAddress(), cx, _retval);

26885

}

26886

26887

- public int GetSecurityPolicy(int /*long*/[] aSecurityPolicy) {

26888

+ public int GetSecurityPolicy(long /*int*/[] aSecurityPolicy) {

26889

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 5, getAddress(), aSecurityPolicy);

26890

}

26891

26892

- public int SetSecurityPolicy(int /*long*/ aSecurityPolicy) {

26893

+ public int SetSecurityPolicy(long /*int*/ aSecurityPolicy) {

26894

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 6, getAddress(), aSecurityPolicy);

26895

}

26896

26897

- public int CanEnableCapability(byte[] capability, int /*long*/ _retval) {

26898

+ public int CanEnableCapability(byte[] capability, long /*int*/ _retval) {

26899

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 7, getAddress(), capability, _retval);

26900

}

26901

26902

@@ -81,35 +81,35 @@

26903

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 8, getAddress(), capability, canEnable);

26904

}

26905

26906

- public int IsCapabilityEnabled(byte[] capability, int /*long*/ annotation, int[] _retval) {

26907

+ public int IsCapabilityEnabled(byte[] capability, long /*int*/ annotation, int[] _retval) {

26908

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 9, getAddress(), capability, annotation, _retval);

26909

}

26910

26911

- public int EnableCapability(byte[] capability, int /*long*/[] annotation) {

26912

+ public int EnableCapability(byte[] capability, long /*int*/[] annotation) {

26913

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 10, getAddress(), capability, annotation);

26914

}

26915

26916

- public int RevertCapability(byte[] capability, int /*long*/[] annotation) {

26917

+ public int RevertCapability(byte[] capability, long /*int*/[] annotation) {

26918

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 11, getAddress(), capability, annotation);

26919

}

26920

26921

- public int DisableCapability(byte[] capability, int /*long*/[] annotation) {

26922

+ public int DisableCapability(byte[] capability, long /*int*/[] annotation) {

26923

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 12, getAddress(), capability, annotation);

26924

}

26925

26926

- public int GetURI(int /*long*/[] aURI) {

26927

+ public int GetURI(long /*int*/[] aURI) {

26928

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 13, getAddress(), aURI);

26929

}

26930

26931

- public int GetDomain(int /*long*/[] aDomain) {

26932

+ public int GetDomain(long /*int*/[] aDomain) {

26933

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 14, getAddress(), aDomain);

26934

}

26935

26936

- public int SetDomain(int /*long*/ aDomain) {

26937

+ public int SetDomain(long /*int*/ aDomain) {

26938

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 15, getAddress(), aDomain);

26939

}

26940

26941

- public int GetOrigin(int /*long*/[] aOrigin) {

26942

+ public int GetOrigin(long /*int*/[] aOrigin) {

26943

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 16, getAddress(), aOrigin);

26944

}

26945

26946

@@ -117,27 +117,27 @@

26947

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 17, getAddress(), aHasCertificate);

26948

}

26949

26950

- public int GetFingerprint(int /*long*/ aFingerprint) {

26951

+ public int GetFingerprint(long /*int*/ aFingerprint) {

26952

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 18, getAddress(), aFingerprint);

26953

}

26954

26955

- public int GetPrettyName(int /*long*/ aPrettyName) {

26956

+ public int GetPrettyName(long /*int*/ aPrettyName) {

26957

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 19, getAddress(), aPrettyName);

26958

}

26959

26960

- public int Subsumes(int /*long*/ other, int[] _retval) {

26961

+ public int Subsumes(long /*int*/ other, int[] _retval) {

26962

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 20, getAddress(), other, _retval);

26963

}

26964

26965

- public int CheckMayLoad(int /*long*/ uri, int report) {

26966

+ public int CheckMayLoad(long /*int*/ uri, int report) {

26967

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 21, getAddress(), uri, report);

26968

}

26969

26970

- public int GetSubjectName(int /*long*/ aSubjectName) {

26971

+ public int GetSubjectName(long /*int*/ aSubjectName) {

26972

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 22, getAddress(), aSubjectName);

26973

}

26974

26975

- public int GetCertificate(int /*long*/[] aCertificate) {

26976

+ public int GetCertificate(long /*int*/[] aCertificate) {

26977

return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 23, getAddress(), aCertificate);

26978

}

26979

}

26980

\ No newline at end of file

26981

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java

26982

--- x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java 2008-10-22 16:17:00.000000000 -0400

26983

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java 2009-09-17 08:48:22.000000000 -0400

26984

@@ -37,11 +37,11 @@

26985

public static final nsID NS_IPROGRESSDIALOG_IID =

26986

new nsID(NS_IPROGRESSDIALOG_IID_STR);

26987

26988

- public nsIProgressDialog_1_8(int /*long*/ address) {

26989

+ public nsIProgressDialog_1_8(long /*int*/ address) {

26990

super(address);

26991

}

26992

26993

- public int Open(int /*long*/ aParent) {

26994

+ public int Open(long /*int*/ aParent) {

26995

return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent);

26996

}

26997

26998

@@ -53,19 +53,19 @@

26999

return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);

27000

}

27001

27002

- public int GetObserver(int /*long*/[] aObserver) {

27003

+ public int GetObserver(long /*int*/[] aObserver) {

27004

return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 4, getAddress(), aObserver);

27005

}

27006

27007

- public int SetObserver(int /*long*/ aObserver) {

27008

+ public int SetObserver(long /*int*/ aObserver) {

27009

return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 5, getAddress(), aObserver);

27010

}

27011

27012

- public int GetDialog(int /*long*/[] aDialog) {

27013

+ public int GetDialog(long /*int*/[] aDialog) {

27014

return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 6, getAddress(), aDialog);

27015

}

27016

27017

- public int SetDialog(int /*long*/ aDialog) {

27018

+ public int SetDialog(long /*int*/ aDialog) {

27019

return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog);

27020

}

27021

}

27022

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java

27023

--- x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java 2008-10-22 16:17:00.000000000 -0400

27024

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java 2009-09-17 08:48:22.000000000 -0400

27025

@@ -37,11 +37,11 @@

27026

public static final nsID NS_IPROGRESSDIALOG_IID =

27027

new nsID(NS_IPROGRESSDIALOG_IID_STR);

27028

27029

- public nsIProgressDialog(int /*long*/ address) {

27030

+ public nsIProgressDialog(long /*int*/ address) {

27031

super(address);

27032

}

27033

27034

- public int Open(int /*long*/ aParent) {

27035

+ public int Open(long /*int*/ aParent) {

27036

return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent);

27037

}

27038

27039

@@ -53,11 +53,11 @@

27040

return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);

27041

}

27042

27043

- public int GetDialog(int /*long*/[] aDialog) {

27044

+ public int GetDialog(long /*int*/[] aDialog) {

27045

return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 4, getAddress(), aDialog);

27046

}

27047

27048

- public int SetDialog(int /*long*/ aDialog) {

27049

+ public int SetDialog(long /*int*/ aDialog) {

27050

return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog);

27051

}

27052

}

27053

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPromptService2.java x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService2.java

27054

--- x86/org/eclipse/swt/internal/mozilla/nsIPromptService2.java 2008-10-22 16:17:00.000000000 -0400

27055

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService2.java 2009-09-17 08:48:22.000000000 -0400

27056

@@ -37,15 +37,15 @@

27057

public static final nsID NS_IPROMPTSERVICE2_IID =

27058

new nsID(NS_IPROMPTSERVICE2_IID_STR);

27059

27060

- public nsIPromptService2(int /*long*/ address) {

27061

+ public nsIPromptService2(long /*int*/ address) {

27062

super(address);

27063

}

27064

27065

- public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {

27066

+ public int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {

27067

return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval);

27068

}

27069

27070

- 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) {

27071

+ 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) {

27072

return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);

27073

}

27074

}

27075

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPromptService.java x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService.java

27076

--- x86/org/eclipse/swt/internal/mozilla/nsIPromptService.java 2008-10-22 16:17:00.000000000 -0400

27077

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService.java 2009-09-17 08:48:22.000000000 -0400

27078

@@ -37,23 +37,23 @@

27079

public static final nsID NS_IPROMPTSERVICE_IID =

27080

new nsID(NS_IPROMPTSERVICE_IID_STR);

27081

27082

- public nsIPromptService(int /*long*/ address) {

27083

+ public nsIPromptService(long /*int*/ address) {

27084

super(address);

27085

}

27086

27087

- public int Alert(int /*long*/ aParent, char[] aDialogTitle, char[] aText) {

27088

+ public int Alert(long /*int*/ aParent, char[] aDialogTitle, char[] aText) {

27089

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText);

27090

}

27091

27092

- public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {

27093

+ public int AlertCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {

27094

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState);

27095

}

27096

27097

- public int Confirm(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {

27098

+ public int Confirm(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {

27099

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval);

27100

}

27101

27102

- public int ConfirmCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

27103

+ public int ConfirmCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

27104

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval);

27105

}

27106

27107

@@ -91,23 +91,23 @@

27108

27109

public static final int STD_YES_NO_BUTTONS = 1027;

27110

27111

- public int ConfirmEx(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

27112

+ public int ConfirmEx(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

27113

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval);

27114

}

27115

27116

- public int Prompt(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

27117

+ public int Prompt(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

27118

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval);

27119

}

27120

27121

- public int PromptUsernameAndPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aUsername, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

27122

+ public int PromptUsernameAndPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aUsername, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

27123

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval);

27124

}

27125

27126

- public int PromptPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

27127

+ public int PromptPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

27128

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval);

27129

}

27130

27131

- public int Select(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aCount, int /*long*/[] aSelectList, int[] aOutSelection, int[] _retval) {

27132

+ public int Select(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aCount, long /*int*/[] aSelectList, int[] aOutSelection, int[] _retval) {

27133

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval);

27134

}

27135

}

27136

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProperties.java x86_64/org/eclipse/swt/internal/mozilla/nsIProperties.java

27137

--- x86/org/eclipse/swt/internal/mozilla/nsIProperties.java 2008-10-22 16:17:02.000000000 -0400

27138

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIProperties.java 2009-09-17 08:48:22.000000000 -0400

27139

@@ -37,15 +37,15 @@

27140

public static final nsID NS_IPROPERTIES_IID =

27141

new nsID(NS_IPROPERTIES_IID_STR);

27142

27143

- public nsIProperties(int /*long*/ address) {

27144

+ public nsIProperties(long /*int*/ address) {

27145

super(address);

27146

}

27147

27148

- public int Get(byte[] prop, nsID iid, int /*long*/[] result) {

27149

+ public int Get(byte[] prop, nsID iid, long /*int*/[] result) {

27150

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, iid, result);

27151

}

27152

27153

- public int Set(byte[] prop, int /*long*/ value) {

27154

+ public int Set(byte[] prop, long /*int*/ value) {

27155

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value);

27156

}

27157

27158

@@ -57,7 +57,7 @@

27159

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), prop);

27160

}

27161

27162

- public int GetKeys(int[] count, int /*long*/[] keys) {

27163

+ public int GetKeys(int[] count, long /*int*/[] keys) {

27164

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), count, keys);

27165

}

27166

}

27167

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIRequest.java x86_64/org/eclipse/swt/internal/mozilla/nsIRequest.java

27168

--- x86/org/eclipse/swt/internal/mozilla/nsIRequest.java 2008-10-22 16:17:02.000000000 -0400

27169

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIRequest.java 2009-09-17 08:48:22.000000000 -0400

27170

@@ -37,11 +37,11 @@

27171

public static final nsID NS_IREQUEST_IID =

27172

new nsID(NS_IREQUEST_IID_STR);

27173

27174

- public nsIRequest(int /*long*/ address) {

27175

+ public nsIRequest(long /*int*/ address) {

27176

super(address);

27177

}

27178

27179

- public int GetName(int /*long*/ aName) {

27180

+ public int GetName(long /*int*/ aName) {

27181

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);

27182

}

27183

27184

@@ -49,7 +49,7 @@

27185

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);

27186

}

27187

27188

- public int GetStatus(int /*long*/[] aStatus) {

27189

+ public int GetStatus(long /*int*/[] aStatus) {

27190

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aStatus);

27191

}

27192

27193

@@ -65,15 +65,15 @@

27194

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());

27195

}

27196

27197

- public int GetLoadGroup(int /*long*/[] aLoadGroup) {

27198

+ public int GetLoadGroup(long /*int*/[] aLoadGroup) {

27199

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aLoadGroup);

27200

}

27201

27202

- public int SetLoadGroup(int /*long*/ aLoadGroup) {

27203

+ public int SetLoadGroup(long /*int*/ aLoadGroup) {

27204

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLoadGroup);

27205

}

27206

27207

- public int GetLoadFlags(int /*long*/[] aLoadFlags) {

27208

+ public int GetLoadFlags(long /*int*/[] aLoadFlags) {

27209

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aLoadFlags);

27210

}

27211

27212

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java

27213

--- x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java 2009-04-08 14:54:52.000000000 -0400

27214

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java 2009-09-17 08:48:22.000000000 -0400

27215

@@ -37,19 +37,19 @@

27216

public static final nsID NS_ISCRIPTSECURITYMANAGER_IID =

27217

new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR);

27218

27219

- public nsIScriptSecurityManager_1_9_1(int /*long*/ address) {

27220

+ public nsIScriptSecurityManager_1_9_1(long /*int*/ address) {

27221

super(address);

27222

}

27223

27224

-// public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {

27225

+// public int CheckPropertyAccess(long /*int*/ aJSContext, long /*int*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {

27226

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction);

27227

// }

27228

27229

- public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {

27230

+ public int CheckConnect(long /*int*/ aJSContext, long /*int*/ aTargetURI, byte[] aClassName, byte[] aProperty) {

27231

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);

27232

}

27233

27234

- public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {

27235

+ public int CheckLoadURIFromScript(long /*int*/ cx, long /*int*/ uri) {

27236

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri);

27237

}

27238

27239

@@ -65,47 +65,47 @@

27240

27241

public static final int DISALLOW_SCRIPT = 8;

27242

27243

- public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {

27244

+ public int CheckLoadURIWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {

27245

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 4, getAddress(), aPrincipal, uri, flags);

27246

}

27247

27248

- public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {

27249

+ public int CheckLoadURI(long /*int*/ from, long /*int*/ uri, int flags) {

27250

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 5, getAddress(), from, uri, flags);

27251

}

27252

27253

- public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {

27254

+ public int CheckLoadURIStrWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {

27255

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 6, getAddress(), aPrincipal, uri, flags);

27256

}

27257

27258

- public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {

27259

+ public int CheckLoadURIStr(long /*int*/ from, long /*int*/ uri, int flags) {

27260

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 7, getAddress(), from, uri, flags);

27261

}

27262

27263

- public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {

27264

+ public int CheckFunctionAccess(long /*int*/ cx, long /*int*/ funObj, long /*int*/ targetObj) {

27265

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 8, getAddress(), cx, funObj, targetObj);

27266

}

27267

27268

-// public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval NS_OUTPARAM) {

27269

+// public int CanExecuteScripts(long /*int*/ cx, long /*int*/ principal, int[] _retval NS_OUTPARAM) {

27270

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 9, getAddress(), cx, principal, _retval NS_OUTPARAM);

27271

// }

27272

27273

-// public int GetSubjectPrincipal(int /*long*/[] _retval NS_OUTPARAM) {

27274

+// public int GetSubjectPrincipal(long /*int*/[] _retval NS_OUTPARAM) {

27275

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 10, getAddress(), _retval NS_OUTPARAM);

27276

// }

27277

27278

- public int GetSystemPrincipal(int /*long*/[] _retval) {

27279

+ public int GetSystemPrincipal(long /*int*/[] _retval) {

27280

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 11, getAddress(), _retval);

27281

}

27282

27283

-// public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval NS_OUTPARAM) {

27284

+// public int GetCertificatePrincipal(long /*int*/ aCertFingerprint, long /*int*/ aSubjectName, long /*int*/ aPrettyName, long /*int*/ aCert, long /*int*/ aURI, long /*int*/[] _retval NS_OUTPARAM) {

27285

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 12, getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval NS_OUTPARAM);

27286

// }

27287

27288

-// public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval NS_OUTPARAM) {

27289

+// public int GetCodebasePrincipal(long /*int*/ aURI, long /*int*/[] _retval NS_OUTPARAM) {

27290

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 13, getAddress(), aURI, _retval NS_OUTPARAM);

27291

// }

27292

27293

-// public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval NS_OUTPARAM) {

27294

+// public int RequestCapability(long /*int*/ principal, byte[] capability, long /*int*/ _retval NS_OUTPARAM) {

27295

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval NS_OUTPARAM);

27296

// }

27297

27298

@@ -125,11 +125,11 @@

27299

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability);

27300

}

27301

27302

-// public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {

27303

+// public int SetCanEnableCapability(long /*int*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {

27304

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 19, getAddress(), certificateFingerprint, capability, canEnable);

27305

// }

27306

27307

-// public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval NS_OUTPARAM) {

27308

+// public int GetObjectPrincipal(long /*int*/ cx, long /*int*/ obj, long /*int*/[] _retval NS_OUTPARAM) {

27309

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval NS_OUTPARAM);

27310

// }

27311

27312

@@ -137,23 +137,23 @@

27313

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval NS_OUTPARAM);

27314

// }

27315

27316

- public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {

27317

+ public int CheckSameOrigin(long /*int*/ aJSContext, long /*int*/ aTargetURI) {

27318

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 22, getAddress(), aJSContext, aTargetURI);

27319

}

27320

27321

- public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {

27322

+ public int CheckSameOriginURI(long /*int*/ aSourceURI, long /*int*/ aTargetURI, int reportError) {

27323

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 23, getAddress(), aSourceURI, aTargetURI, reportError);

27324

}

27325

27326

-// public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval NS_OUTPARAM) {

27327

+// public int GetPrincipalFromContext(long /*int*/ cx, long /*int*/[] _retval NS_OUTPARAM) {

27328

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 24, getAddress(), cx, _retval NS_OUTPARAM);

27329

// }

27330

27331

-// public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval NS_OUTPARAM) {

27332

+// public int GetChannelPrincipal(long /*int*/ aChannel, long /*int*/[] _retval NS_OUTPARAM) {

27333

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 25, getAddress(), aChannel, _retval NS_OUTPARAM);

27334

// }

27335

27336

-// public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval NS_OUTPARAM) {

27337

+// public int IsSystemPrincipal(long /*int*/ aPrincipal, int[] _retval NS_OUTPARAM) {

27338

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), aPrincipal, _retval NS_OUTPARAM);

27339

// }

27340

}

27341

\ No newline at end of file

27342

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java

27343

--- x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java 2009-04-08 14:54:52.000000000 -0400

27344

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java 2009-09-17 08:48:22.000000000 -0400

27345

@@ -37,19 +37,19 @@

27346

public static final nsID NS_ISCRIPTSECURITYMANAGER_IID =

27347

new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR);

27348

27349

- public nsIScriptSecurityManager_1_9(int /*long*/ address) {

27350

+ public nsIScriptSecurityManager_1_9(long /*int*/ address) {

27351

super(address);

27352

}

27353

27354

-// public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {

27355

+// public int CheckPropertyAccess(long /*int*/ aJSContext, long /*int*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {

27356

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction);

27357

// }

27358

27359

-// public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {

27360

+// public int CheckConnect(long /*int*/ aJSContext, long /*int*/ aTargetURI, byte[] aClassName, byte[] aProperty) {

27361

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);

27362

// }

27363

27364

- public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {

27365

+ public int CheckLoadURIFromScript(long /*int*/ cx, long /*int*/ uri) {

27366

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri);

27367

}

27368

27369

@@ -65,47 +65,47 @@

27370

27371

public static final int DISALLOW_SCRIPT = 8;

27372

27373

- public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {

27374

+ public int CheckLoadURIWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {

27375

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 4, getAddress(), aPrincipal, uri, flags);

27376

}

27377

27378

- public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {

27379

+ public int CheckLoadURI(long /*int*/ from, long /*int*/ uri, int flags) {

27380

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 5, getAddress(), from, uri, flags);

27381

}

27382

27383

- public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {

27384

+ public int CheckLoadURIStrWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {

27385

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 6, getAddress(), aPrincipal, uri, flags);

27386

}

27387

27388

- public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {

27389

+ public int CheckLoadURIStr(long /*int*/ from, long /*int*/ uri, int flags) {

27390

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 7, getAddress(), from, uri, flags);

27391

}

27392

27393

- public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {

27394

+ public int CheckFunctionAccess(long /*int*/ cx, long /*int*/ funObj, long /*int*/ targetObj) {

27395

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 8, getAddress(), cx, funObj, targetObj);

27396

}

27397

27398

- public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval) {

27399

+ public int CanExecuteScripts(long /*int*/ cx, long /*int*/ principal, int[] _retval) {

27400

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 9, getAddress(), cx, principal, _retval);

27401

}

27402

27403

- public int GetSubjectPrincipal(int /*long*/[] _retval) {

27404

+ public int GetSubjectPrincipal(long /*int*/[] _retval) {

27405

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 10, getAddress(), _retval);

27406

}

27407

27408

- public int GetSystemPrincipal(int /*long*/[] _retval) {

27409

+ public int GetSystemPrincipal(long /*int*/[] _retval) {

27410

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 11, getAddress(), _retval);

27411

}

27412

27413

-// public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval) {

27414

+// public int GetCertificatePrincipal(long /*int*/ aCertFingerprint, long /*int*/ aSubjectName, long /*int*/ aPrettyName, long /*int*/ aCert, long /*int*/ aURI, long /*int*/[] _retval) {

27415

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 12, getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval);

27416

// }

27417

27418

- public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval) {

27419

+ public int GetCodebasePrincipal(long /*int*/ aURI, long /*int*/[] _retval) {

27420

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 13, getAddress(), aURI, _retval);

27421

}

27422

27423

-// public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval) {

27424

+// public int RequestCapability(long /*int*/ principal, byte[] capability, long /*int*/ _retval) {

27425

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval);

27426

// }

27427

27428

@@ -125,11 +125,11 @@

27429

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability);

27430

}

27431

27432

-// public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {

27433

+// public int SetCanEnableCapability(long /*int*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {

27434

// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 19, getAddress(), certificateFingerprint, capability, canEnable);

27435

// }

27436

27437

- public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval) {

27438

+ public int GetObjectPrincipal(long /*int*/ cx, long /*int*/ obj, long /*int*/[] _retval) {

27439

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval);

27440

}

27441

27442

@@ -137,23 +137,23 @@

27443

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval);

27444

}

27445

27446

- public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {

27447

+ public int CheckSameOrigin(long /*int*/ aJSContext, long /*int*/ aTargetURI) {

27448

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 22, getAddress(), aJSContext, aTargetURI);

27449

}

27450

27451

- public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {

27452

+ public int CheckSameOriginURI(long /*int*/ aSourceURI, long /*int*/ aTargetURI, int reportError) {

27453

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 23, getAddress(), aSourceURI, aTargetURI, reportError);

27454

}

27455

27456

- public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval) {

27457

+ public int GetPrincipalFromContext(long /*int*/ cx, long /*int*/[] _retval) {

27458

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 24, getAddress(), cx, _retval);

27459

}

27460

27461

- public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval) {

27462

+ public int GetChannelPrincipal(long /*int*/ aChannel, long /*int*/[] _retval) {

27463

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 25, getAddress(), aChannel, _retval);

27464

}

27465

27466

- public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval) {

27467

+ public int IsSystemPrincipal(long /*int*/ aPrincipal, int[] _retval) {

27468

return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), aPrincipal, _retval);

27469

}

27470

}

27471

\ No newline at end of file

27472

diff -urN x86/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java x86_64/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java

27473

--- x86/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java 2008-12-02 11:18:44.000000000 -0500

27474

+++ x86_64/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java 2009-09-17 08:48:22.000000000 -0400

27475

@@ -11,23 +11,23 @@

27476

public static final nsID NS_ISECURITYCHECKEDCOMPONENT_IID =

27477

new nsID(NS_ISECURITYCHECKEDCOMPONENT_IID_STR);

27478

27479

- public nsISecurityCheckedComponent(int /*long*/ address) {

27480

+ public nsISecurityCheckedComponent(long /*int*/ address) {

27481

super(address);

27482

}

27483

27484

- public int CanCreateWrapper(int /*long*/ iid, int /*long*/[] _retval) {

27485

+ public int CanCreateWrapper(long /*int*/ iid, long /*int*/[] _retval) {

27486

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), iid, _retval);

27487

}

27488

27489

- public int CanCallMethod(int /*long*/ iid, char[] methodName, int /*long*/[] _retval) {

27490

+ public int CanCallMethod(long /*int*/ iid, char[] methodName, long /*int*/[] _retval) {

27491

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), iid, methodName, _retval);

27492

}

27493

27494

- public int CanGetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) {

27495

+ public int CanGetProperty(long /*int*/ iid, char[] propertyName, long /*int*/[] _retval) {

27496

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), iid, propertyName, _retval);

27497

}

27498

27499

- public int CanSetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) {

27500

+ public int CanSetProperty(long /*int*/ iid, char[] propertyName, long /*int*/[] _retval) {

27501

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), iid, propertyName, _retval);

27502

}

27503

}

27504

diff -urN x86/org/eclipse/swt/internal/mozilla/nsISerializable.java x86_64/org/eclipse/swt/internal/mozilla/nsISerializable.java

27505

--- x86/org/eclipse/swt/internal/mozilla/nsISerializable.java 2009-04-08 14:54:52.000000000 -0400

27506

+++ x86_64/org/eclipse/swt/internal/mozilla/nsISerializable.java 2009-09-17 08:48:22.000000000 -0400

27507

@@ -37,15 +37,15 @@

27508

public static final nsID NS_ISERIALIZABLE_IID =

27509

new nsID(NS_ISERIALIZABLE_IID_STR);

27510

27511

- public nsISerializable(int /*long*/ address) {

27512

+ public nsISerializable(long /*int*/ address) {

27513

super(address);

27514

}

27515

27516

- public int Read(int /*long*/ aInputStream) {

27517

+ public int Read(long /*int*/ aInputStream) {

27518

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aInputStream);

27519

}

27520

27521

- public int Write(int /*long*/ aOutputStream) {

27522

+ public int Write(long /*int*/ aOutputStream) {

27523

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aOutputStream);

27524

}

27525

}

27526

\ No newline at end of file

27527

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIServiceManager.java x86_64/org/eclipse/swt/internal/mozilla/nsIServiceManager.java

27528

--- x86/org/eclipse/swt/internal/mozilla/nsIServiceManager.java 2008-10-22 16:17:02.000000000 -0400

27529

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIServiceManager.java 2009-09-17 08:48:22.000000000 -0400

27530

@@ -37,15 +37,15 @@

27531

public static final nsID NS_ISERVICEMANAGER_IID =

27532

new nsID(NS_ISERVICEMANAGER_IID_STR);

27533

27534

- public nsIServiceManager(int /*long*/ address) {

27535

+ public nsIServiceManager(long /*int*/ address) {

27536

super(address);

27537

}

27538

27539

- public int GetService(nsID aClass, nsID aIID, int /*long*/[] result) {

27540

+ public int GetService(nsID aClass, nsID aIID, long /*int*/[] result) {

27541

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);

27542

}

27543

27544

- public int GetServiceByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {

27545

+ public int GetServiceByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) {

27546

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);

27547

}

27548

27549

diff -urN x86/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java x86_64/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java

27550

--- x86/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java 2008-10-22 16:17:02.000000000 -0400

27551

+++ x86_64/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java 2009-09-17 08:48:22.000000000 -0400

27552

@@ -37,7 +37,7 @@

27553

public static final nsID NS_ISIMPLEENUMERATOR_IID =

27554

new nsID(NS_ISIMPLEENUMERATOR_IID_STR);

27555

27556

- public nsISimpleEnumerator(int /*long*/ address) {

27557

+ public nsISimpleEnumerator(long /*int*/ address) {

27558

super(address);

27559

}

27560

27561

@@ -45,7 +45,7 @@

27562

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);

27563

}

27564

27565

- public int GetNext(int /*long*/[] _retval) {

27566

+ public int GetNext(long /*int*/[] _retval) {

27567

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);

27568

}

27569

}

27570

diff -urN x86/org/eclipse/swt/internal/mozilla/nsISSLStatus.java x86_64/org/eclipse/swt/internal/mozilla/nsISSLStatus.java

27571

--- x86/org/eclipse/swt/internal/mozilla/nsISSLStatus.java 2009-08-19 16:24:48.000000000 -0400

27572

+++ x86_64/org/eclipse/swt/internal/mozilla/nsISSLStatus.java 2009-09-17 08:48:22.000000000 -0400

27573

@@ -37,15 +37,15 @@

27574

public static final nsID NS_ISSLSTATUS_IID =

27575

new nsID(NS_ISSLSTATUS_IID_STR);

27576

27577

- public nsISSLStatus(int /*long*/ address) {

27578

+ public nsISSLStatus(long /*int*/ address) {

27579

super(address);

27580

}

27581

27582

- public int GetServerCert(int /*long*/[] aServerCert) {

27583

+ public int GetServerCert(long /*int*/[] aServerCert) {

27584

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aServerCert);

27585

}

27586

27587

- public int GetCipherName(int /*long*/[] aCipherName) {

27588

+ public int GetCipherName(long /*int*/[] aCipherName) {

27589

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCipherName);

27590

}

27591

27592

diff -urN x86/org/eclipse/swt/internal/mozilla/nsISupports.java x86_64/org/eclipse/swt/internal/mozilla/nsISupports.java

27593

--- x86/org/eclipse/swt/internal/mozilla/nsISupports.java 2009-04-22 15:12:24.000000000 -0400

27594

+++ x86_64/org/eclipse/swt/internal/mozilla/nsISupports.java 2009-09-17 08:48:22.000000000 -0400

27595

@@ -44,17 +44,17 @@

27596

public static final nsID NS_ISUPPORTS_IID =

27597

new nsID(NS_ISUPPORTS_IID_STR);

27598

27599

- int /*long*/ address;

27600

+ long /*int*/ address;

27601

27602

- public nsISupports(int /*long*/ address) {

27603

+ public nsISupports(long /*int*/ address) {

27604

this.address = address;

27605

}

27606

27607

- public int /*long*/ getAddress() {

27608

+ public long /*int*/ getAddress() {

27609

return this.address;

27610

}

27611

27612

- public int QueryInterface(nsID uuid, int /*long*/[] result) {

27613

+ public int QueryInterface(nsID uuid, long /*int*/[] result) {

27614

return XPCOM.VtblCall(FIRST_METHOD_ID, getAddress(), uuid, result);

27615

}

27616

27617

diff -urN x86/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java x86_64/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java

27618

--- x86/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java 2006-05-09 14:54:24.000000000 -0400

27619

+++ x86_64/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java 2009-09-17 08:48:22.000000000 -0400

27620

@@ -37,11 +37,11 @@

27621

public static final nsID NS_ISUPPORTSWEAKREFERENCE_IID =

27622

new nsID(NS_ISUPPORTSWEAKREFERENCE_IID_STR);

27623

27624

- public nsISupportsWeakReference(int /*long*/ address) {

27625

+ public nsISupportsWeakReference(long /*int*/ address) {

27626

super(address);

27627

}

27628

27629

- public int GetWeakReference(int /*long*/[] _retval) {

27630

+ public int GetWeakReference(long /*int*/[] _retval) {

27631

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);

27632

}

27633

}

27634

\ No newline at end of file

27635

diff -urN x86/org/eclipse/swt/internal/mozilla/nsITooltipListener.java x86_64/org/eclipse/swt/internal/mozilla/nsITooltipListener.java

27636

--- x86/org/eclipse/swt/internal/mozilla/nsITooltipListener.java 2006-05-09 14:54:24.000000000 -0400

27637

+++ x86_64/org/eclipse/swt/internal/mozilla/nsITooltipListener.java 2009-09-17 08:48:22.000000000 -0400

27638

@@ -37,7 +37,7 @@

27639

public static final nsID NS_ITOOLTIPLISTENER_IID =

27640

new nsID(NS_ITOOLTIPLISTENER_IID_STR);

27641

27642

- public nsITooltipListener(int /*long*/ address) {

27643

+ public nsITooltipListener(long /*int*/ address) {

27644

super(address);

27645

}

27646

27647

diff -urN x86/org/eclipse/swt/internal/mozilla/nsITransfer.java x86_64/org/eclipse/swt/internal/mozilla/nsITransfer.java

27648

--- x86/org/eclipse/swt/internal/mozilla/nsITransfer.java 2006-10-26 11:24:36.000000000 -0400

27649

+++ x86_64/org/eclipse/swt/internal/mozilla/nsITransfer.java 2009-09-17 08:48:22.000000000 -0400

27650

@@ -37,11 +37,11 @@

27651

public static final nsID NS_ITRANSFER_IID =

27652

new nsID(NS_ITRANSFER_IID_STR);

27653

27654

- public nsITransfer(int /*long*/ address) {

27655

+ public nsITransfer(long /*int*/ address) {

27656

super(address);

27657

}

27658

27659

- public int Init(int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aTempFile, int /*long*/ aCancelable) {

27660

+ public int Init(long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aTempFile, long /*int*/ aCancelable) {

27661

return XPCOM.VtblCall(nsIWebProgressListener2.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable);

27662

}

27663

}

27664

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java

27665

--- x86/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java 2008-10-22 16:17:00.000000000 -0400

27666

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java 2009-09-17 08:48:22.000000000 -0400

27667

@@ -37,39 +37,39 @@

27668

public static final nsID NS_IURICONTENTLISTENER_IID =

27669

new nsID(NS_IURICONTENTLISTENER_IID_STR);

27670

27671

- public nsIURIContentListener(int /*long*/ address) {

27672

+ public nsIURIContentListener(long /*int*/ address) {

27673

super(address);

27674

}

27675

27676

- public int OnStartURIOpen(int /*long*/ aURI, int[] _retval) {

27677

+ public int OnStartURIOpen(long /*int*/ aURI, int[] _retval) {

27678

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);

27679

}

27680

27681

- public int DoContent(byte[] aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, int[] _retval) {

27682

+ public int DoContent(byte[] aContentType, int aIsContentPreferred, long /*int*/ aRequest, long /*int*/[] aContentHandler, int[] _retval) {

27683

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval);

27684

}

27685

27686

- public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, int[] _retval) {

27687

+ public int IsPreferred(byte[] aContentType, long /*int*/[] aDesiredContentType, int[] _retval) {

27688

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval);

27689

}

27690

27691

- public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, int /*long*/[] aDesiredContentType, int[] _retval) {

27692

+ public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, long /*int*/[] aDesiredContentType, int[] _retval) {

27693

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContentType, aIsContentPreferred, aDesiredContentType, _retval);

27694

}

27695

27696

- public int GetLoadCookie(int /*long*/[] aLoadCookie) {

27697

+ public int GetLoadCookie(long /*int*/[] aLoadCookie) {

27698

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLoadCookie);

27699

}

27700

27701

- public int SetLoadCookie(int /*long*/ aLoadCookie) {

27702

+ public int SetLoadCookie(long /*int*/ aLoadCookie) {

27703

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLoadCookie);

27704

}

27705

27706

- public int GetParentContentListener(int /*long*/[] aParentContentListener) {

27707

+ public int GetParentContentListener(long /*int*/[] aParentContentListener) {

27708

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParentContentListener);

27709

}

27710

27711

- public int SetParentContentListener(int /*long*/ aParentContentListener) {

27712

+ public int SetParentContentListener(long /*int*/ aParentContentListener) {

27713

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);

27714

}

27715

}

27716

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIURI.java x86_64/org/eclipse/swt/internal/mozilla/nsIURI.java

27717

--- x86/org/eclipse/swt/internal/mozilla/nsIURI.java 2008-10-22 16:17:00.000000000 -0400

27718

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIURI.java 2009-09-17 08:48:22.000000000 -0400

27719

@@ -37,67 +37,67 @@

27720

public static final nsID NS_IURI_IID =

27721

new nsID(NS_IURI_IID_STR);

27722

27723

- public nsIURI(int /*long*/ address) {

27724

+ public nsIURI(long /*int*/ address) {

27725

super(address);

27726

}

27727

27728

- public int GetSpec(int /*long*/ aSpec) {

27729

+ public int GetSpec(long /*int*/ aSpec) {

27730

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);

27731

}

27732

27733

- public int SetSpec(int /*long*/ aSpec) {

27734

+ public int SetSpec(long /*int*/ aSpec) {

27735

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);

27736

}

27737

27738

- public int GetPrePath(int /*long*/ aPrePath) {

27739

+ public int GetPrePath(long /*int*/ aPrePath) {

27740

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath);

27741

}

27742

27743

- public int GetScheme(int /*long*/ aScheme) {

27744

+ public int GetScheme(long /*int*/ aScheme) {

27745

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme);

27746

}

27747

27748

- public int SetScheme(int /*long*/ aScheme) {

27749

+ public int SetScheme(long /*int*/ aScheme) {

27750

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme);

27751

}

27752

27753

- public int GetUserPass(int /*long*/ aUserPass) {

27754

+ public int GetUserPass(long /*int*/ aUserPass) {

27755

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aUserPass);

27756

}

27757

27758

- public int SetUserPass(int /*long*/ aUserPass) {

27759

+ public int SetUserPass(long /*int*/ aUserPass) {

27760

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aUserPass);

27761

}

27762

27763

- public int GetUsername(int /*long*/ aUsername) {

27764

+ public int GetUsername(long /*int*/ aUsername) {

27765

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername);

27766

}

27767

27768

- public int SetUsername(int /*long*/ aUsername) {

27769

+ public int SetUsername(long /*int*/ aUsername) {

27770

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername);

27771

}

27772

27773

- public int GetPassword(int /*long*/ aPassword) {

27774

+ public int GetPassword(long /*int*/ aPassword) {

27775

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword);

27776

}

27777

27778

- public int SetPassword(int /*long*/ aPassword) {

27779

+ public int SetPassword(long /*int*/ aPassword) {

27780

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword);

27781

}

27782

27783

- public int GetHostPort(int /*long*/ aHostPort) {

27784

+ public int GetHostPort(long /*int*/ aHostPort) {

27785

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort);

27786

}

27787

27788

- public int SetHostPort(int /*long*/ aHostPort) {

27789

+ public int SetHostPort(long /*int*/ aHostPort) {

27790

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort);

27791

}

27792

27793

- public int GetHost(int /*long*/ aHost) {

27794

+ public int GetHost(long /*int*/ aHost) {

27795

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost);

27796

}

27797

27798

- public int SetHost(int /*long*/ aHost) {

27799

+ public int SetHost(long /*int*/ aHost) {

27800

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost);

27801

}

27802

27803

@@ -109,15 +109,15 @@

27804

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort);

27805

}

27806

27807

- public int GetPath(int /*long*/ aPath) {

27808

+ public int GetPath(long /*int*/ aPath) {

27809

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath);

27810

}

27811

27812

- public int SetPath(int /*long*/ aPath) {

27813

+ public int SetPath(long /*int*/ aPath) {

27814

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath);

27815

}

27816

27817

- public int Equals(int /*long*/ other, int[] _retval) {

27818

+ public int Equals(long /*int*/ other, int[] _retval) {

27819

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);

27820

}

27821

27822

@@ -125,23 +125,23 @@

27823

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);

27824

}

27825

27826

- public int Clone(int /*long*/[] _retval) {

27827

+ public int Clone(long /*int*/[] _retval) {

27828

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);

27829

}

27830

27831

- public int Resolve(int /*long*/ relativePath, int /*long*/ _retval) {

27832

+ public int Resolve(long /*int*/ relativePath, long /*int*/ _retval) {

27833

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval);

27834

}

27835

27836

- public int GetAsciiSpec(int /*long*/ aAsciiSpec) {

27837

+ public int GetAsciiSpec(long /*int*/ aAsciiSpec) {

27838

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec);

27839

}

27840

27841

- public int GetAsciiHost(int /*long*/ aAsciiHost) {

27842

+ public int GetAsciiHost(long /*int*/ aAsciiHost) {

27843

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost);

27844

}

27845

27846

- public int GetOriginCharset(int /*long*/ aOriginCharset) {

27847

+ public int GetOriginCharset(long /*int*/ aOriginCharset) {

27848

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);

27849

}

27850

}

27851

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIVariant.java x86_64/org/eclipse/swt/internal/mozilla/nsIVariant.java

27852

--- x86/org/eclipse/swt/internal/mozilla/nsIVariant.java 2008-12-02 11:18:44.000000000 -0500

27853

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIVariant.java 2009-09-17 08:48:22.000000000 -0400

27854

@@ -37,7 +37,7 @@

27855

public static final nsID NS_IVARIANT_IID =

27856

new nsID(NS_IVARIANT_IID_STR);

27857

27858

- public nsIVariant(int /*long*/ address) {

27859

+ public nsIVariant(long /*int*/ address) {

27860

super(address);

27861

}

27862

27863

@@ -45,11 +45,11 @@

27864

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDataType);

27865

}

27866

27867

- public int GetAsInt8(int /*long*/ _retval) {

27868

+ public int GetAsInt8(long /*int*/ _retval) {

27869

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);

27870

}

27871

27872

- public int GetAsInt16(int /*long*/ _retval) {

27873

+ public int GetAsInt16(long /*int*/ _retval) {

27874

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);

27875

}

27876

27877

@@ -61,7 +61,7 @@

27878

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);

27879

}

27880

27881

- public int GetAsUint8(int /*long*/ _retval) {

27882

+ public int GetAsUint8(long /*int*/ _retval) {

27883

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);

27884

}

27885

27886

@@ -73,7 +73,7 @@

27887

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), _retval);

27888

}

27889

27890

- public int GetAsUint64(int /*long*/ _retval) {

27891

+ public int GetAsUint64(long /*int*/ _retval) {

27892

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);

27893

}

27894

27895

@@ -81,7 +81,7 @@

27896

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);

27897

}

27898

27899

- public int GetAsDouble(int /*long*/ _retval) {

27900

+ public int GetAsDouble(long /*int*/ _retval) {

27901

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), _retval);

27902

}

27903

27904

@@ -97,51 +97,51 @@

27905

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);

27906

}

27907

27908

- public int GetAsID(int /*long*/ retval) {

27909

+ public int GetAsID(long /*int*/ retval) {

27910

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), retval);

27911

}

27912

27913

- public int GetAsAString(int /*long*/ _retval) {

27914

+ public int GetAsAString(long /*int*/ _retval) {

27915

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), _retval);

27916

}

27917

27918

- public int GetAsDOMString(int /*long*/ _retval) {

27919

+ public int GetAsDOMString(long /*int*/ _retval) {

27920

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), _retval);

27921

}

27922

27923

- public int GetAsACString(int /*long*/ _retval) {

27924

+ public int GetAsACString(long /*int*/ _retval) {

27925

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), _retval);

27926

}

27927

27928

- public int GetAsAUTF8String(int /*long*/ _retval) {

27929

+ public int GetAsAUTF8String(long /*int*/ _retval) {

27930

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), _retval);

27931

}

27932

27933

- public int GetAsString(int /*long*/[] _retval) {

27934

+ public int GetAsString(long /*int*/[] _retval) {

27935

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), _retval);

27936

}

27937

27938

- public int GetAsWString(int /*long*/[] _retval) {

27939

+ public int GetAsWString(long /*int*/[] _retval) {

27940

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);

27941

}

27942

27943

- public int GetAsISupports(int /*long*/[] _retval) {

27944

+ public int GetAsISupports(long /*int*/[] _retval) {

27945

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);

27946

}

27947

27948

- public int GetAsInterface(int /*long*/[] iid, int /*long*/[] iface) {

27949

+ public int GetAsInterface(long /*int*/[] iid, long /*int*/[] iface) {

27950

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), iid, iface);

27951

}

27952

27953

- public int GetAsArray(short[] type, int /*long*/ iid, int[] count, int /*long*/[] ptr) {

27954

+ public int GetAsArray(short[] type, long /*int*/ iid, int[] count, long /*int*/[] ptr) {

27955

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), type, iid, count, ptr);

27956

}

27957

27958

- public int GetAsStringWithSize(int[] size, int /*long*/[] str) {

27959

+ public int GetAsStringWithSize(int[] size, long /*int*/[] str) {

27960

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), size, str);

27961

}

27962

27963

- public int GetAsWStringWithSize(int[] size, int /*long*/[] str) {

27964

+ public int GetAsWStringWithSize(int[] size, long /*int*/[] str) {

27965

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), size, str);

27966

}

27967

}

27968

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWeakReference.java x86_64/org/eclipse/swt/internal/mozilla/nsIWeakReference.java

27969

--- x86/org/eclipse/swt/internal/mozilla/nsIWeakReference.java 2006-05-09 14:54:24.000000000 -0400

27970

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWeakReference.java 2009-09-17 08:48:22.000000000 -0400

27971

@@ -37,11 +37,11 @@

27972

public static final nsID NS_IWEAKREFERENCE_IID =

27973

new nsID(NS_IWEAKREFERENCE_IID_STR);

27974

27975

- public nsIWeakReference(int /*long*/ address) {

27976

+ public nsIWeakReference(long /*int*/ address) {

27977

super(address);

27978

}

27979

27980

- public int QueryReferent(nsID uuid, int /*long*/[] result) {

27981

+ public int QueryReferent(nsID uuid, long /*int*/[] result) {

27982

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);

27983

}

27984

}

27985

\ No newline at end of file

27986

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java

27987

--- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java 2006-05-09 14:54:24.000000000 -0400

27988

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java 2009-09-17 08:48:22.000000000 -0400

27989

@@ -37,7 +37,7 @@

27990

public static final nsID NS_IWEBBROWSERCHROMEFOCUS_IID =

27991

new nsID(NS_IWEBBROWSERCHROMEFOCUS_IID_STR);

27992

27993

- public nsIWebBrowserChromeFocus(int /*long*/ address) {

27994

+ public nsIWebBrowserChromeFocus(long /*int*/ address) {

27995

super(address);

27996

}

27997

27998

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java

27999

--- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java 2008-10-22 16:17:00.000000000 -0400

28000

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java 2009-09-17 08:48:22.000000000 -0400

28001

@@ -37,7 +37,7 @@

28002

public static final nsID NS_IWEBBROWSERCHROME_IID =

28003

new nsID(NS_IWEBBROWSERCHROME_IID_STR);

28004

28005

- public nsIWebBrowserChrome(int /*long*/ address) {

28006

+ public nsIWebBrowserChrome(long /*int*/ address) {

28007

super(address);

28008

}

28009

28010

@@ -51,11 +51,11 @@

28011

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), statusType, status);

28012

}

28013

28014

- public int GetWebBrowser(int /*long*/[] aWebBrowser) {

28015

+ public int GetWebBrowser(long /*int*/[] aWebBrowser) {

28016

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebBrowser);

28017

}

28018

28019

- public int SetWebBrowser(int /*long*/ aWebBrowser) {

28020

+ public int SetWebBrowser(long /*int*/ aWebBrowser) {

28021

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebBrowser);

28022

}

28023

28024

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java

28025

--- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java 2006-05-09 14:54:24.000000000 -0400

28026

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java 2009-09-17 08:48:22.000000000 -0400

28027

@@ -37,7 +37,7 @@

28028

public static final nsID NS_IWEBBROWSERFOCUS_IID =

28029

new nsID(NS_IWEBBROWSERFOCUS_IID_STR);

28030

28031

- public nsIWebBrowserFocus(int /*long*/ address) {

28032

+ public nsIWebBrowserFocus(long /*int*/ address) {

28033

super(address);

28034

}

28035

28036

@@ -57,19 +57,19 @@

28037

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());

28038

}

28039

28040

- public int GetFocusedWindow(int /*long*/[] aFocusedWindow) {

28041

+ public int GetFocusedWindow(long /*int*/[] aFocusedWindow) {

28042

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedWindow);

28043

}

28044

28045

- public int SetFocusedWindow(int /*long*/ aFocusedWindow) {

28046

+ public int SetFocusedWindow(long /*int*/ aFocusedWindow) {

28047

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aFocusedWindow);

28048

}

28049

28050

- public int GetFocusedElement(int /*long*/[] aFocusedElement) {

28051

+ public int GetFocusedElement(long /*int*/[] aFocusedElement) {

28052

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFocusedElement);

28053

}

28054

28055

- public int SetFocusedElement(int /*long*/ aFocusedElement) {

28056

+ public int SetFocusedElement(long /*int*/ aFocusedElement) {

28057

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFocusedElement);

28058

}

28059

}

28060

\ No newline at end of file

28061

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java

28062

--- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java 2006-05-09 14:54:24.000000000 -0400

28063

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java 2009-09-17 08:48:22.000000000 -0400

28064

@@ -37,35 +37,35 @@

28065

public static final nsID NS_IWEBBROWSER_IID =

28066

new nsID(NS_IWEBBROWSER_IID_STR);

28067

28068

- public nsIWebBrowser(int /*long*/ address) {

28069

+ public nsIWebBrowser(long /*int*/ address) {

28070

super(address);

28071

}

28072

28073

- public int AddWebBrowserListener(int /*long*/ aListener, nsID aIID) {

28074

+ public int AddWebBrowserListener(long /*int*/ aListener, nsID aIID) {

28075

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aListener, aIID);

28076

}

28077

28078

- public int RemoveWebBrowserListener(int /*long*/ aListener, nsID aIID) {

28079

+ public int RemoveWebBrowserListener(long /*int*/ aListener, nsID aIID) {

28080

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aListener, aIID);

28081

}

28082

28083

- public int GetContainerWindow(int /*long*/[] aContainerWindow) {

28084

+ public int GetContainerWindow(long /*int*/[] aContainerWindow) {

28085

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContainerWindow);

28086

}

28087

28088

- public int SetContainerWindow(int /*long*/ aContainerWindow) {

28089

+ public int SetContainerWindow(long /*int*/ aContainerWindow) {

28090

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContainerWindow);

28091

}

28092

28093

- public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {

28094

+ public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) {

28095

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentURIContentListener);

28096

}

28097

28098

- public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {

28099

+ public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) {

28100

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentURIContentListener);

28101

}

28102

28103

- public int GetContentDOMWindow(int /*long*/[] aContentDOMWindow) {

28104

+ public int GetContentDOMWindow(long /*int*/[] aContentDOMWindow) {

28105

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aContentDOMWindow);

28106

}

28107

}

28108

\ No newline at end of file

28109

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java

28110

--- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java 2009-02-20 14:12:54.000000000 -0500

28111

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java 2009-09-17 08:48:22.000000000 -0400

28112

@@ -37,7 +37,7 @@

28113

public static final nsID NS_IWEBBROWSERSETUP_IID =

28114

new nsID(NS_IWEBBROWSERSETUP_IID_STR);

28115

28116

- public nsIWebBrowserSetup(int /*long*/ address) {

28117

+ public nsIWebBrowserSetup(long /*int*/ address) {

28118

super(address);

28119

}

28120

28121

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java

28122

--- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java 2009-03-31 13:05:56.000000000 -0400

28123

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java 2009-09-17 08:48:22.000000000 -0400

28124

@@ -37,15 +37,15 @@

28125

public static final nsID NS_IWEBBROWSERSTREAM_IID =

28126

new nsID(NS_IWEBBROWSERSTREAM_IID_STR);

28127

28128

- public nsIWebBrowserStream(int /*long*/ address) {

28129

+ public nsIWebBrowserStream(long /*int*/ address) {

28130

super(address);

28131

}

28132

28133

- public int OpenStream(int /*long*/ aBaseURI, int /*long*/ aContentType) {

28134

+ public int OpenStream(long /*int*/ aBaseURI, long /*int*/ aContentType) {

28135

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);

28136

}

28137

28138

- public int AppendToStream(int /*long*/ aData, int aLen) {

28139

+ public int AppendToStream(long /*int*/ aData, int aLen) {

28140

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);

28141

}

28142

28143

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java

28144

--- x86/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java 2007-04-24 17:35:12.000000000 -0400

28145

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java 2009-09-17 08:48:22.000000000 -0400

28146

@@ -37,7 +37,7 @@

28147

public static final nsID NS_IWEBNAVIGATIONINFO_IID =

28148

new nsID(NS_IWEBNAVIGATIONINFO_IID_STR);

28149

28150

- public nsIWebNavigationInfo(int /*long*/ address) {

28151

+ public nsIWebNavigationInfo(long /*int*/ address) {

28152

super(address);

28153

}

28154

28155

@@ -49,7 +49,7 @@

28156

28157

public static final int OTHER = 32768;

28158

28159

- public int IsTypeSupported(int /*long*/ aType, int /*long*/ aWebNav, int[] _retval) {

28160

+ public int IsTypeSupported(long /*int*/ aType, long /*int*/ aWebNav, int[] _retval) {

28161

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType, aWebNav, _retval);

28162

}

28163

}

28164

\ No newline at end of file

28165

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java

28166

--- x86/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java 2008-10-22 16:17:00.000000000 -0400

28167

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java 2009-09-17 08:48:22.000000000 -0400

28168

@@ -37,7 +37,7 @@

28169

public static final nsID NS_IWEBNAVIGATION_IID =

28170

new nsID(NS_IWEBNAVIGATION_IID_STR);

28171

28172

- public nsIWebNavigation(int /*long*/ address) {

28173

+ public nsIWebNavigation(long /*int*/ address) {

28174

super(address);

28175

}

28176

28177

@@ -79,7 +79,7 @@

28178

28179

public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024;

28180

28181

- public int LoadURI(char[] uri, int loadFlags, int /*long*/ referrer, int /*long*/ postData, int /*long*/ headers) {

28182

+ public int LoadURI(char[] uri, int loadFlags, long /*int*/ referrer, long /*int*/ postData, long /*int*/ headers) {

28183

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers);

28184

}

28185

28186

@@ -97,23 +97,23 @@

28187

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags);

28188

}

28189

28190

- public int GetDocument(int /*long*/[] aDocument) {

28191

+ public int GetDocument(long /*int*/[] aDocument) {

28192

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDocument);

28193

}

28194

28195

- public int GetCurrentURI(int /*long*/[] aCurrentURI) {

28196

+ public int GetCurrentURI(long /*int*/[] aCurrentURI) {

28197

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aCurrentURI);

28198

}

28199

28200

- public int GetReferringURI(int /*long*/[] aReferringURI) {

28201

+ public int GetReferringURI(long /*int*/[] aReferringURI) {

28202

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aReferringURI);

28203

}

28204

28205

- public int GetSessionHistory(int /*long*/[] aSessionHistory) {

28206

+ public int GetSessionHistory(long /*int*/[] aSessionHistory) {

28207

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aSessionHistory);

28208

}

28209

28210

- public int SetSessionHistory(int /*long*/ aSessionHistory) {

28211

+ public int SetSessionHistory(long /*int*/ aSessionHistory) {

28212

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);

28213

}

28214

}

28215

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgress.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgress.java

28216

--- x86/org/eclipse/swt/internal/mozilla/nsIWebProgress.java 2008-10-22 16:02:54.000000000 -0400

28217

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgress.java 2009-09-17 08:48:22.000000000 -0400

28218

@@ -37,7 +37,7 @@

28219

public static final nsID NS_IWEBPROGRESS_IID =

28220

new nsID(NS_IWEBPROGRESS_IID_STR);

28221

28222

- public nsIWebProgress(int /*long*/ address) {

28223

+ public nsIWebProgress(long /*int*/ address) {

28224

super(address);

28225

}

28226

28227

@@ -61,15 +61,15 @@

28228

28229

public static final int NOTIFY_ALL = 255;

28230

28231

- public int AddProgressListener(int /*long*/ listener, int aNotifyMask) {

28232

+ public int AddProgressListener(long /*int*/ listener, int aNotifyMask) {

28233

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask);

28234

}

28235

28236

- public int RemoveProgressListener(int /*long*/ listener) {

28237

+ public int RemoveProgressListener(long /*int*/ listener) {

28238

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener);

28239

}

28240

28241

- public int GetDOMWindow(int /*long*/[] aDOMWindow) {

28242

+ public int GetDOMWindow(long /*int*/[] aDOMWindow) {

28243

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);

28244

}

28245

28246

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java

28247

--- x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java 2006-10-26 11:24:38.000000000 -0400

28248

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java 2009-09-17 08:48:22.000000000 -0400

28249

@@ -37,11 +37,11 @@

28250

public static final nsID NS_IWEBPROGRESSLISTENER2_IID =

28251

new nsID(NS_IWEBPROGRESSLISTENER2_IID_STR);

28252

28253

- public nsIWebProgressListener2(int /*long*/ address) {

28254

+ public nsIWebProgressListener2(long /*int*/ address) {

28255

super(address);

28256

}

28257

28258

- public int OnProgressChange64(int /*long*/ aWebProgress, int /*long*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {

28259

+ public int OnProgressChange64(long /*int*/ aWebProgress, long /*int*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {

28260

return XPCOM.VtblCall(nsIWebProgressListener.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);

28261

}

28262

}

28263

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java

28264

--- x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java 2006-05-09 14:54:24.000000000 -0400

28265

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java 2009-09-17 08:48:22.000000000 -0400

28266

@@ -37,7 +37,7 @@

28267

public static final nsID NS_IWEBPROGRESSLISTENER_IID =

28268

new nsID(NS_IWEBPROGRESSLISTENER_IID_STR);

28269

28270

- public nsIWebProgressListener(int /*long*/ address) {

28271

+ public nsIWebProgressListener(long /*int*/ address) {

28272

super(address);

28273

}

28274

28275

@@ -71,23 +71,23 @@

28276

28277

public static final int STATE_SECURE_LOW = 131072;

28278

28279

- public int OnStateChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {

28280

+ public int OnStateChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {

28281

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aStateFlags, aStatus);

28282

}

28283

28284

- public int OnProgressChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {

28285

+ public int OnProgressChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {

28286

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);

28287

}

28288

28289

- public int OnLocationChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ location) {

28290

+ public int OnLocationChange(long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ location) {

28291

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebProgress, aRequest, location);

28292

}

28293

28294

- public int OnStatusChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, char[] aMessage) {

28295

+ public int OnStatusChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, char[] aMessage) {

28296

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWebProgress, aRequest, aStatus, aMessage);

28297

}

28298

28299

- public int OnSecurityChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {

28300

+ public int OnSecurityChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {

28301

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aWebProgress, aRequest, state);

28302

}

28303

}

28304

\ No newline at end of file

28305

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java

28306

--- x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java 2008-10-22 16:17:00.000000000 -0400

28307

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java 2009-09-17 08:48:22.000000000 -0400

28308

@@ -37,13 +37,13 @@

28309

public static final nsID NS_IWINDOWCREATOR2_IID =

28310

new nsID(NS_IWINDOWCREATOR2_IID_STR);

28311

28312

- public nsIWindowCreator2(int /*long*/ address) {

28313

+ public nsIWindowCreator2(long /*int*/ address) {

28314

super(address);

28315

}

28316

28317

public static final int PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 1;

28318

28319

- public int CreateChromeWindow2(int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int[] cancel, int /*long*/[] _retval) {

28320

+ public int CreateChromeWindow2(long /*int*/ parent, int chromeFlags, int contextFlags, long /*int*/ uri, int[] cancel, long /*int*/[] _retval) {

28321

return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval);

28322

}

28323

}

28324

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java

28325

--- x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java 2007-03-02 11:13:26.000000000 -0500

28326

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java 2009-09-17 08:48:22.000000000 -0400

28327

@@ -37,11 +37,11 @@

28328

public static final nsID NS_IWINDOWCREATOR_IID =

28329

new nsID(NS_IWINDOWCREATOR_IID_STR);

28330

28331

- public nsIWindowCreator(int /*long*/ address) {

28332

+ public nsIWindowCreator(long /*int*/ address) {

28333

super(address);

28334

}

28335

28336

- public int CreateChromeWindow(int /*long*/ parent, int chromeFlags, int /*long*/[] _retval) {

28337

+ public int CreateChromeWindow(long /*int*/ parent, int chromeFlags, long /*int*/[] _retval) {

28338

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, _retval);

28339

}

28340

}

28341

\ No newline at end of file

28342

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java

28343

--- x86/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java 2006-05-09 14:54:24.000000000 -0400

28344

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java 2009-09-17 08:48:22.000000000 -0400

28345

@@ -37,51 +37,51 @@

28346

public static final nsID NS_IWINDOWWATCHER_IID =

28347

new nsID(NS_IWINDOWWATCHER_IID_STR);

28348

28349

- public nsIWindowWatcher(int /*long*/ address) {

28350

+ public nsIWindowWatcher(long /*int*/ address) {

28351

super(address);

28352

}

28353

28354

- public int OpenWindow(int /*long*/ aParent, byte[] aUrl, byte[] aName, byte[] aFeatures, int /*long*/ aArguments, int /*long*/[] _retval) {

28355

+ public int OpenWindow(long /*int*/ aParent, byte[] aUrl, byte[] aName, byte[] aFeatures, long /*int*/ aArguments, long /*int*/[] _retval) {

28356

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aUrl, aName, aFeatures, aArguments, _retval);

28357

}

28358

28359

- public int RegisterNotification(int /*long*/ aObserver) {

28360

+ public int RegisterNotification(long /*int*/ aObserver) {

28361

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aObserver);

28362

}

28363

28364

- public int UnregisterNotification(int /*long*/ aObserver) {

28365

+ public int UnregisterNotification(long /*int*/ aObserver) {

28366

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aObserver);

28367

}

28368

28369

- public int GetWindowEnumerator(int /*long*/[] _retval) {

28370

+ public int GetWindowEnumerator(long /*int*/[] _retval) {

28371

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), _retval);

28372

}

28373

28374

- public int GetNewPrompter(int /*long*/ aParent, int /*long*/[] _retval) {

28375

+ public int GetNewPrompter(long /*int*/ aParent, long /*int*/[] _retval) {

28376

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, _retval);

28377

}

28378

28379

- public int GetNewAuthPrompter(int /*long*/ aParent, int /*long*/[] _retval) {

28380

+ public int GetNewAuthPrompter(long /*int*/ aParent, long /*int*/[] _retval) {

28381

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, _retval);

28382

}

28383

28384

- public int SetWindowCreator(int /*long*/ creator) {

28385

+ public int SetWindowCreator(long /*int*/ creator) {

28386

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), creator);

28387

}

28388

28389

- public int GetChromeForWindow(int /*long*/ aWindow, int /*long*/[] _retval) {

28390

+ public int GetChromeForWindow(long /*int*/ aWindow, long /*int*/[] _retval) {

28391

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, _retval);

28392

}

28393

28394

- public int GetWindowByName(char[] aTargetName, int /*long*/ aCurrentWindow, int /*long*/[] _retval) {

28395

+ public int GetWindowByName(char[] aTargetName, long /*int*/ aCurrentWindow, long /*int*/[] _retval) {

28396

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aTargetName, aCurrentWindow, _retval);

28397

}

28398

28399

- public int GetActiveWindow(int /*long*/[] aActiveWindow) {

28400

+ public int GetActiveWindow(long /*int*/[] aActiveWindow) {

28401

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aActiveWindow);

28402

}

28403

28404

- public int SetActiveWindow(int /*long*/ aActiveWindow) {

28405

+ public int SetActiveWindow(long /*int*/ aActiveWindow) {

28406

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aActiveWindow);

28407

}

28408

}

28409

\ No newline at end of file

28410

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java x86_64/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java

28411

--- x86/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java 2008-12-02 11:18:44.000000000 -0500

28412

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java 2009-09-17 08:48:22.000000000 -0400

28413

@@ -11,7 +11,7 @@

28414

public static final nsID NS_IWRITABLEVARIANT_IID =

28415

new nsID(NS_IWRITABLEVARIANT_IID_STR);

28416

28417

- public nsIWritableVariant(int /*long*/ address) {

28418

+ public nsIWritableVariant(long /*int*/ address) {

28419

super(address);

28420

}

28421

28422

@@ -75,23 +75,23 @@

28423

// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 15, getAddress(), aValue);

28424

// }

28425

28426

- public int SetAsID(int /*long*/ aValue) {

28427

+ public int SetAsID(long /*int*/ aValue) {

28428

return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 16, getAddress(), aValue);

28429

}

28430

28431

- public int SetAsAString(int /*long*/ aValue) {

28432

+ public int SetAsAString(long /*int*/ aValue) {

28433

return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 17, getAddress(), aValue);

28434

}

28435

28436

- public int SetAsDOMString(int /*long*/ aValue) {

28437

+ public int SetAsDOMString(long /*int*/ aValue) {

28438

return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 18, getAddress(), aValue);

28439

}

28440

28441

- public int SetAsACString(int /*long*/ aValue) {

28442

+ public int SetAsACString(long /*int*/ aValue) {

28443

return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 19, getAddress(), aValue);

28444

}

28445

28446

- public int SetAsAUTF8String(int /*long*/ aValue) {

28447

+ public int SetAsAUTF8String(long /*int*/ aValue) {

28448

return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 20, getAddress(), aValue);

28449

}

28450

28451

@@ -103,15 +103,15 @@

28452

return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 22, getAddress(), aValue);

28453

}

28454

28455

- public int SetAsISupports(int /*long*/ aValue) {

28456

+ public int SetAsISupports(long /*int*/ aValue) {

28457

return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 23, getAddress(), aValue);

28458

}

28459

28460

- public int SetAsInterface(nsID iid, int /*long*/ iface) {

28461

+ public int SetAsInterface(nsID iid, long /*int*/ iface) {

28462

return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 24, getAddress(), iid, iface);

28463

}

28464

28465

- public int SetAsArray(short type, int /*long*/ iid, int count, int /*long*/ ptr) {

28466

+ public int SetAsArray(short type, long /*int*/ iid, int count, long /*int*/ ptr) {

28467

return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 25, getAddress(), type, iid, count, ptr);

28468

}

28469

28470

@@ -135,7 +135,7 @@

28471

return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 30, getAddress());

28472

}

28473

28474

- public int SetFromVariant(int /*long*/ aValue) {

28475

+ public int SetFromVariant(long /*int*/ aValue) {

28476

return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 31, getAddress(), aValue);

28477

}

28478

}

28479

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIX509Cert.java x86_64/org/eclipse/swt/internal/mozilla/nsIX509Cert.java

28480

--- x86/org/eclipse/swt/internal/mozilla/nsIX509Cert.java 2009-08-19 16:24:46.000000000 -0400

28481

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIX509Cert.java 2009-09-17 08:48:22.000000000 -0400

28482

@@ -37,87 +37,87 @@

28483

public static final nsID NS_IX509CERT_IID =

28484

new nsID(NS_IX509CERT_IID_STR);

28485

28486

- public nsIX509Cert(int /*long*/ address) {

28487

+ public nsIX509Cert(long /*int*/ address) {

28488

super(address);

28489

}

28490

28491

- public int GetNickname(int /*long*/ aNickname) {

28492

+ public int GetNickname(long /*int*/ aNickname) {

28493

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNickname);

28494

}

28495

28496

- public int GetEmailAddress(int /*long*/ aEmailAddress) {

28497

+ public int GetEmailAddress(long /*int*/ aEmailAddress) {

28498

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEmailAddress);

28499

}

28500

28501

- public int GetEmailAddresses(int[] length, int /*long*/[] addresses) {

28502

+ public int GetEmailAddresses(int[] length, long /*int*/[] addresses) {

28503

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), length, addresses);

28504

}

28505

28506

- public int ContainsEmailAddress(int /*long*/ aEmailAddress, int[] _retval) {

28507

+ public int ContainsEmailAddress(long /*int*/ aEmailAddress, int[] _retval) {

28508

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEmailAddress, _retval);

28509

}

28510

28511

- public int GetSubjectName(int /*long*/ aSubjectName) {

28512

+ public int GetSubjectName(long /*int*/ aSubjectName) {

28513

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aSubjectName);

28514

}

28515

28516

- public int GetCommonName(int /*long*/ aCommonName) {

28517

+ public int GetCommonName(long /*int*/ aCommonName) {

28518

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCommonName);

28519

}

28520

28521

- public int GetOrganization(int /*long*/ aOrganization) {

28522

+ public int GetOrganization(long /*int*/ aOrganization) {

28523

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOrganization);

28524

}

28525

28526

- public int GetOrganizationalUnit(int /*long*/ aOrganizationalUnit) {

28527

+ public int GetOrganizationalUnit(long /*int*/ aOrganizationalUnit) {

28528

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOrganizationalUnit);

28529

}

28530

28531

- public int GetSha1Fingerprint(int /*long*/ aSha1Fingerprint) {

28532

+ public int GetSha1Fingerprint(long /*int*/ aSha1Fingerprint) {

28533

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSha1Fingerprint);

28534

}

28535

28536

- public int GetMd5Fingerprint(int /*long*/ aMd5Fingerprint) {

28537

+ public int GetMd5Fingerprint(long /*int*/ aMd5Fingerprint) {

28538

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aMd5Fingerprint);

28539

}

28540

28541

- public int GetTokenName(int /*long*/ aTokenName) {

28542

+ public int GetTokenName(long /*int*/ aTokenName) {

28543

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aTokenName);

28544

}

28545

28546

- public int GetIssuerName(int /*long*/ aIssuerName) {

28547

+ public int GetIssuerName(long /*int*/ aIssuerName) {

28548

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aIssuerName);

28549

}

28550

28551

- public int GetSerialNumber(int /*long*/ aSerialNumber) {

28552

+ public int GetSerialNumber(long /*int*/ aSerialNumber) {

28553

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSerialNumber);

28554

}

28555

28556

- public int GetIssuerCommonName(int /*long*/ aIssuerCommonName) {

28557

+ public int GetIssuerCommonName(long /*int*/ aIssuerCommonName) {

28558

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aIssuerCommonName);

28559

}

28560

28561

- public int GetIssuerOrganization(int /*long*/ aIssuerOrganization) {

28562

+ public int GetIssuerOrganization(long /*int*/ aIssuerOrganization) {

28563

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aIssuerOrganization);

28564

}

28565

28566

- public int GetIssuerOrganizationUnit(int /*long*/ aIssuerOrganizationUnit) {

28567

+ public int GetIssuerOrganizationUnit(long /*int*/ aIssuerOrganizationUnit) {

28568

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aIssuerOrganizationUnit);

28569

}

28570

28571

- public int GetIssuer(int /*long*/[] aIssuer) {

28572

+ public int GetIssuer(long /*int*/[] aIssuer) {

28573

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aIssuer);

28574

}

28575

28576

- public int GetValidity(int /*long*/[] aValidity) {

28577

+ public int GetValidity(long /*int*/[] aValidity) {

28578

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aValidity);

28579

}

28580

28581

- public int GetDbKey(int /*long*/[] aDbKey) {

28582

+ public int GetDbKey(long /*int*/[] aDbKey) {

28583

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aDbKey);

28584

}

28585

28586

- public int GetWindowTitle(int /*long*/[] aWindowTitle) {

28587

+ public int GetWindowTitle(long /*int*/[] aWindowTitle) {

28588

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aWindowTitle);

28589

}

28590

28591

@@ -173,15 +173,15 @@

28592

28593

public static final int CERT_USAGE_AnyCA = 11;

28594

28595

- public int GetChain(int /*long*/[] _retval) {

28596

+ public int GetChain(long /*int*/[] _retval) {

28597

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);

28598

}

28599

28600

- public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, int /*long*/[] usages) {

28601

+ public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, long /*int*/[] usages) {

28602

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), ignoreOcsp, verified, count, usages);

28603

}

28604

28605

- public int GetUsagesString(int ignoreOcsp, int[] verified, int /*long*/ usages) {

28606

+ public int GetUsagesString(int ignoreOcsp, int[] verified, long /*int*/ usages) {

28607

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), ignoreOcsp, verified, usages);

28608

}

28609

28610

@@ -189,15 +189,15 @@

28611

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), usage, _retval);

28612

}

28613

28614

- public int GetASN1Structure(int /*long*/[] aASN1Structure) {

28615

+ public int GetASN1Structure(long /*int*/[] aASN1Structure) {

28616

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aASN1Structure);

28617

}

28618

28619

- public int GetRawDER(int[] length, int /*long*/[] data) {

28620

+ public int GetRawDER(int[] length, long /*int*/[] data) {

28621

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), length, data);

28622

}

28623

28624

- public int Equals(int /*long*/ other, int[] _retval) {

28625

+ public int Equals(long /*int*/ other, int[] _retval) {

28626

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);

28627

}

28628

}

28629

\ No newline at end of file

28630

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java x86_64/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java

28631

--- x86/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java 2009-08-19 16:24:46.000000000 -0400

28632

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java 2009-09-17 08:48:22.000000000 -0400

28633

@@ -37,39 +37,39 @@

28634

public static final nsID NS_IX509CERTVALIDITY_IID =

28635

new nsID(NS_IX509CERTVALIDITY_IID_STR);

28636

28637

- public nsIX509CertValidity(int /*long*/ address) {

28638

+ public nsIX509CertValidity(long /*int*/ address) {

28639

super(address);

28640

}

28641

28642

- public int GetNotBefore(int /*long*/ aNotBefore) {

28643

+ public int GetNotBefore(long /*int*/ aNotBefore) {

28644

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNotBefore);

28645

}

28646

28647

- public int GetNotBeforeLocalTime(int /*long*/ aNotBeforeLocalTime) {

28648

+ public int GetNotBeforeLocalTime(long /*int*/ aNotBeforeLocalTime) {

28649

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNotBeforeLocalTime);

28650

}

28651

28652

- public int GetNotBeforeLocalDay(int /*long*/ aNotBeforeLocalDay) {

28653

+ public int GetNotBeforeLocalDay(long /*int*/ aNotBeforeLocalDay) {

28654

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNotBeforeLocalDay);

28655

}

28656

28657

- public int GetNotBeforeGMT(int /*long*/ aNotBeforeGMT) {

28658

+ public int GetNotBeforeGMT(long /*int*/ aNotBeforeGMT) {

28659

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNotBeforeGMT);

28660

}

28661

28662

- public int GetNotAfter(int /*long*/ aNotAfter) {

28663

+ public int GetNotAfter(long /*int*/ aNotAfter) {

28664

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aNotAfter);

28665

}

28666

28667

- public int GetNotAfterLocalTime(int /*long*/ aNotAfterLocalTime) {

28668

+ public int GetNotAfterLocalTime(long /*int*/ aNotAfterLocalTime) {

28669

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aNotAfterLocalTime);

28670

}

28671

28672

- public int GetNotAfterLocalDay(int /*long*/ aNotAfterLocalDay) {

28673

+ public int GetNotAfterLocalDay(long /*int*/ aNotAfterLocalDay) {

28674

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNotAfterLocalDay);

28675

}

28676

28677

- public int GetNotAfterGMT(int /*long*/ aNotAfterGMT) {

28678

+ public int GetNotAfterGMT(long /*int*/ aNotAfterGMT) {

28679

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNotAfterGMT);

28680

}

28681

}

28682

\ No newline at end of file

28683

diff -urN x86/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java x86_64/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java

28684

--- x86/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java 2009-04-08 14:54:52.000000000 -0400

28685

+++ x86_64/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java 2009-09-17 08:48:22.000000000 -0400

28686

@@ -37,7 +37,7 @@

28687

public static final nsID NS_IXPCSECURITYMANAGER_IID =

28688

new nsID(NS_IXPCSECURITYMANAGER_IID_STR);

28689

28690

- public nsIXPCSecurityManager(int /*long*/ address) {

28691

+ public nsIXPCSecurityManager(long /*int*/ address) {

28692

super(address);

28693

}

28694

28695

@@ -55,15 +55,15 @@

28696

28697

public static final int HOOK_ALL = 63;

28698

28699

- public int CanCreateWrapper(int /*long*/ aJSContext, nsID aIID, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/[] aPolicy) {

28700

+ public int CanCreateWrapper(long /*int*/ aJSContext, nsID aIID, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/[] aPolicy) {

28701

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aJSContext, aIID, aObj, aClassInfo, aPolicy);

28702

}

28703

28704

- public int CanCreateInstance(int /*long*/ aJSContext, nsID aCID) {

28705

+ public int CanCreateInstance(long /*int*/ aJSContext, nsID aCID) {

28706

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aJSContext, aCID);

28707

}

28708

28709

- public int CanGetService(int /*long*/ aJSContext, nsID aCID) {

28710

+ public int CanGetService(long /*int*/ aJSContext, nsID aCID) {

28711

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aJSContext, aCID);

28712

}

28713

28714

@@ -73,7 +73,7 @@

28715

28716

public static final int ACCESS_SET_PROPERTY = 2;

28717

28718

- 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) {

28719

+ 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) {

28720

return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aAction, aCallContext, aJSContext, aJSObject, aObj, aClassInfo, aName, aPolicy);

28721

}

28722

}

28723

\ No newline at end of file

28724

diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt/internal/mozilla/XPCOM.java

28725

--- x86/org/eclipse/swt/internal/mozilla/XPCOM.java 2009-08-19 16:24:48.000000000 -0400

28726

+++ x86_64/org/eclipse/swt/internal/mozilla/XPCOM.java 2009-09-17 08:48:20.000000000 -0400

28727

@@ -139,25 +139,25 @@

28728

* @param src cast=(const void *),flags=no_out critical

28729

* @param size cast=(size_t)

28730

*/

28731

-public static final native void memmove (int /*long*/ dest, nsDynamicFunctionLoad src, int /*long*/ size);

28732

+public static final native void memmove (long /*int*/ dest, nsDynamicFunctionLoad src, long /*int*/ size);

28733

/**

28734

* @param dest cast=(void *)

28735

* @param src cast=(const void *)

28736

* @param nbytes cast=(size_t)

28737

*/

28738

-public static final native void memmove(nsID dest, int /*long*/ src, int nbytes);

28739

+public static final native void memmove(nsID dest, long /*int*/ src, int nbytes);

28740

/**

28741

* @param dest cast=(void *)

28742

* @param src cast=(const void *)

28743

* @param nbytes cast=(size_t)

28744

*/

28745

-public static final native void memmove(int /*long*/ dest, nsID src, int nbytes);

28746

+public static final native void memmove(long /*int*/ dest, nsID src, int nbytes);

28747

/** @method flags=no_gen */

28748

-public static final native int strlen_PRUnichar(int /*long*/ s);

28749

+public static final native int strlen_PRUnichar(long /*int*/ s);

28750

28751

/** @method flags=no_gen */

28752

-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);

28753

-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) {

28754

+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);

28755

+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) {

28756

lock.lock();

28757

try {

28758

return _JS_EvaluateUCScriptForPrincipals(mozillaPath, cx, obj, principals, chars, length, filename, lineno, retVal);

28759

@@ -167,8 +167,8 @@

28760

}

28761

28762

/** @param result cast=(nsIComponentManager**) */

28763

-public static final native int _NS_GetComponentManager(int /*long*/[] result);

28764

-public static final int NS_GetComponentManager(int /*long*/[] result) {

28765

+public static final native int _NS_GetComponentManager(long /*int*/[] result);

28766

+public static final int NS_GetComponentManager(long /*int*/[] result) {

28767

lock.lock();

28768

try {

28769

return _NS_GetComponentManager(result);

28770

@@ -177,8 +177,8 @@

28771

}

28772

}

28773

/** @param result cast=(nsIServiceManager**) */

28774

-public static final native int _NS_GetServiceManager(int /*long*/[] result);

28775

-public static final int NS_GetServiceManager(int /*long*/[] result) {

28776

+public static final native int _NS_GetServiceManager(long /*int*/[] result);

28777

+public static final int NS_GetServiceManager(long /*int*/[] result) {

28778

lock.lock();

28779

try {

28780

return _NS_GetServiceManager(result);

28781

@@ -191,8 +191,8 @@

28782

* @param binDirectory cast=(nsIFile *)

28783

* @param appFileLocationProvider cast=(nsIDirectoryServiceProvider *)

28784

*/

28785

-public static final native int _NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider);

28786

-public static final int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider) {

28787

+public static final native int _NS_InitXPCOM2(long /*int*/ result, long /*int*/ binDirectory, long /*int*/ appFileLocationProvider);

28788

+public static final int NS_InitXPCOM2(long /*int*/ result, long /*int*/ binDirectory, long /*int*/ appFileLocationProvider) {

28789

lock.lock();

28790

try {

28791

return _NS_InitXPCOM2(result, binDirectory, appFileLocationProvider);

28792

@@ -204,8 +204,8 @@

28793

* @param path cast=(nsAString *),flags=struct

28794

* @param result cast=(nsILocalFile**)

28795

*/

28796

-public static final native int _NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result);

28797

-public static final int NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result) {

28798

+public static final native int _NS_NewLocalFile(long /*int*/ path, int followLinks, long /*int*/[] result);

28799

+public static final int NS_NewLocalFile(long /*int*/ path, int followLinks, long /*int*/[] result) {

28800

lock.lock();

28801

try {

28802

return _NS_NewLocalFile(path, followLinks, result);

28803

@@ -214,8 +214,8 @@

28804

}

28805

}

28806

/** @method flags=new */

28807

-public static final native int /*long*/ _nsEmbedCString_new();

28808

-public static final int /*long*/ nsEmbedCString_new() {

28809

+public static final native long /*int*/ _nsEmbedCString_new();

28810

+public static final long /*int*/ nsEmbedCString_new() {

28811

lock.lock();

28812

try {

28813

return _nsEmbedCString_new();

28814

@@ -227,8 +227,8 @@

28815

* @method flags=new

28816

* @param aString cast=(const char *)

28817

*/

28818

-public static final native int /*long*/ _nsEmbedCString_new(byte[] aString, int length);

28819

-public static final int /*long*/ nsEmbedCString_new(byte[] aString, int length) {

28820

+public static final native long /*int*/ _nsEmbedCString_new(byte[] aString, int length);

28821

+public static final long /*int*/ nsEmbedCString_new(byte[] aString, int length) {

28822

lock.lock();

28823

try {

28824

return _nsEmbedCString_new(aString, length);

28825

@@ -240,8 +240,8 @@

28826

* @method flags=new

28827

* @param aString cast=(const char *)

28828

*/

28829

-public static final native int /*long*/ _nsEmbedCString_new(int /*long*/ aString, int length);

28830

-public static final int /*long*/ nsEmbedCString_new(int /*long*/ aString, int length) {

28831

+public static final native long /*int*/ _nsEmbedCString_new(long /*int*/ aString, int length);

28832

+public static final long /*int*/ nsEmbedCString_new(long /*int*/ aString, int length) {

28833

lock.lock();

28834

try {

28835

return _nsEmbedCString_new(aString, length);

28836

@@ -253,8 +253,8 @@

28837

* @method flags=delete

28838

* @param ptr cast=(nsEmbedCString *)

28839

*/

28840

-public static final native void _nsEmbedCString_delete(int /*long*/ ptr);

28841

-public static final void nsEmbedCString_delete(int /*long*/ ptr) {

28842

+public static final native void _nsEmbedCString_delete(long /*int*/ ptr);

28843

+public static final void nsEmbedCString_delete(long /*int*/ ptr) {

28844

lock.lock();

28845

try {

28846

_nsEmbedCString_delete(ptr);

28847

@@ -266,8 +266,8 @@

28848

* @method flags=cpp

28849

* @param ptr cast=(nsEmbedCString *)

28850

*/

28851

-public static final native int _nsEmbedCString_Length(int /*long*/ ptr);

28852

-public static final int nsEmbedCString_Length(int /*long*/ ptr) {

28853

+public static final native int _nsEmbedCString_Length(long /*int*/ ptr);

28854

+public static final int nsEmbedCString_Length(long /*int*/ ptr) {

28855

lock.lock();

28856

try {

28857

return _nsEmbedCString_Length(ptr);

28858

@@ -279,8 +279,8 @@

28859

* @method flags=cpp

28860

* @param ptr cast=(nsIScriptGlobalObject *)

28861

*/

28862

-public static final native int _nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long*/ ptr, int lang);

28863

-public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long*/ ptr, int lang) {

28864

+public static final native int _nsIScriptGlobalObject_EnsureScriptEnvironment(long /*int*/ ptr, int lang);

28865

+public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(long /*int*/ ptr, int lang) {

28866

lock.lock();

28867

try {

28868

return _nsIScriptGlobalObject_EnsureScriptEnvironment(ptr, lang);

28869

@@ -292,8 +292,8 @@

28870

* @method flags=cpp

28871

* @param ptr cast=(nsIScriptGlobalObject *)

28872

*/

28873

-public static final native int /*long*/ _nsIScriptGlobalObject_GetScriptGlobal(int /*long*/ ptr, int lang);

28874

-public static final int /*long*/ nsIScriptGlobalObject_GetScriptGlobal(int /*long*/ ptr, int lang) {

28875

+public static final native long /*int*/ _nsIScriptGlobalObject_GetScriptGlobal(long /*int*/ ptr, int lang);

28876

+public static final long /*int*/ nsIScriptGlobalObject_GetScriptGlobal(long /*int*/ ptr, int lang) {

28877

lock.lock();

28878

try {

28879

return _nsIScriptGlobalObject_GetScriptGlobal(ptr, lang);

28880

@@ -305,8 +305,8 @@

28881

* @method flags=cpp

28882

* @param ptr cast=(nsIScriptGlobalObject *)

28883

*/

28884

-public static final native int /*long*/ _nsIScriptGlobalObject_GetScriptContext(int /*long*/ ptr, int lang);

28885

-public static final int /*long*/ nsIScriptGlobalObject_GetScriptContext(int /*long*/ ptr, int lang) {

28886

+public static final native long /*int*/ _nsIScriptGlobalObject_GetScriptContext(long /*int*/ ptr, int lang);

28887

+public static final long /*int*/ nsIScriptGlobalObject_GetScriptContext(long /*int*/ ptr, int lang) {

28888

lock.lock();

28889

try {

28890

return _nsIScriptGlobalObject_GetScriptContext(ptr, lang);

28891

@@ -318,8 +318,8 @@

28892

* @method flags=cpp

28893

* @param ptr cast=(nsIScriptContext *)

28894

*/

28895

-public static final native int /*long*/ _nsIScriptContext_GetNativeContext(int /*long*/ ptr);

28896

-public static final int /*long*/ nsIScriptContext_GetNativeContext(int /*long*/ ptr) {

28897

+public static final native long /*int*/ _nsIScriptContext_GetNativeContext(long /*int*/ ptr);

28898

+public static final long /*int*/ nsIScriptContext_GetNativeContext(long /*int*/ ptr) {

28899

lock.lock();

28900

try {

28901

return _nsIScriptContext_GetNativeContext(ptr);

28902

@@ -332,8 +332,8 @@

28903

* @method flags=cpp

28904

* @param ptr cast=(nsEmbedCString *)

28905

*/

28906

-public static final native int /*long*/ _nsEmbedCString_get(int /*long*/ ptr);

28907

-public static final int /*long*/ nsEmbedCString_get(int /*long*/ ptr) {

28908

+public static final native long /*int*/ _nsEmbedCString_get(long /*int*/ ptr);

28909

+public static final long /*int*/ nsEmbedCString_get(long /*int*/ ptr) {

28910

lock.lock();

28911

try {

28912

return _nsEmbedCString_get(ptr);

28913

@@ -345,8 +345,8 @@

28914

* @method flags=delete

28915

* @param ptr cast=(nsID *)

28916

*/

28917

-public static final native void _nsID_delete(int /*long*/ ptr);

28918

-public static final void nsID_delete(int /*long*/ ptr) {

28919

+public static final native void _nsID_delete(long /*int*/ ptr);

28920

+public static final void nsID_delete(long /*int*/ ptr) {

28921

lock.lock();

28922

try {

28923

_nsID_delete(ptr);

28924

@@ -355,8 +355,8 @@

28925

}

28926

}

28927

/** @method flags=new */

28928

-public static final native int /*long*/ _nsID_new();

28929

-public static final int /*long*/ nsID_new() {

28930

+public static final native long /*int*/ _nsID_new();

28931

+public static final long /*int*/ nsID_new() {

28932

lock.lock();

28933

try {

28934

return _nsID_new();

28935

@@ -369,8 +369,8 @@

28936

* @param ptr cast=(nsID *)

28937

* @param other cast=(nsID *),flags=struct

28938

*/

28939

-public static final native int _nsID_Equals(int /*long*/ ptr, int /*long*/ other);

28940

-public static final int nsID_Equals(int /*long*/ ptr, int /*long*/ other) {

28941

+public static final native int _nsID_Equals(long /*int*/ ptr, long /*int*/ other);

28942

+public static final int nsID_Equals(long /*int*/ ptr, long /*int*/ other) {

28943

lock.lock();

28944

try {

28945

return _nsID_Equals(ptr, other);

28946

@@ -379,8 +379,8 @@

28947

}

28948

}

28949

/** @method flags=new */

28950

-public static final native int /*long*/ _nsEmbedString_new();

28951

-public static final int /*long*/ nsEmbedString_new() {

28952

+public static final native long /*int*/ _nsEmbedString_new();

28953

+public static final long /*int*/ nsEmbedString_new() {

28954

lock.lock();

28955

try {

28956

return _nsEmbedString_new();

28957

@@ -392,8 +392,8 @@

28958

* @method flags=new

28959

* @param aString cast=(PRUnichar *)

28960

*/

28961

-public static final native int /*long*/ _nsEmbedString_new(char[] aString);

28962

-public static final int /*long*/ nsEmbedString_new(char[] aString) {

28963

+public static final native long /*int*/ _nsEmbedString_new(char[] aString);

28964

+public static final long /*int*/ nsEmbedString_new(char[] aString) {

28965

lock.lock();

28966

try {

28967

return _nsEmbedString_new(aString);

28968

@@ -405,8 +405,8 @@

28969

* @method flags=delete

28970

* @param ptr cast=(nsEmbedString *)

28971

*/

28972

-public static final native void _nsEmbedString_delete(int /*long*/ ptr);

28973

-public static final void nsEmbedString_delete(int /*long*/ ptr) {

28974

+public static final native void _nsEmbedString_delete(long /*int*/ ptr);

28975

+public static final void nsEmbedString_delete(long /*int*/ ptr) {

28976

lock.lock();

28977

try {

28978

_nsEmbedString_delete(ptr);

28979

@@ -418,8 +418,8 @@

28980

* @method flags=cpp

28981

* @param ptr cast=(nsEmbedString *)

28982

*/

28983

-public static final native int _nsEmbedString_Length(int /*long*/ ptr);

28984

-public static final int nsEmbedString_Length(int /*long*/ ptr) {

28985

+public static final native int _nsEmbedString_Length(long /*int*/ ptr);

28986

+public static final int nsEmbedString_Length(long /*int*/ ptr) {

28987

lock.lock();

28988

try {

28989

return _nsEmbedString_Length(ptr);

28990

@@ -431,8 +431,8 @@

28991

* @method flags=cpp

28992

* @param ptr cast=(nsEmbedString *)

28993

*/

28994

-public static final native int /*long*/ _nsEmbedString_get(int /*long*/ ptr);

28995

-public static final int /*long*/ nsEmbedString_get(int /*long*/ ptr) {

28996

+public static final native long /*int*/ _nsEmbedString_get(long /*int*/ ptr);

28997

+public static final long /*int*/ nsEmbedString_get(long /*int*/ ptr) {

28998

lock.lock();

28999

try {

29000

return _nsEmbedString_get(ptr);

29001

@@ -445,8 +445,8 @@

29002

* @param ptr cast=(nsIMemory *)

29003

* @param size cast=(size_t)

29004

*/

29005

-public static final native int /*long*/ _nsIMemory_Alloc(int /*long*/ ptr, int size);

29006

-public static final int /*long*/ nsIMemory_Alloc(int /*long*/ ptr, int size) {

29007

+public static final native long /*int*/ _nsIMemory_Alloc(long /*int*/ ptr, int size);

29008

+public static final long /*int*/ nsIMemory_Alloc(long /*int*/ ptr, int size) {

29009

lock.lock();

29010

try {

29011

return _nsIMemory_Alloc(ptr, size);

29012

@@ -460,8 +460,8 @@

29013

* @param ptr2 cast=(void *)

29014

* @param size cast=(size_t)

29015

*/

29016

-public static final native int /*long*/ _nsIMemory_Realloc(int /*long*/ ptr1, int /*long*/ ptr2, int size);

29017

-public static final int /*long*/ nsIMemory_Realloc(int /*long*/ ptr1, int /*long*/ ptr2, int size) {

29018

+public static final native long /*int*/ _nsIMemory_Realloc(long /*int*/ ptr1, long /*int*/ ptr2, int size);

29019

+public static final long /*int*/ nsIMemory_Realloc(long /*int*/ ptr1, long /*int*/ ptr2, int size) {

29020

lock.lock();

29021

try {

29022

return _nsIMemory_Realloc(ptr1, ptr2, size);

29023

@@ -470,8 +470,8 @@

29024

}

29025

}

29026

/** @param functionLoad cast=(const nsDynamicFunctionLoad *) */

29027

-public static final native int _XPCOMGlueLoadXULFunctions (int /*long*/ functionLoad);

29028

-public static final int XPCOMGlueLoadXULFunctions (int /*long*/ functionLoad) {

29029

+public static final native int _XPCOMGlueLoadXULFunctions (long /*int*/ functionLoad);

29030

+public static final int XPCOMGlueLoadXULFunctions (long /*int*/ functionLoad) {

29031

lock.lock();

29032

try {

29033

return _XPCOMGlueLoadXULFunctions(functionLoad);

29034

@@ -499,8 +499,8 @@

29035

}

29036

}

29037

29038

-public static final native int _Call(int /*long*/ ptr);

29039

-public static final int Call(int /*long*/ ptr) {

29040

+public static final native int _Call(long /*int*/ ptr);

29041

+public static final int Call(long /*int*/ ptr) {

29042

lock.lock();

29043

try {

29044

return _Call(ptr);

29045

@@ -516,8 +516,8 @@

29046

* @param aFromSegment cast=(const char *)

29047

* @param aWriteCount cast=(PRUint32 *)

29048

*/

29049

-public static final native int /*long*/ _Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);

29050

-public static final int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount) {

29051

+public static final native long /*int*/ _Call(long /*int*/ ptr, long /*int*/ aInStream, long /*int*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);

29052

+public static final long /*int*/ Call(long /*int*/ ptr, long /*int*/ aInStream, long /*int*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount) {

29053

lock.lock();

29054

try {

29055

return _Call(ptr, aInStream, aClosure, aFromSegment, aToOffset, aCount, aWriteCount);

29056

@@ -533,8 +533,8 @@

29057

* @param aAppDirProvider cast=(nsIDirectoryServiceProvider *)

29058

* @param aStaticComponents cast=(nsStaticModuleInfo const *)

29059

*/

29060

-public static final native int _Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider, int /*long*/ aStaticComponents, int aStaticComponentsCount);

29061

-public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider, int /*long*/ aStaticComponents, int aStaticComponentsCount) {

29062

+public static final native int _Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider, long /*int*/ aStaticComponents, int aStaticComponentsCount);

29063

+public static final int Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider, long /*int*/ aStaticComponents, int aStaticComponentsCount) {

29064

lock.lock();

29065

try {

29066

return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider, aStaticComponents, aStaticComponentsCount);

29067

@@ -543,8 +543,8 @@

29068

}

29069

}

29070

29071

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl);

29072

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl) {

29073

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl);

29074

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl) {

29075

lock.lock();

29076

try {

29077

return _VtblCall(fnNumber, ppVtbl);

29078

@@ -553,8 +553,8 @@

29079

}

29080

}

29081

29082

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0);

29083

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0) {

29084

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0);

29085

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0) {

29086

lock.lock();

29087

try {

29088

return _VtblCall(fnNumber, ppVtbl, arg0);

29089

@@ -562,8 +562,8 @@

29090

lock.unlock();

29091

}

29092

}

29093

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0);

29094

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0) {

29095

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0);

29096

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0) {

29097

lock.lock();

29098

try {

29099

return _VtblCall(fnNumber, ppVtbl, arg0);

29100

@@ -571,8 +571,8 @@

29101

lock.unlock();

29102

}

29103

}

29104

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0);

29105

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0) {

29106

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, double arg0);

29107

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, double arg0) {

29108

lock.lock();

29109

try {

29110

return _VtblCall(fnNumber, ppVtbl, arg0);

29111

@@ -580,8 +580,8 @@

29112

lock.unlock();

29113

}

29114

}

29115

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0);

29116

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0) {

29117

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0);

29118

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0) {

29119

lock.lock();

29120

try {

29121

return _VtblCall(fnNumber, ppVtbl, arg0);

29122

@@ -589,8 +589,8 @@

29123

lock.unlock();

29124

}

29125

}

29126

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0);

29127

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0) {

29128

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, float[] arg0);

29129

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, float[] arg0) {

29130

lock.lock();

29131

try {

29132

return _VtblCall(fnNumber, ppVtbl, arg0);

29133

@@ -598,8 +598,8 @@

29134

lock.unlock();

29135

}

29136

}

29137

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0);

29138

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0) {

29139

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0);

29140

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0) {

29141

lock.lock();

29142

try {

29143

return _VtblCall(fnNumber, ppVtbl, arg0);

29144

@@ -607,8 +607,8 @@

29145

lock.unlock();

29146

}

29147

}

29148

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0);

29149

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0) {

29150

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0);

29151

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0) {

29152

lock.lock();

29153

try {

29154

return _VtblCall(fnNumber, ppVtbl, arg0);

29155

@@ -616,8 +616,8 @@

29156

lock.unlock();

29157

}

29158

}

29159

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0);

29160

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0) {

29161

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0);

29162

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0) {

29163

lock.lock();

29164

try {

29165

return _VtblCall(fnNumber, ppVtbl, arg0);

29166

@@ -625,8 +625,8 @@

29167

lock.unlock();

29168

}

29169

}

29170

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0);

29171

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0) {

29172

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0);

29173

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0) {

29174

lock.lock();

29175

try {

29176

return _VtblCall(fnNumber, ppVtbl, arg0);

29177

@@ -634,8 +634,8 @@

29178

lock.unlock();

29179

}

29180

}

29181

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0);

29182

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0) {

29183

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0);

29184

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0) {

29185

lock.lock();

29186

try {

29187

return _VtblCall(fnNumber, ppVtbl, arg0);

29188

@@ -644,8 +644,8 @@

29189

}

29190

}

29191

29192

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1);

29193

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1) {

29194

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1);

29195

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1) {

29196

lock.lock();

29197

try {

29198

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29199

@@ -653,8 +653,8 @@

29200

lock.unlock();

29201

}

29202

}

29203

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1);

29204

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1) {

29205

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1);

29206

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1) {

29207

lock.lock();

29208

try {

29209

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29210

@@ -662,8 +662,8 @@

29211

lock.unlock();

29212

}

29213

}

29214

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1);

29215

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1) {

29216

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1);

29217

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1) {

29218

lock.lock();

29219

try {

29220

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29221

@@ -671,8 +671,8 @@

29222

lock.unlock();

29223

}

29224

}

29225

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1);

29226

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1) {

29227

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1);

29228

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1) {

29229

lock.lock();

29230

try {

29231

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29232

@@ -680,8 +680,8 @@

29233

lock.unlock();

29234

}

29235

}

29236

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long [] arg1);

29237

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long [] arg1) {

29238

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long [] arg1);

29239

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long [] arg1) {

29240

lock.lock();

29241

try {

29242

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29243

@@ -689,8 +689,8 @@

29244

lock.unlock();

29245

}

29246

}

29247

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1);

29248

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1) {

29249

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int[] arg1);

29250

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int[] arg1) {

29251

lock.lock();

29252

try {

29253

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29254

@@ -698,8 +698,8 @@

29255

lock.unlock();

29256

}

29257

}

29258

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1);

29259

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1) {

29260

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1);

29261

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1) {

29262

lock.lock();

29263

try {

29264

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29265

@@ -707,8 +707,8 @@

29266

lock.unlock();

29267

}

29268

}

29269

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1);

29270

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1) {

29271

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1);

29272

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1) {

29273

lock.lock();

29274

try {

29275

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29276

@@ -716,8 +716,8 @@

29277

lock.unlock();

29278

}

29279

}

29280

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1);

29281

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1) {

29282

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1);

29283

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1) {

29284

lock.lock();

29285

try {

29286

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29287

@@ -725,8 +725,8 @@

29288

lock.unlock();

29289

}

29290

}

29291

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1);

29292

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1) {

29293

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1);

29294

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1) {

29295

lock.lock();

29296

try {

29297

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29298

@@ -734,8 +734,8 @@

29299

lock.unlock();

29300

}

29301

}

29302

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1);

29303

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1) {

29304

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1);

29305

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1) {

29306

lock.lock();

29307

try {

29308

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29309

@@ -743,8 +743,8 @@

29310

lock.unlock();

29311

}

29312

}

29313

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1);

29314

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1) {

29315

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1);

29316

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1) {

29317

lock.lock();

29318

try {

29319

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29320

@@ -752,8 +752,8 @@

29321

lock.unlock();

29322

}

29323

}

29324

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1);

29325

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1) {

29326

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1);

29327

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1) {

29328

lock.lock();

29329

try {

29330

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29331

@@ -761,8 +761,8 @@

29332

lock.unlock();

29333

}

29334

}

29335

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1);

29336

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1) {

29337

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1);

29338

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1) {

29339

lock.lock();

29340

try {

29341

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29342

@@ -770,8 +770,8 @@

29343

lock.unlock();

29344

}

29345

}

29346

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1);

29347

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1) {

29348

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1);

29349

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1) {

29350

lock.lock();

29351

try {

29352

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29353

@@ -779,8 +779,8 @@

29354

lock.unlock();

29355

}

29356

}

29357

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1);

29358

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1) {

29359

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1);

29360

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1) {

29361

lock.lock();

29362

try {

29363

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29364

@@ -788,8 +788,8 @@

29365

lock.unlock();

29366

}

29367

}

29368

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1);

29369

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1) {

29370

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1);

29371

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1) {

29372

lock.lock();

29373

try {

29374

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29375

@@ -797,8 +797,8 @@

29376

lock.unlock();

29377

}

29378

}

29379

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1);

29380

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1) {

29381

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int[] arg1);

29382

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int[] arg1) {

29383

lock.lock();

29384

try {

29385

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29386

@@ -806,8 +806,8 @@

29387

lock.unlock();

29388

}

29389

}

29390

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1);

29391

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1) {

29392

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long[] arg1);

29393

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long[] arg1) {

29394

lock.lock();

29395

try {

29396

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29397

@@ -815,8 +815,8 @@

29398

lock.unlock();

29399

}

29400

}

29401

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1);

29402

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1) {

29403

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, char[] arg1);

29404

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, char[] arg1) {

29405

lock.lock();

29406

try {

29407

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29408

@@ -824,8 +824,8 @@

29409

lock.unlock();

29410

}

29411

}

29412

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1);

29413

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1) {

29414

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1);

29415

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1) {

29416

lock.lock();

29417

try {

29418

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29419

@@ -833,8 +833,8 @@

29420

lock.unlock();

29421

}

29422

}

29423

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1);

29424

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1) {

29425

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1);

29426

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1) {

29427

lock.lock();

29428

try {

29429

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29430

@@ -842,8 +842,8 @@

29431

lock.unlock();

29432

}

29433

}

29434

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1);

29435

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1) {

29436

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1);

29437

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1) {

29438

lock.lock();

29439

try {

29440

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29441

@@ -852,8 +852,8 @@

29442

}

29443

}

29444

29445

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2);

29446

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2) {

29447

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int arg2);

29448

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int arg2) {

29449

lock.lock();

29450

try {

29451

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29452

@@ -861,8 +861,8 @@

29453

lock.unlock();

29454

}

29455

}

29456

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int[] arg2);

29457

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int[] arg2) {

29458

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int[] arg2);

29459

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int[] arg2) {

29460

lock.lock();

29461

try {

29462

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29463

@@ -870,8 +870,8 @@

29464

lock.unlock();

29465

}

29466

}

29467

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, long[] arg2);

29468

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, long[] arg2) {

29469

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, long[] arg2);

29470

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, long[] arg2) {

29471

lock.lock();

29472

try {

29473

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29474

@@ -879,8 +879,8 @@

29475

lock.unlock();

29476

}

29477

}

29478

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2);

29479

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2) {

29480

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, int arg2);

29481

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, int arg2) {

29482

lock.lock();

29483

try {

29484

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29485

@@ -888,8 +888,8 @@

29486

lock.unlock();

29487

}

29488

}

29489

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2);

29490

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2) {

29491

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2);

29492

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2) {

29493

lock.lock();

29494

try {

29495

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29496

@@ -897,8 +897,8 @@

29497

lock.unlock();

29498

}

29499

}

29500

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1);

29501

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1) {

29502

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1);

29503

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1) {

29504

lock.lock();

29505

try {

29506

return _VtblCall(fnNumber, ppVtbl, arg0, arg1);

29507

@@ -906,8 +906,8 @@

29508

lock.unlock();

29509

}

29510

}

29511

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int arg2);

29512

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int arg2) {

29513

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int arg2);

29514

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int arg2) {

29515

lock.lock();

29516

try {

29517

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29518

@@ -915,8 +915,8 @@

29519

lock.unlock();

29520

}

29521

}

29522

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, long arg2);

29523

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, long arg2) {

29524

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, long arg2);

29525

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, long arg2) {

29526

lock.lock();

29527

try {

29528

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29529

@@ -924,8 +924,8 @@

29530

lock.unlock();

29531

}

29532

}

29533

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2);

29534

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2) {

29535

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2);

29536

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2) {

29537

lock.lock();

29538

try {

29539

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29540

@@ -934,8 +934,8 @@

29541

}

29542

}

29543

29544

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg1, int arg2, int arg3);

29545

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg1, int arg2, int arg3) {

29546

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, int arg1, int arg2, int arg3);

29547

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, int arg1, int arg2, int arg3) {

29548

lock.lock();

29549

try {

29550

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

29551

@@ -943,8 +943,8 @@

29552

lock.unlock();

29553

}

29554

}

29555

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long arg1, int arg2, long arg3);

29556

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long arg1, int arg2, long arg3) {

29557

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, long arg1, int arg2, long arg3);

29558

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, long arg1, int arg2, long arg3) {

29559

lock.lock();

29560

try {

29561

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

29562

@@ -953,8 +953,8 @@

29563

}

29564

}

29565

29566

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2);

29567

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2) {

29568

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2);

29569

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2) {

29570

lock.lock();

29571

try {

29572

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29573

@@ -962,8 +962,8 @@

29574

lock.unlock();

29575

}

29576

}

29577

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2);

29578

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2) {

29579

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2);

29580

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2) {

29581

lock.lock();

29582

try {

29583

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29584

@@ -971,8 +971,8 @@

29585

lock.unlock();

29586

}

29587

}

29588

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2);

29589

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2) {

29590

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2);

29591

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2) {

29592

lock.lock();

29593

try {

29594

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29595

@@ -980,8 +980,8 @@

29596

lock.unlock();

29597

}

29598

}

29599

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, int[] arg2);

29600

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, int[] arg2) {

29601

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, int[] arg2);

29602

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, int[] arg2) {

29603

lock.lock();

29604

try {

29605

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29606

@@ -989,8 +989,8 @@

29607

lock.unlock();

29608

}

29609

}

29610

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2);

29611

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2) {

29612

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2);

29613

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2) {

29614

lock.lock();

29615

try {

29616

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29617

@@ -998,8 +998,8 @@

29618

lock.unlock();

29619

}

29620

}

29621

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2);

29622

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2) {

29623

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2);

29624

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2) {

29625

lock.lock();

29626

try {

29627

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29628

@@ -1007,8 +1007,8 @@

29629

lock.unlock();

29630

}

29631

}

29632

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2);

29633

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2) {

29634

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int[] arg2);

29635

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int[] arg2) {

29636

lock.lock();

29637

try {

29638

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29639

@@ -1016,8 +1016,8 @@

29640

lock.unlock();

29641

}

29642

}

29643

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2);

29644

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2) {

29645

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, long [] arg2);

29646

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, long [] arg2) {

29647

lock.lock();

29648

try {

29649

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29650

@@ -1025,8 +1025,8 @@

29651

lock.unlock();

29652

}

29653

}

29654

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2);

29655

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2) {

29656

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2);

29657

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2) {

29658

lock.lock();

29659

try {

29660

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29661

@@ -1034,8 +1034,8 @@

29662

lock.unlock();

29663

}

29664

}

29665

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2);

29666

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2) {

29667

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2);

29668

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2) {

29669

lock.lock();

29670

try {

29671

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29672

@@ -1043,8 +1043,8 @@

29673

lock.unlock();

29674

}

29675

}

29676

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2);

29677

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2) {

29678

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2);

29679

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2) {

29680

lock.lock();

29681

try {

29682

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29683

@@ -1052,8 +1052,8 @@

29684

lock.unlock();

29685

}

29686

}

29687

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2);

29688

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2) {

29689

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2);

29690

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2) {

29691

lock.lock();

29692

try {

29693

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29694

@@ -1061,8 +1061,8 @@

29695

lock.unlock();

29696

}

29697

}

29698

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2);

29699

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2) {

29700

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2);

29701

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2) {

29702

lock.lock();

29703

try {

29704

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29705

@@ -1070,8 +1070,8 @@

29706

lock.unlock();

29707

}

29708

}

29709

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2);

29710

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2) {

29711

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2);

29712

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2) {

29713

lock.lock();

29714

try {

29715

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29716

@@ -1079,8 +1079,8 @@

29717

lock.unlock();

29718

}

29719

}

29720

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2);

29721

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2) {

29722

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long[] arg2);

29723

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long[] arg2) {

29724

lock.lock();

29725

try {

29726

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29727

@@ -1088,8 +1088,8 @@

29728

lock.unlock();

29729

}

29730

}

29731

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2);

29732

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2) {

29733

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2);

29734

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2) {

29735

lock.lock();

29736

try {

29737

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29738

@@ -1097,8 +1097,8 @@

29739

lock.unlock();

29740

}

29741

}

29742

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2);

29743

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2) {

29744

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long[] arg2);

29745

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long[] arg2) {

29746

lock.lock();

29747

try {

29748

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29749

@@ -1106,8 +1106,8 @@

29750

lock.unlock();

29751

}

29752

}

29753

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long [] arg2);

29754

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long [] arg2) {

29755

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long [] arg2);

29756

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long [] arg2) {

29757

lock.lock();

29758

try {

29759

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29760

@@ -1115,8 +1115,8 @@

29761

lock.unlock();

29762

}

29763

}

29764

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2);

29765

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2) {

29766

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2);

29767

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2) {

29768

lock.lock();

29769

try {

29770

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29771

@@ -1124,8 +1124,8 @@

29772

lock.unlock();

29773

}

29774

}

29775

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2);

29776

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2) {

29777

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int[] arg2);

29778

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int[] arg2) {

29779

lock.lock();

29780

try {

29781

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29782

@@ -1133,8 +1133,8 @@

29783

lock.unlock();

29784

}

29785

}

29786

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2);

29787

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2) {

29788

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long [] arg2);

29789

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long [] arg2) {

29790

lock.lock();

29791

try {

29792

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29793

@@ -1142,8 +1142,8 @@

29794

lock.unlock();

29795

}

29796

}

29797

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2);

29798

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2) {

29799

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2);

29800

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2) {

29801

lock.lock();

29802

try {

29803

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29804

@@ -1151,8 +1151,8 @@

29805

lock.unlock();

29806

}

29807

}

29808

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2);

29809

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2) {

29810

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2);

29811

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2) {

29812

lock.lock();

29813

try {

29814

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29815

@@ -1160,8 +1160,8 @@

29816

lock.unlock();

29817

}

29818

}

29819

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2);

29820

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2) {

29821

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2);

29822

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2) {

29823

lock.lock();

29824

try {

29825

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29826

@@ -1169,8 +1169,8 @@

29827

lock.unlock();

29828

}

29829

}

29830

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2);

29831

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2) {

29832

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2);

29833

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2) {

29834

lock.lock();

29835

try {

29836

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29837

@@ -1178,8 +1178,8 @@

29838

lock.unlock();

29839

}

29840

}

29841

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2);

29842

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2) {

29843

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2);

29844

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2) {

29845

lock.lock();

29846

try {

29847

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29848

@@ -1187,8 +1187,8 @@

29849

lock.unlock();

29850

}

29851

}

29852

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2);

29853

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2) {

29854

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2);

29855

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2) {

29856

lock.lock();

29857

try {

29858

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29859

@@ -1196,8 +1196,8 @@

29860

lock.unlock();

29861

}

29862

}

29863

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2);

29864

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2) {

29865

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2);

29866

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2) {

29867

lock.lock();

29868

try {

29869

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29870

@@ -1205,8 +1205,8 @@

29871

lock.unlock();

29872

}

29873

}

29874

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2);

29875

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2) {

29876

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2);

29877

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2) {

29878

lock.lock();

29879

try {

29880

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29881

@@ -1214,8 +1214,8 @@

29882

lock.unlock();

29883

}

29884

}

29885

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2);

29886

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2) {

29887

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int arg2);

29888

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int arg2) {

29889

lock.lock();

29890

try {

29891

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29892

@@ -1223,8 +1223,8 @@

29893

lock.unlock();

29894

}

29895

}

29896

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2);

29897

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2) {

29898

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long arg2);

29899

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long arg2) {

29900

lock.lock();

29901

try {

29902

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29903

@@ -1232,8 +1232,8 @@

29904

lock.unlock();

29905

}

29906

}

29907

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2);

29908

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2) {

29909

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, char[] arg2);

29910

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, char[] arg2) {

29911

lock.lock();

29912

try {

29913

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29914

@@ -1241,8 +1241,8 @@

29915

lock.unlock();

29916

}

29917

}

29918

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2);

29919

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2) {

29920

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, char[] arg2);

29921

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, char[] arg2) {

29922

lock.lock();

29923

try {

29924

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29925

@@ -1250,8 +1250,8 @@

29926

lock.unlock();

29927

}

29928

}

29929

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2);

29930

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2) {

29931

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2);

29932

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2) {

29933

lock.lock();

29934

try {

29935

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29936

@@ -1259,8 +1259,8 @@

29937

lock.unlock();

29938

}

29939

}

29940

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2);

29941

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2) {

29942

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2);

29943

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2) {

29944

lock.lock();

29945

try {

29946

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29947

@@ -1268,8 +1268,8 @@

29948

lock.unlock();

29949

}

29950

}

29951

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2);

29952

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2) {

29953

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2);

29954

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2) {

29955

lock.lock();

29956

try {

29957

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29958

@@ -1277,8 +1277,8 @@

29959

lock.unlock();

29960

}

29961

}

29962

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2);

29963

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2) {

29964

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int[] arg2);

29965

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int[] arg2) {

29966

lock.lock();

29967

try {

29968

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29969

@@ -1286,8 +1286,8 @@

29970

lock.unlock();

29971

}

29972

}

29973

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2);

29974

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2) {

29975

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2);

29976

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2) {

29977

lock.lock();

29978

try {

29979

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29980

@@ -1295,8 +1295,8 @@

29981

lock.unlock();

29982

}

29983

}

29984

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2);

29985

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2) {

29986

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2);

29987

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2) {

29988

lock.lock();

29989

try {

29990

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

29991

@@ -1304,8 +1304,8 @@

29992

lock.unlock();

29993

}

29994

}

29995

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2);

29996

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2) {

29997

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, int arg2);

29998

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, int arg2) {

29999

lock.lock();

30000

try {

30001

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

30002

@@ -1313,8 +1313,8 @@

30003

lock.unlock();

30004

}

30005

}

30006

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, short arg2);

30007

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, short arg2) {

30008

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, short arg2);

30009

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, short arg2) {

30010

lock.lock();

30011

try {

30012

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

30013

@@ -1322,8 +1322,8 @@

30014

lock.unlock();

30015

}

30016

}

30017

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, short arg2);

30018

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, short arg2) {

30019

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, short arg2);

30020

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, short arg2) {

30021

lock.lock();

30022

try {

30023

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);

30024

@@ -1332,8 +1332,8 @@

30025

}

30026

}

30027

30028

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3);

30029

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3) {

30030

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3);

30031

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3) {

30032

lock.lock();

30033

try {

30034

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30035

@@ -1341,8 +1341,8 @@

30036

lock.unlock();

30037

}

30038

}

30039

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3);

30040

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3) {

30041

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3);

30042

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3) {

30043

lock.lock();

30044

try {

30045

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30046

@@ -1350,8 +1350,8 @@

30047

lock.unlock();

30048

}

30049

}

30050

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3);

30051

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3) {

30052

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3);

30053

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3) {

30054

lock.lock();

30055

try {

30056

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30057

@@ -1359,8 +1359,8 @@

30058

lock.unlock();

30059

}

30060

}

30061

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3);

30062

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3) {

30063

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3);

30064

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3) {

30065

lock.lock();

30066

try {

30067

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30068

@@ -1368,8 +1368,8 @@

30069

lock.unlock();

30070

}

30071

}

30072

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3);

30073

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3) {

30074

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3);

30075

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3) {

30076

lock.lock();

30077

try {

30078

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30079

@@ -1377,8 +1377,8 @@

30080

lock.unlock();

30081

}

30082

}

30083

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3);

30084

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3) {

30085

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3);

30086

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3) {

30087

lock.lock();

30088

try {

30089

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30090

@@ -1386,8 +1386,8 @@

30091

lock.unlock();

30092

}

30093

}

30094

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3);

30095

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3) {

30096

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3);

30097

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3) {

30098

lock.lock();

30099

try {

30100

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30101

@@ -1395,8 +1395,8 @@

30102

lock.unlock();

30103

}

30104

}

30105

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3);

30106

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3) {

30107

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3);

30108

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3) {

30109

lock.lock();

30110

try {

30111

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30112

@@ -1404,8 +1404,8 @@

30113

lock.unlock();

30114

}

30115

}

30116

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3);

30117

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3) {

30118

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3);

30119

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3) {

30120

lock.lock();

30121

try {

30122

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30123

@@ -1413,8 +1413,8 @@

30124

lock.unlock();

30125

}

30126

}

30127

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);

30128

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3) {

30129

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);

30130

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3) {

30131

lock.lock();

30132

try {

30133

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30134

@@ -1422,8 +1422,8 @@

30135

lock.unlock();

30136

}

30137

}

30138

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3);

30139

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3) {

30140

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3);

30141

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3) {

30142

lock.lock();

30143

try {

30144

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30145

@@ -1431,8 +1431,8 @@

30146

lock.unlock();

30147

}

30148

}

30149

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3);

30150

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3) {

30151

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3);

30152

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3) {

30153

lock.lock();

30154

try {

30155

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30156

@@ -1440,8 +1440,8 @@

30157

lock.unlock();

30158

}

30159

}

30160

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);

30161

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3) {

30162

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);

30163

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3) {

30164

lock.lock();

30165

try {

30166

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30167

@@ -1449,8 +1449,8 @@

30168

lock.unlock();

30169

}

30170

}

30171

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3);

30172

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3) {

30173

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3);

30174

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3) {

30175

lock.lock();

30176

try {

30177

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30178

@@ -1458,8 +1458,8 @@

30179

lock.unlock();

30180

}

30181

}

30182

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3);

30183

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3) {

30184

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3);

30185

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3) {

30186

lock.lock();

30187

try {

30188

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30189

@@ -1467,8 +1467,8 @@

30190

lock.unlock();

30191

}

30192

}

30193

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3);

30194

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3) {

30195

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3);

30196

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3) {

30197

lock.lock();

30198

try {

30199

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30200

@@ -1476,8 +1476,8 @@

30201

lock.unlock();

30202

}

30203

}

30204

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3);

30205

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3) {

30206

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3);

30207

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3) {

30208

lock.lock();

30209

try {

30210

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30211

@@ -1485,8 +1485,8 @@

30212

lock.unlock();

30213

}

30214

}

30215

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3);

30216

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3) {

30217

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3);

30218

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3) {

30219

lock.lock();

30220

try {

30221

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30222

@@ -1494,8 +1494,8 @@

30223

lock.unlock();

30224

}

30225

}

30226

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3);

30227

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3) {

30228

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3);

30229

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3) {

30230

lock.lock();

30231

try {

30232

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30233

@@ -1503,8 +1503,8 @@

30234

lock.unlock();

30235

}

30236

}

30237

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3);

30238

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3) {

30239

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3);

30240

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3) {

30241

lock.lock();

30242

try {

30243

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30244

@@ -1512,8 +1512,8 @@

30245

lock.unlock();

30246

}

30247

}

30248

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3);

30249

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3) {

30250

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3);

30251

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3) {

30252

lock.lock();

30253

try {

30254

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30255

@@ -1521,8 +1521,8 @@

30256

lock.unlock();

30257

}

30258

}

30259

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3);

30260

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3) {

30261

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3);

30262

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3) {

30263

lock.lock();

30264

try {

30265

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30266

@@ -1530,8 +1530,8 @@

30267

lock.unlock();

30268

}

30269

}

30270

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3);

30271

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3) {

30272

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3);

30273

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3) {

30274

lock.lock();

30275

try {

30276

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30277

@@ -1539,8 +1539,8 @@

30278

lock.unlock();

30279

}

30280

}

30281

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3);

30282

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3) {

30283

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3);

30284

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3) {

30285

lock.lock();

30286

try {

30287

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30288

@@ -1548,8 +1548,8 @@

30289

lock.unlock();

30290

}

30291

}

30292

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3);

30293

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3) {

30294

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3);

30295

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3) {

30296

lock.lock();

30297

try {

30298

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30299

@@ -1557,8 +1557,8 @@

30300

lock.unlock();

30301

}

30302

}

30303

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3);

30304

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3) {

30305

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3);

30306

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3) {

30307

lock.lock();

30308

try {

30309

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30310

@@ -1566,8 +1566,8 @@

30311

lock.unlock();

30312

}

30313

}

30314

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3);

30315

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3) {

30316

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3);

30317

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3) {

30318

lock.lock();

30319

try {

30320

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30321

@@ -1575,8 +1575,8 @@

30322

lock.unlock();

30323

}

30324

}

30325

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3);

30326

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3) {

30327

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3);

30328

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3) {

30329

lock.lock();

30330

try {

30331

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30332

@@ -1584,8 +1584,8 @@

30333

lock.unlock();

30334

}

30335

}

30336

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3);

30337

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3) {

30338

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3);

30339

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3) {

30340

lock.lock();

30341

try {

30342

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30343

@@ -1593,8 +1593,8 @@

30344

lock.unlock();

30345

}

30346

}

30347

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3);

30348

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3) {

30349

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3);

30350

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3) {

30351

lock.lock();

30352

try {

30353

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30354

@@ -1602,8 +1602,8 @@

30355

lock.unlock();

30356

}

30357

}

30358

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3);

30359

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3) {

30360

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3);

30361

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3) {

30362

lock.lock();

30363

try {

30364

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30365

@@ -1611,8 +1611,8 @@

30366

lock.unlock();

30367

}

30368

}

30369

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3);

30370

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3) {

30371

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3);

30372

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3) {

30373

lock.lock();

30374

try {

30375

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30376

@@ -1620,8 +1620,8 @@

30377

lock.unlock();

30378

}

30379

}

30380

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3);

30381

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3) {

30382

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3);

30383

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3) {

30384

lock.lock();

30385

try {

30386

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30387

@@ -1629,8 +1629,8 @@

30388

lock.unlock();

30389

}

30390

}

30391

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3);

30392

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3) {

30393

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3);

30394

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3) {

30395

lock.lock();

30396

try {

30397

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);

30398

@@ -1639,8 +1639,8 @@

30399

}

30400

}

30401

30402

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4);

30403

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4) {

30404

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4);

30405

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4) {

30406

lock.lock();

30407

try {

30408

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);

30409

@@ -1648,8 +1648,8 @@

30410

lock.unlock();

30411

}

30412

}

30413

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4);

30414

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4) {

30415

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4);

30416

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4) {

30417

lock.lock();

30418

try {

30419

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);

30420

@@ -1657,8 +1657,8 @@

30421

lock.unlock();

30422

}

30423

}

30424

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);

30425

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4) {

30426

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);

30427

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4) {

30428

lock.lock();

30429

try {

30430

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);

30431

@@ -1666,8 +1666,8 @@

30432

lock.unlock();

30433

}

30434

}

30435

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);

30436

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4) {

30437

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);

30438

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4) {

30439

lock.lock();

30440

try {

30441

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);

30442

@@ -1675,8 +1675,8 @@

30443

lock.unlock();

30444

}

30445

}

30446

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);

30447

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4) {

30448

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);

30449

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4) {

30450

lock.lock();

30451

try {

30452

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);

30453

@@ -1684,8 +1684,8 @@

30454

lock.unlock();

30455

}

30456

}

30457

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);

30458

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {

30459

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);

30460

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {

30461

lock.lock();

30462

try {

30463

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);

30464

@@ -1693,8 +1693,8 @@

30465

lock.unlock();

30466

}

30467

}

30468

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);

30469

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {

30470

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);

30471

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {

30472

lock.lock();

30473

try {

30474

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);

30475

@@ -1702,8 +1702,8 @@

30476

lock.unlock();

30477

}

30478

}

30479

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);

30480

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4) {

30481

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);

30482

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4) {

30483

lock.lock();

30484

try {

30485

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);

30486

@@ -1711,8 +1711,8 @@

30487

lock.unlock();

30488

}

30489

}

30490

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4);

30491

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4) {

30492

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4);

30493

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4) {

30494

lock.lock();

30495

try {

30496

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);

30497

@@ -1720,8 +1720,8 @@

30498

lock.unlock();

30499

}

30500

}

30501

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4);

30502

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4) {

30503

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4);

30504

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4) {

30505

lock.lock();

30506

try {

30507

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);

30508

@@ -1730,8 +1730,8 @@

30509

}

30510

}

30511

30512

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4);

30513

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4) {

30514

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4);

30515

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4) {

30516

lock.lock();

30517

try {

30518

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);

30519

@@ -1739,8 +1739,8 @@

30520

lock.unlock();

30521

}

30522

}

30523

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4);

30524

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4) {

30525

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4);

30526

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4) {

30527

lock.lock();

30528

try {

30529

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);

30530

@@ -1748,8 +1748,8 @@

30531

lock.unlock();

30532

}

30533

}

30534

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4);

30535

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4) {

30536

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4);

30537

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4) {

30538

lock.lock();

30539

try {

30540

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);

30541

@@ -1757,8 +1757,8 @@

30542

lock.unlock();

30543

}

30544

}

30545

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4);

30546

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4) {

30547

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4);

30548

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4) {

30549

lock.lock();

30550

try {

30551

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);

30552

@@ -1767,8 +1767,8 @@

30553

}

30554

}

30555

30556

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5);

30557

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5) {

30558

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5);

30559

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5) {

30560

lock.lock();

30561

try {

30562

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30563

@@ -1776,8 +1776,8 @@

30564

lock.unlock();

30565

}

30566

}

30567

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5);

30568

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5) {

30569

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5);

30570

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5) {

30571

lock.lock();

30572

try {

30573

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30574

@@ -1785,8 +1785,8 @@

30575

lock.unlock();

30576

}

30577

}

30578

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5);

30579

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5) {

30580

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5);

30581

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5) {

30582

lock.lock();

30583

try {

30584

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30585

@@ -1794,8 +1794,8 @@

30586

lock.unlock();

30587

}

30588

}

30589

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5);

30590

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5) {

30591

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5);

30592

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5) {

30593

lock.lock();

30594

try {

30595

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30596

@@ -1803,8 +1803,8 @@

30597

lock.unlock();

30598

}

30599

}

30600

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5);

30601

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5) {

30602

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5);

30603

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5) {

30604

lock.lock();

30605

try {

30606

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30607

@@ -1812,8 +1812,8 @@

30608

lock.unlock();

30609

}

30610

}

30611

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5);

30612

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5) {

30613

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5);

30614

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5) {

30615

lock.lock();

30616

try {

30617

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30618

@@ -1821,8 +1821,8 @@

30619

lock.unlock();

30620

}

30621

}

30622

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5);

30623

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5) {

30624

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5);

30625

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5) {

30626

lock.lock();

30627

try {

30628

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30629

@@ -1831,8 +1831,8 @@

30630

}

30631

}

30632

30633

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5);

30634

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5) {

30635

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5);

30636

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5) {

30637

lock.lock();

30638

try {

30639

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30640

@@ -1840,8 +1840,8 @@

30641

lock.unlock();

30642

}

30643

}

30644

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);

30645

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5) {

30646

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);

30647

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5) {

30648

lock.lock();

30649

try {

30650

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30651

@@ -1849,8 +1849,8 @@

30652

lock.unlock();

30653

}

30654

}

30655

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5);

30656

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5) {

30657

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5);

30658

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5) {

30659

lock.lock();

30660

try {

30661

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30662

@@ -1858,8 +1858,8 @@

30663

lock.unlock();

30664

}

30665

}

30666

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int[] arg5);

30667

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5) {

30668

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int[] arg5);

30669

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5) {

30670

lock.lock();

30671

try {

30672

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30673

@@ -1868,8 +1868,8 @@

30674

}

30675

}

30676

30677

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5);

30678

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5) {

30679

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5);

30680

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5) {

30681

lock.lock();

30682

try {

30683

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30684

@@ -1877,8 +1877,8 @@

30685

lock.unlock();

30686

}

30687

}

30688

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5);

30689

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5) {

30690

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5);

30691

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5) {

30692

lock.lock();

30693

try {

30694

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30695

@@ -1886,8 +1886,8 @@

30696

lock.unlock();

30697

}

30698

}

30699

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5);

30700

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5) {

30701

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5);

30702

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5) {

30703

lock.lock();

30704

try {

30705

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30706

@@ -1895,8 +1895,8 @@

30707

lock.unlock();

30708

}

30709

}

30710

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5);

30711

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5) {

30712

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5);

30713

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5) {

30714

lock.lock();

30715

try {

30716

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30717

@@ -1904,8 +1904,8 @@

30718

lock.unlock();

30719

}

30720

}

30721

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);

30722

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5) {

30723

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);

30724

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5) {

30725

lock.lock();

30726

try {

30727

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30728

@@ -1913,8 +1913,8 @@

30729

lock.unlock();

30730

}

30731

}

30732

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);

30733

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {

30734

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);

30735

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {

30736

lock.lock();

30737

try {

30738

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30739

@@ -1922,8 +1922,8 @@

30740

lock.unlock();

30741

}

30742

}

30743

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);

30744

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {

30745

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);

30746

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {

30747

lock.lock();

30748

try {

30749

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30750

@@ -1931,8 +1931,8 @@

30751

lock.unlock();

30752

}

30753

}

30754

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5);

30755

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5) {

30756

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5);

30757

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5) {

30758

lock.lock();

30759

try {

30760

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30761

@@ -1940,8 +1940,8 @@

30762

lock.unlock();

30763

}

30764

}

30765

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5);

30766

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5) {

30767

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5);

30768

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5) {

30769

lock.lock();

30770

try {

30771

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30772

@@ -1949,8 +1949,8 @@

30773

lock.unlock();

30774

}

30775

}

30776

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5);

30777

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5) {

30778

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5);

30779

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5) {

30780

lock.lock();

30781

try {

30782

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30783

@@ -1958,8 +1958,8 @@

30784

lock.unlock();

30785

}

30786

}

30787

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5);

30788

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5) {

30789

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5);

30790

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5) {

30791

lock.lock();

30792

try {

30793

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30794

@@ -1967,8 +1967,8 @@

30795

lock.unlock();

30796

}

30797

}

30798

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5);

30799

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5) {

30800

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5);

30801

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5) {

30802

lock.lock();

30803

try {

30804

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30805

@@ -1976,8 +1976,8 @@

30806

lock.unlock();

30807

}

30808

}

30809

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5);

30810

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5) {

30811

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5);

30812

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5) {

30813

lock.lock();

30814

try {

30815

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30816

@@ -1985,8 +1985,8 @@

30817

lock.unlock();

30818

}

30819

}

30820

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5);

30821

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5) {

30822

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5);

30823

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5) {

30824

lock.lock();

30825

try {

30826

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30827

@@ -1994,8 +1994,8 @@

30828

lock.unlock();

30829

}

30830

}

30831

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5);

30832

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5) {

30833

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5);

30834

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5) {

30835

lock.lock();

30836

try {

30837

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30838

@@ -2003,8 +2003,8 @@

30839

lock.unlock();

30840

}

30841

}

30842

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5);

30843

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5) {

30844

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5);

30845

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5) {

30846

lock.lock();

30847

try {

30848

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30849

@@ -2012,8 +2012,8 @@

30850

lock.unlock();

30851

}

30852

}

30853

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5);

30854

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5) {

30855

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5);

30856

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5) {

30857

lock.lock();

30858

try {

30859

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);

30860

@@ -2022,8 +2022,8 @@

30861

}

30862

}

30863

30864

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);

30865

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {

30866

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);

30867

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {

30868

lock.lock();

30869

try {

30870

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);

30871

@@ -2031,8 +2031,8 @@

30872

lock.unlock();

30873

}

30874

}

30875

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6);

30876

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6) {

30877

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6);

30878

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6) {

30879

lock.lock();

30880

try {

30881

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);

30882

@@ -2040,8 +2040,8 @@

30883

lock.unlock();

30884

}

30885

}

30886

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6);

30887

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6) {

30888

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6);

30889

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6) {

30890

lock.lock();

30891

try {

30892

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);

30893

@@ -2049,8 +2049,8 @@

30894

lock.unlock();

30895

}

30896

}

30897

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6);

30898

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6) {

30899

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6);

30900

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6) {

30901

lock.lock();

30902

try {

30903

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);

30904

@@ -2058,8 +2058,8 @@

30905

lock.unlock();

30906

}

30907

}

30908

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6);

30909

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6) {

30910

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6);

30911

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6) {

30912

lock.lock();

30913

try {

30914

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);

30915

@@ -2067,8 +2067,8 @@

30916

lock.unlock();

30917

}

30918

}

30919

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6);

30920

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6) {

30921

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6);

30922

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6) {

30923

lock.lock();

30924

try {

30925

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);

30926

@@ -2076,8 +2076,8 @@

30927

lock.unlock();

30928

}

30929

}

30930

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6);

30931

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6) {

30932

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6);

30933

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6) {

30934

lock.lock();

30935

try {

30936

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);

30937

@@ -2085,8 +2085,8 @@

30938

lock.unlock();

30939

}

30940

}

30941

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);

30942

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6) {

30943

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);

30944

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6) {

30945

lock.lock();

30946

try {

30947

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);

30948

@@ -2094,8 +2094,8 @@

30949

lock.unlock();

30950

}

30951

}

30952

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);

30953

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {

30954

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);

30955

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {

30956

lock.lock();

30957

try {

30958

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);

30959

@@ -2103,8 +2103,8 @@

30960

lock.unlock();

30961

}

30962

}

30963

-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6);

30964

-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6) {

30965

+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6);

30966

+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6) {

30967

lock.lock();

30968

try {

30969

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);

30970

@@ -2113,8 +2113,8 @@

30971

}

30972

}

30973

30974

-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);

30975

-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) {

30976

+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);

30977

+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) {

30978

lock.lock();

30979

try {

30980

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);

30981

@@ -2122,8 +2122,8 @@

30982

lock.unlock();

30983

}

30984

}

30985

-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);

30986

-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) {

30987

+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);

30988

+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) {

30989

lock.lock();

30990

try {

30991

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);

30992

@@ -2131,8 +2131,8 @@

30993

lock.unlock();

30994

}

30995

}

30996

-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);

30997

-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) {

30998

+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);

30999

+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) {

31000

lock.lock();

31001

try {

31002

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);

31003

@@ -2140,8 +2140,8 @@

31004

lock.unlock();

31005

}

31006

}

31007

-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);

31008

-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) {

31009

+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);

31010

+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) {

31011

lock.lock();

31012

try {

31013

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);

31014

@@ -2150,8 +2150,8 @@

31015

}

31016

}

31017

31018

-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);

31019

-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) {

31020

+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);

31021

+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) {

31022

lock.lock();

31023

try {

31024

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);

31025

@@ -2159,8 +2159,8 @@

31026

lock.unlock();

31027

}

31028

}

31029

-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);

31030

-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) {

31031

+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);

31032

+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) {

31033

lock.lock();

31034

try {

31035

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);

31036

@@ -2168,8 +2168,8 @@

31037

lock.unlock();

31038

}

31039

}

31040

-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);

31041

-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) {

31042

+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);

31043

+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) {

31044

lock.lock();

31045

try {

31046

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);

31047

@@ -2177,8 +2177,8 @@

31048

lock.unlock();

31049

}

31050

}

31051

-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);

31052

-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) {

31053

+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);

31054

+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) {

31055

lock.lock();

31056

try {

31057

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);

31058

@@ -2186,8 +2186,8 @@

31059

lock.unlock();

31060

}

31061

}

31062

-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);

31063

-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) {

31064

+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);

31065

+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) {

31066

lock.lock();

31067

try {

31068

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);

31069

@@ -2195,8 +2195,8 @@

31070

lock.unlock();

31071

}

31072

}

31073

-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);

31074

-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) {

31075

+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);

31076

+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) {

31077

lock.lock();

31078

try {

31079

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);

31080

@@ -2204,8 +2204,8 @@

31081

lock.unlock();

31082

}

31083

}

31084

-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);

31085

-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) {

31086

+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);

31087

+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) {

31088

lock.lock();

31089

try {

31090

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);

31091

@@ -2213,8 +2213,8 @@

31092

lock.unlock();

31093

}

31094

}

31095

-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);

31096

-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) {

31097

+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);

31098

+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) {

31099

lock.lock();

31100

try {

31101

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);

31102

@@ -2222,8 +2222,8 @@

31103

lock.unlock();

31104

}

31105

}

31106

-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);

31107

-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) {

31108

+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);

31109

+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) {

31110

lock.lock();

31111

try {

31112

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);

31113

@@ -2231,8 +2231,8 @@

31114

lock.unlock();

31115

}

31116

}

31117

-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);

31118

-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) {

31119

+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);

31120

+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) {

31121

lock.lock();

31122

try {

31123

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);

31124

@@ -2240,8 +2240,8 @@

31125

lock.unlock();

31126

}

31127

}

31128

-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);

31129

-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) {

31130

+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);

31131

+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) {

31132

lock.lock();

31133

try {

31134

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);

31135

@@ -2249,8 +2249,8 @@

31136

lock.unlock();

31137

}

31138

}

31139

-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);

31140

-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) {

31141

+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);

31142

+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) {

31143

lock.lock();

31144

try {

31145

return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);

31146

diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclipse/swt/internal/mozilla/XPCOMObject.java

31147

--- x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java 2009-05-29 17:30:26.000000000 -0400

31148

+++ x86_64/org/eclipse/swt/internal/mozilla/XPCOMObject.java 2009-09-17 08:48:20.000000000 -0400

31149

@@ -21,7 +21,7 @@

31150

IsSolaris = osName.startsWith ("sunos") || osName.startsWith("solaris"); //$NON-NLS-1$

31151

}

31152

31153

- private int /*long*/ ppVtable;

31154

+ private long /*int*/ ppVtable;

31155

31156

static private final int MAX_ARG_COUNT = 12;

31157

static private final int MAX_VTABLE_LENGTH = 80;

31158

@@ -31,7 +31,7 @@

31159

31160

31161

public XPCOMObject (int[] argCounts) {

31162

- int /*long*/[] callbackAddresses = new int /*long*/[argCounts.length + OS_OFFSET];

31163

+ long /*int*/[] callbackAddresses = new long /*int*/[argCounts.length + OS_OFFSET];

31164

synchronized (Callbacks) {

31165

for (int i = 0, length = argCounts.length; i < length; i++) {

31166

if ((Callbacks[i + OS_OFFSET][argCounts[i]]) == null) {

31167

@@ -42,737 +42,737 @@

31168

}

31169

}

31170

31171

- int /*long*/ pVtable = C.malloc (C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));

31172

+ long /*int*/ pVtable = C.malloc (C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));

31173

XPCOM.memmove (pVtable, callbackAddresses, C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));

31174

ppVtable = C.malloc (C.PTR_SIZEOF);

31175

- XPCOM.memmove (ppVtable, new int /*long*/[] {pVtable}, C.PTR_SIZEOF);

31176

+ XPCOM.memmove (ppVtable, new long /*int*/[] {pVtable}, C.PTR_SIZEOF);

31177

ObjectMap.put (new LONG (ppVtable), this);

31178

}

31179

31180

-static int /*long*/ callback0 (int /*long*/[] callbackArgs) {

31181

+static long /*int*/ callback0 (long /*int*/[] callbackArgs) {

31182

// find the object on which this call was invoked

31183

- int /*long*/ address = callbackArgs[0];

31184

+ long /*int*/ address = callbackArgs[0];

31185

Object object = ObjectMap.get (new LONG (address));

31186

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31187

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31188

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31189

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31190

return ((XPCOMObject) object).method0 (args);

31191

}

31192

-static int /*long*/ callback1 (int /*long*/[] callbackArgs) {

31193

+static long /*int*/ callback1 (long /*int*/[] callbackArgs) {

31194

// find the object on which this call was invoked

31195

- int /*long*/ address = callbackArgs[0];

31196

+ long /*int*/ address = callbackArgs[0];

31197

Object object = ObjectMap.get (new LONG (address));

31198

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31199

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31200

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31201

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31202

return ((XPCOMObject) object).method1 (args);

31203

}

31204

-static int /*long*/ callback10 (int /*long*/[] callbackArgs) {

31205

+static long /*int*/ callback10 (long /*int*/[] callbackArgs) {

31206

// find the object on which this call was invoked

31207

- int /*long*/ address = callbackArgs[0];

31208

+ long /*int*/ address = callbackArgs[0];

31209

Object object = ObjectMap.get (new LONG (address));

31210

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31211

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31212

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31213

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31214

return ((XPCOMObject) object).method10 (args);

31215

}

31216

-static int /*long*/ callback11 (int /*long*/[] callbackArgs) {

31217

+static long /*int*/ callback11 (long /*int*/[] callbackArgs) {

31218

// find the object on which this call was invoked

31219

- int /*long*/ address = callbackArgs[0];

31220

+ long /*int*/ address = callbackArgs[0];

31221

Object object = ObjectMap.get (new LONG (address));

31222

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31223

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31224

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31225

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31226

return ((XPCOMObject) object).method11 (args);

31227

}

31228

-static int /*long*/ callback12 (int /*long*/[] callbackArgs) {

31229

+static long /*int*/ callback12 (long /*int*/[] callbackArgs) {

31230

// find the object on which this call was invoked

31231

- int /*long*/ address = callbackArgs[0];

31232

+ long /*int*/ address = callbackArgs[0];

31233

Object object = ObjectMap.get (new LONG (address));

31234

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31235

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31236

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31237

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31238

return ((XPCOMObject) object).method12 (args);

31239

}

31240

-static int /*long*/ callback13 (int /*long*/[] callbackArgs) {

31241

+static long /*int*/ callback13 (long /*int*/[] callbackArgs) {

31242

// find the object on which this call was invoked

31243

- int /*long*/ address = callbackArgs[0];

31244

+ long /*int*/ address = callbackArgs[0];

31245

Object object = ObjectMap.get (new LONG (address));

31246

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31247

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31248

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31249

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31250

return ((XPCOMObject) object).method13 (args);

31251

}

31252

-static int /*long*/ callback14 (int /*long*/[] callbackArgs) {

31253

+static long /*int*/ callback14 (long /*int*/[] callbackArgs) {

31254

// find the object on which this call was invoked

31255

- int /*long*/ address = callbackArgs[0];

31256

+ long /*int*/ address = callbackArgs[0];

31257

Object object = ObjectMap.get (new LONG (address));

31258

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31259

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31260

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31261

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31262

return ((XPCOMObject) object).method14 (args);

31263

}

31264

-static int /*long*/ callback15 (int /*long*/[] callbackArgs) {

31265

+static long /*int*/ callback15 (long /*int*/[] callbackArgs) {

31266

// find the object on which this call was invoked

31267

- int /*long*/ address = callbackArgs[0];

31268

+ long /*int*/ address = callbackArgs[0];

31269

Object object = ObjectMap.get (new LONG (address));

31270

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31271

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31272

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31273

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31274

return ((XPCOMObject) object).method15 (args);

31275

}

31276

-static int /*long*/ callback16 (int /*long*/[] callbackArgs) {

31277

+static long /*int*/ callback16 (long /*int*/[] callbackArgs) {

31278

// find the object on which this call was invoked

31279

- int /*long*/ address = callbackArgs[0];

31280

+ long /*int*/ address = callbackArgs[0];

31281

Object object = ObjectMap.get (new LONG (address));

31282

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31283

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31284

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31285

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31286

return ((XPCOMObject) object).method16 (args);

31287

}

31288

-static int /*long*/ callback17 (int /*long*/[] callbackArgs) {

31289

+static long /*int*/ callback17 (long /*int*/[] callbackArgs) {

31290

// find the object on which this call was invoked

31291

- int /*long*/ address = callbackArgs[0];

31292

+ long /*int*/ address = callbackArgs[0];

31293

Object object = ObjectMap.get (new LONG (address));

31294

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31295

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31296

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31297

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31298

return ((XPCOMObject) object).method17 (args);

31299

}

31300

-static int /*long*/ callback18 (int /*long*/[] callbackArgs) {

31301

+static long /*int*/ callback18 (long /*int*/[] callbackArgs) {

31302

// find the object on which this call was invoked

31303

- int /*long*/ address = callbackArgs[0];

31304

+ long /*int*/ address = callbackArgs[0];

31305

Object object = ObjectMap.get (new LONG (address));

31306

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31307

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31308

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31309

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31310

return ((XPCOMObject) object).method18 (args);

31311

}

31312

-static int /*long*/ callback19 (int /*long*/[] callbackArgs) {

31313

+static long /*int*/ callback19 (long /*int*/[] callbackArgs) {

31314

// find the object on which this call was invoked

31315

- int /*long*/ address = callbackArgs[0];

31316

+ long /*int*/ address = callbackArgs[0];

31317

Object object = ObjectMap.get (new LONG (address));

31318

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31319

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31320

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31321

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31322

return ((XPCOMObject) object).method19 (args);

31323

}

31324

-static int /*long*/ callback2 (int /*long*/[] callbackArgs) {

31325

+static long /*int*/ callback2 (long /*int*/[] callbackArgs) {

31326

// find the object on which this call was invoked

31327

- int /*long*/ address = callbackArgs[0];

31328

+ long /*int*/ address = callbackArgs[0];

31329

Object object = ObjectMap.get (new LONG (address));

31330

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31331

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31332

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31333

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31334

return ((XPCOMObject) object).method2 (args);

31335

}

31336

-static int /*long*/ callback20 (int /*long*/[] callbackArgs) {

31337

+static long /*int*/ callback20 (long /*int*/[] callbackArgs) {

31338

// find the object on which this call was invoked

31339

- int /*long*/ address = callbackArgs[0];

31340

+ long /*int*/ address = callbackArgs[0];

31341

Object object = ObjectMap.get (new LONG (address));

31342

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31343

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31344

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31345

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31346

return ((XPCOMObject) object).method20 (args);

31347

}

31348

-static int /*long*/ callback21 (int /*long*/[] callbackArgs) {

31349

+static long /*int*/ callback21 (long /*int*/[] callbackArgs) {

31350

// find the object on which this call was invoked

31351

- int /*long*/ address = callbackArgs[0];

31352

+ long /*int*/ address = callbackArgs[0];

31353

Object object = ObjectMap.get (new LONG (address));

31354

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31355

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31356

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31357

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31358

return ((XPCOMObject) object).method21 (args);

31359

}

31360

-static int /*long*/ callback22 (int /*long*/[] callbackArgs) {

31361

+static long /*int*/ callback22 (long /*int*/[] callbackArgs) {

31362

// find the object on which this call was invoked

31363

- int /*long*/ address = callbackArgs[0];

31364

+ long /*int*/ address = callbackArgs[0];

31365

Object object = ObjectMap.get (new LONG (address));

31366

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31367

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31368

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31369

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31370

return ((XPCOMObject) object).method22 (args);

31371

}

31372

-static int /*long*/ callback23 (int /*long*/[] callbackArgs) {

31373

+static long /*int*/ callback23 (long /*int*/[] callbackArgs) {

31374

// find the object on which this call was invoked

31375

- int /*long*/ address = callbackArgs[0];

31376

+ long /*int*/ address = callbackArgs[0];

31377

Object object = ObjectMap.get (new LONG (address));

31378

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31379

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31380

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31381

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31382

return ((XPCOMObject) object).method23 (args);

31383

}

31384

-static int /*long*/ callback24 (int /*long*/[] callbackArgs) {

31385

+static long /*int*/ callback24 (long /*int*/[] callbackArgs) {

31386

// find the object on which this call was invoked

31387

- int /*long*/ address = callbackArgs[0];

31388

+ long /*int*/ address = callbackArgs[0];

31389

Object object = ObjectMap.get (new LONG (address));

31390

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31391

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31392

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31393

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31394

return ((XPCOMObject) object).method24 (args);

31395

}

31396

-static int /*long*/ callback25 (int /*long*/[] callbackArgs) {

31397

+static long /*int*/ callback25 (long /*int*/[] callbackArgs) {

31398

// find the object on which this call was invoked

31399

- int /*long*/ address = callbackArgs[0];

31400

+ long /*int*/ address = callbackArgs[0];

31401

Object object = ObjectMap.get (new LONG (address));

31402

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31403

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31404

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31405

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31406

return ((XPCOMObject) object).method25 (args);

31407

}

31408

-static int /*long*/ callback26 (int /*long*/[] callbackArgs) {

31409

+static long /*int*/ callback26 (long /*int*/[] callbackArgs) {

31410

// find the object on which this call was invoked

31411

- int /*long*/ address = callbackArgs[0];

31412

+ long /*int*/ address = callbackArgs[0];

31413

Object object = ObjectMap.get (new LONG (address));

31414

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31415

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31416

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31417

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31418

return ((XPCOMObject) object).method26 (args);

31419

}

31420

-static int /*long*/ callback27 (int /*long*/[] callbackArgs) {

31421

+static long /*int*/ callback27 (long /*int*/[] callbackArgs) {

31422

// find the object on which this call was invoked

31423

- int /*long*/ address = callbackArgs[0];

31424

+ long /*int*/ address = callbackArgs[0];

31425

Object object = ObjectMap.get (new LONG (address));

31426

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31427

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31428

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31429

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31430

return ((XPCOMObject) object).method27 (args);

31431

}

31432

-static int /*long*/ callback28 (int /*long*/[] callbackArgs) {

31433

+static long /*int*/ callback28 (long /*int*/[] callbackArgs) {

31434

// find the object on which this call was invoked

31435

- int /*long*/ address = callbackArgs[0];

31436

+ long /*int*/ address = callbackArgs[0];

31437

Object object = ObjectMap.get (new LONG (address));

31438

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31439

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31440

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31441

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31442

return ((XPCOMObject) object).method28 (args);

31443

}

31444

-static int /*long*/ callback29 (int /*long*/[] callbackArgs) {

31445

+static long /*int*/ callback29 (long /*int*/[] callbackArgs) {

31446

// find the object on which this call was invoked

31447

- int /*long*/ address = callbackArgs[0];

31448

+ long /*int*/ address = callbackArgs[0];

31449

Object object = ObjectMap.get (new LONG (address));

31450

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31451

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31452

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31453

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31454

return ((XPCOMObject) object).method29 (args);

31455

}

31456

-static int /*long*/ callback3 (int /*long*/[] callbackArgs) {

31457

+static long /*int*/ callback3 (long /*int*/[] callbackArgs) {

31458

// find the object on which this call was invoked

31459

- int /*long*/ address = callbackArgs[0];

31460

+ long /*int*/ address = callbackArgs[0];

31461

Object object = ObjectMap.get (new LONG (address));

31462

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31463

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31464

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31465

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31466

return ((XPCOMObject) object).method3 (args);

31467

}

31468

-static int /*long*/ callback30 (int /*long*/[] callbackArgs) {

31469

+static long /*int*/ callback30 (long /*int*/[] callbackArgs) {

31470

// find the object on which this call was invoked

31471

- int /*long*/ address = callbackArgs[0];

31472

+ long /*int*/ address = callbackArgs[0];

31473

Object object = ObjectMap.get (new LONG (address));

31474

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31475

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31476

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31477

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31478

return ((XPCOMObject) object).method30 (args);

31479

}

31480

-static int /*long*/ callback31 (int /*long*/[] callbackArgs) {

31481

+static long /*int*/ callback31 (long /*int*/[] callbackArgs) {

31482

// find the object on which this call was invoked

31483

- int /*long*/ address = callbackArgs[0];

31484

+ long /*int*/ address = callbackArgs[0];

31485

Object object = ObjectMap.get (new LONG (address));

31486

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31487

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31488

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31489

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31490

return ((XPCOMObject) object).method31 (args);

31491

}

31492

-static int /*long*/ callback32 (int /*long*/[] callbackArgs) {

31493

+static long /*int*/ callback32 (long /*int*/[] callbackArgs) {

31494

// find the object on which this call was invoked

31495

- int /*long*/ address = callbackArgs[0];

31496

+ long /*int*/ address = callbackArgs[0];

31497

Object object = ObjectMap.get (new LONG (address));

31498

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31499

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31500

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31501

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31502

return ((XPCOMObject) object).method32 (args);

31503

}

31504

-static int /*long*/ callback33 (int /*long*/[] callbackArgs) {

31505

+static long /*int*/ callback33 (long /*int*/[] callbackArgs) {

31506

// find the object on which this call was invoked

31507

- int /*long*/ address = callbackArgs[0];

31508

+ long /*int*/ address = callbackArgs[0];

31509

Object object = ObjectMap.get (new LONG (address));

31510

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31511

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31512

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31513

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31514

return ((XPCOMObject) object).method33 (args);

31515

}

31516

-static int /*long*/ callback34 (int /*long*/[] callbackArgs) {

31517

+static long /*int*/ callback34 (long /*int*/[] callbackArgs) {

31518

// find the object on which this call was invoked

31519

- int /*long*/ address = callbackArgs[0];

31520

+ long /*int*/ address = callbackArgs[0];

31521

Object object = ObjectMap.get (new LONG (address));

31522

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31523

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31524

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31525

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31526

return ((XPCOMObject) object).method34 (args);

31527

}

31528

-static int /*long*/ callback35 (int /*long*/[] callbackArgs) {

31529

+static long /*int*/ callback35 (long /*int*/[] callbackArgs) {

31530

// find the object on which this call was invoked

31531

- int /*long*/ address = callbackArgs[0];

31532

+ long /*int*/ address = callbackArgs[0];

31533

Object object = ObjectMap.get (new LONG (address));

31534

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31535

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31536

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31537

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31538

return ((XPCOMObject) object).method35 (args);

31539

}

31540

-static int /*long*/ callback36 (int /*long*/[] callbackArgs) {

31541

+static long /*int*/ callback36 (long /*int*/[] callbackArgs) {

31542

// find the object on which this call was invoked

31543

- int /*long*/ address = callbackArgs[0];

31544

+ long /*int*/ address = callbackArgs[0];

31545

Object object = ObjectMap.get (new LONG (address));

31546

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31547

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31548

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31549

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31550

return ((XPCOMObject) object).method36 (args);

31551

}

31552

-static int /*long*/ callback37 (int /*long*/[] callbackArgs) {

31553

+static long /*int*/ callback37 (long /*int*/[] callbackArgs) {

31554

// find the object on which this call was invoked

31555

- int /*long*/ address = callbackArgs[0];

31556

+ long /*int*/ address = callbackArgs[0];

31557

Object object = ObjectMap.get (new LONG (address));

31558

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31559

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31560

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31561

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31562

return ((XPCOMObject) object).method37 (args);

31563

}

31564

-static int /*long*/ callback38 (int /*long*/[] callbackArgs) {

31565

+static long /*int*/ callback38 (long /*int*/[] callbackArgs) {

31566

// find the object on which this call was invoked

31567

- int /*long*/ address = callbackArgs[0];

31568

+ long /*int*/ address = callbackArgs[0];

31569

Object object = ObjectMap.get (new LONG (address));

31570

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31571

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31572

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31573

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31574

return ((XPCOMObject) object).method38 (args);

31575

}

31576

-static int /*long*/ callback39 (int /*long*/[] callbackArgs) {

31577

+static long /*int*/ callback39 (long /*int*/[] callbackArgs) {

31578

// find the object on which this call was invoked

31579

- int /*long*/ address = callbackArgs[0];

31580

+ long /*int*/ address = callbackArgs[0];

31581

Object object = ObjectMap.get (new LONG (address));

31582

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31583

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31584

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31585

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31586

return ((XPCOMObject) object).method39 (args);

31587

}

31588

-static int /*long*/ callback4 (int /*long*/[] callbackArgs) {

31589

+static long /*int*/ callback4 (long /*int*/[] callbackArgs) {

31590

// find the object on which this call was invoked

31591

- int /*long*/ address = callbackArgs[0];

31592

+ long /*int*/ address = callbackArgs[0];

31593

Object object = ObjectMap.get (new LONG (address));

31594

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31595

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31596

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31597

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31598

return ((XPCOMObject) object).method4 (args);

31599

}

31600

-static int /*long*/ callback40 (int /*long*/[] callbackArgs) {

31601

+static long /*int*/ callback40 (long /*int*/[] callbackArgs) {

31602

// find the object on which this call was invoked

31603

- int /*long*/ address = callbackArgs[0];

31604

+ long /*int*/ address = callbackArgs[0];

31605

Object object = ObjectMap.get (new LONG (address));

31606

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31607

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31608

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31609

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31610

return ((XPCOMObject) object).method40 (args);

31611

}

31612

-static int /*long*/ callback41 (int /*long*/[] callbackArgs) {

31613

+static long /*int*/ callback41 (long /*int*/[] callbackArgs) {

31614

// find the object on which this call was invoked

31615

- int /*long*/ address = callbackArgs[0];

31616

+ long /*int*/ address = callbackArgs[0];

31617

Object object = ObjectMap.get (new LONG (address));

31618

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31619

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31620

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31621

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31622

return ((XPCOMObject) object).method41 (args);

31623

}

31624

-static int /*long*/ callback42 (int /*long*/[] callbackArgs) {

31625

+static long /*int*/ callback42 (long /*int*/[] callbackArgs) {

31626

// find the object on which this call was invoked

31627

- int /*long*/ address = callbackArgs[0];

31628

+ long /*int*/ address = callbackArgs[0];

31629

Object object = ObjectMap.get (new LONG (address));

31630

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31631

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31632

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31633

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31634

return ((XPCOMObject) object).method42 (args);

31635

}

31636

-static int /*long*/ callback43 (int /*long*/[] callbackArgs) {

31637

+static long /*int*/ callback43 (long /*int*/[] callbackArgs) {

31638

// find the object on which this call was invoked

31639

- int /*long*/ address = callbackArgs[0];

31640

+ long /*int*/ address = callbackArgs[0];

31641

Object object = ObjectMap.get (new LONG (address));

31642

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31643

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31644

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31645

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31646

return ((XPCOMObject) object).method43 (args);

31647

}

31648

-static int /*long*/ callback44 (int /*long*/[] callbackArgs) {

31649

+static long /*int*/ callback44 (long /*int*/[] callbackArgs) {

31650

// find the object on which this call was invoked

31651

- int /*long*/ address = callbackArgs[0];

31652

+ long /*int*/ address = callbackArgs[0];

31653

Object object = ObjectMap.get (new LONG (address));

31654

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31655

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31656

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31657

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31658

return ((XPCOMObject) object).method44 (args);

31659

}

31660

-static int /*long*/ callback45 (int /*long*/[] callbackArgs) {

31661

+static long /*int*/ callback45 (long /*int*/[] callbackArgs) {

31662

// find the object on which this call was invoked

31663

- int /*long*/ address = callbackArgs[0];

31664

+ long /*int*/ address = callbackArgs[0];

31665

Object object = ObjectMap.get (new LONG (address));

31666

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31667

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31668

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31669

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31670

return ((XPCOMObject) object).method45 (args);

31671

}

31672

-static int /*long*/ callback46 (int /*long*/[] callbackArgs) {

31673

+static long /*int*/ callback46 (long /*int*/[] callbackArgs) {

31674

// find the object on which this call was invoked

31675

- int /*long*/ address = callbackArgs[0];

31676

+ long /*int*/ address = callbackArgs[0];

31677

Object object = ObjectMap.get (new LONG (address));

31678

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31679

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31680

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31681

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31682

return ((XPCOMObject) object).method46 (args);

31683

}

31684

-static int /*long*/ callback47 (int /*long*/[] callbackArgs) {

31685

+static long /*int*/ callback47 (long /*int*/[] callbackArgs) {

31686

// find the object on which this call was invoked

31687

- int /*long*/ address = callbackArgs[0];

31688

+ long /*int*/ address = callbackArgs[0];

31689

Object object = ObjectMap.get (new LONG (address));

31690

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31691

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31692

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31693

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31694

return ((XPCOMObject) object).method47 (args);

31695

}

31696

-static int /*long*/ callback48 (int /*long*/[] callbackArgs) {

31697

+static long /*int*/ callback48 (long /*int*/[] callbackArgs) {

31698

// find the object on which this call was invoked

31699

- int /*long*/ address = callbackArgs[0];

31700

+ long /*int*/ address = callbackArgs[0];

31701

Object object = ObjectMap.get (new LONG (address));

31702

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31703

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31704

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31705

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31706

return ((XPCOMObject) object).method48 (args);

31707

}

31708

-static int /*long*/ callback49 (int /*long*/[] callbackArgs) {

31709

+static long /*int*/ callback49 (long /*int*/[] callbackArgs) {

31710

// find the object on which this call was invoked

31711

- int /*long*/ address = callbackArgs[0];

31712

+ long /*int*/ address = callbackArgs[0];

31713

Object object = ObjectMap.get (new LONG (address));

31714

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31715

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31716

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31717

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31718

return ((XPCOMObject) object).method49 (args);

31719

}

31720

-static int /*long*/ callback5 (int /*long*/[] callbackArgs) {

31721

+static long /*int*/ callback5 (long /*int*/[] callbackArgs) {

31722

// find the object on which this call was invoked

31723

- int /*long*/ address = callbackArgs[0];

31724

+ long /*int*/ address = callbackArgs[0];

31725

Object object = ObjectMap.get (new LONG (address));

31726

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31727

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31728

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31729

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31730

return ((XPCOMObject) object).method5 (args);

31731

}

31732

-static int /*long*/ callback50 (int /*long*/[] callbackArgs) {

31733

+static long /*int*/ callback50 (long /*int*/[] callbackArgs) {

31734

// find the object on which this call was invoked

31735

- int /*long*/ address = callbackArgs[0];

31736

+ long /*int*/ address = callbackArgs[0];

31737

Object object = ObjectMap.get (new LONG (address));

31738

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31739

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31740

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31741

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31742

return ((XPCOMObject) object).method50 (args);

31743

}

31744

-static int /*long*/ callback51 (int /*long*/[] callbackArgs) {

31745

+static long /*int*/ callback51 (long /*int*/[] callbackArgs) {

31746

// find the object on which this call was invoked

31747

- int /*long*/ address = callbackArgs[0];

31748

+ long /*int*/ address = callbackArgs[0];

31749

Object object = ObjectMap.get (new LONG (address));

31750

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31751

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31752

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31753

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31754

return ((XPCOMObject) object).method51 (args);

31755

}

31756

-static int /*long*/ callback52 (int /*long*/[] callbackArgs) {

31757

+static long /*int*/ callback52 (long /*int*/[] callbackArgs) {

31758

// find the object on which this call was invoked

31759

- int /*long*/ address = callbackArgs[0];

31760

+ long /*int*/ address = callbackArgs[0];

31761

Object object = ObjectMap.get (new LONG (address));

31762

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31763

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31764

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31765

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31766

return ((XPCOMObject) object).method52 (args);

31767

}

31768

-static int /*long*/ callback53 (int /*long*/[] callbackArgs) {

31769

+static long /*int*/ callback53 (long /*int*/[] callbackArgs) {

31770

// find the object on which this call was invoked

31771

- int /*long*/ address = callbackArgs[0];

31772

+ long /*int*/ address = callbackArgs[0];

31773

Object object = ObjectMap.get (new LONG (address));

31774

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31775

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31776

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31777

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31778

return ((XPCOMObject) object).method53 (args);

31779

}

31780

-static int /*long*/ callback54 (int /*long*/[] callbackArgs) {

31781

+static long /*int*/ callback54 (long /*int*/[] callbackArgs) {

31782

// find the object on which this call was invoked

31783

- int /*long*/ address = callbackArgs[0];

31784

+ long /*int*/ address = callbackArgs[0];

31785

Object object = ObjectMap.get (new LONG (address));

31786

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31787

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31788

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31789

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31790

return ((XPCOMObject) object).method54 (args);

31791

}

31792

-static int /*long*/ callback55 (int /*long*/[] callbackArgs) {

31793

+static long /*int*/ callback55 (long /*int*/[] callbackArgs) {

31794

// find the object on which this call was invoked

31795

- int /*long*/ address = callbackArgs[0];

31796

+ long /*int*/ address = callbackArgs[0];

31797

Object object = ObjectMap.get (new LONG (address));

31798

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31799

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31800

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31801

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31802

return ((XPCOMObject) object).method55 (args);

31803

}

31804

-static int /*long*/ callback56 (int /*long*/[] callbackArgs) {

31805

+static long /*int*/ callback56 (long /*int*/[] callbackArgs) {

31806

// find the object on which this call was invoked

31807

- int /*long*/ address = callbackArgs[0];

31808

+ long /*int*/ address = callbackArgs[0];

31809

Object object = ObjectMap.get (new LONG (address));

31810

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31811

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31812

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31813

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31814

return ((XPCOMObject) object).method56 (args);

31815

}

31816

-static int /*long*/ callback57 (int /*long*/[] callbackArgs) {

31817

+static long /*int*/ callback57 (long /*int*/[] callbackArgs) {

31818

// find the object on which this call was invoked

31819

- int /*long*/ address = callbackArgs[0];

31820

+ long /*int*/ address = callbackArgs[0];

31821

Object object = ObjectMap.get (new LONG (address));

31822

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31823

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31824

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31825

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31826

return ((XPCOMObject) object).method57 (args);

31827

}

31828

-static int /*long*/ callback58 (int /*long*/[] callbackArgs) {

31829

+static long /*int*/ callback58 (long /*int*/[] callbackArgs) {

31830

// find the object on which this call was invoked

31831

- int /*long*/ address = callbackArgs[0];

31832

+ long /*int*/ address = callbackArgs[0];

31833

Object object = ObjectMap.get (new LONG (address));

31834

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31835

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31836

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31837

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31838

return ((XPCOMObject) object).method58 (args);

31839

}

31840

-static int /*long*/ callback59 (int /*long*/[] callbackArgs) {

31841

+static long /*int*/ callback59 (long /*int*/[] callbackArgs) {

31842

// find the object on which this call was invoked

31843

- int /*long*/ address = callbackArgs[0];

31844

+ long /*int*/ address = callbackArgs[0];

31845

Object object = ObjectMap.get (new LONG (address));

31846

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31847

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31848

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31849

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31850

return ((XPCOMObject) object).method59 (args);

31851

}

31852

-static int /*long*/ callback6 (int /*long*/[] callbackArgs) {

31853

+static long /*int*/ callback6 (long /*int*/[] callbackArgs) {

31854

// find the object on which this call was invoked

31855

- int /*long*/ address = callbackArgs[0];

31856

+ long /*int*/ address = callbackArgs[0];

31857

Object object = ObjectMap.get (new LONG (address));

31858

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31859

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31860

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31861

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31862

return ((XPCOMObject) object).method6 (args);

31863

}

31864

-static int /*long*/ callback60 (int /*long*/[] callbackArgs) {

31865

+static long /*int*/ callback60 (long /*int*/[] callbackArgs) {

31866

// find the object on which this call was invoked

31867

- int /*long*/ address = callbackArgs[0];

31868

+ long /*int*/ address = callbackArgs[0];

31869

Object object = ObjectMap.get (new LONG (address));

31870

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31871

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31872

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31873

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31874

return ((XPCOMObject) object).method60 (args);

31875

}

31876

-static int /*long*/ callback61 (int /*long*/[] callbackArgs) {

31877

+static long /*int*/ callback61 (long /*int*/[] callbackArgs) {

31878

// find the object on which this call was invoked

31879

- int /*long*/ address = callbackArgs[0];

31880

+ long /*int*/ address = callbackArgs[0];

31881

Object object = ObjectMap.get (new LONG (address));

31882

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31883

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31884

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31885

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31886

return ((XPCOMObject) object).method61 (args);

31887

}

31888

-static int /*long*/ callback62 (int /*long*/[] callbackArgs) {

31889

+static long /*int*/ callback62 (long /*int*/[] callbackArgs) {

31890

// find the object on which this call was invoked

31891

- int /*long*/ address = callbackArgs[0];

31892

+ long /*int*/ address = callbackArgs[0];

31893

Object object = ObjectMap.get (new LONG (address));

31894

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31895

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31896

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31897

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31898

return ((XPCOMObject) object).method62 (args);

31899

}

31900

-static int /*long*/ callback63 (int /*long*/[] callbackArgs) {

31901

+static long /*int*/ callback63 (long /*int*/[] callbackArgs) {

31902

// find the object on which this call was invoked

31903

- int /*long*/ address = callbackArgs[0];

31904

+ long /*int*/ address = callbackArgs[0];

31905

Object object = ObjectMap.get (new LONG (address));

31906

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31907

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31908

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31909

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31910

return ((XPCOMObject) object).method63 (args);

31911

}

31912

-static int /*long*/ callback64 (int /*long*/[] callbackArgs) {

31913

+static long /*int*/ callback64 (long /*int*/[] callbackArgs) {

31914

// find the object on which this call was invoked

31915

- int /*long*/ address = callbackArgs[0];

31916

+ long /*int*/ address = callbackArgs[0];

31917

Object object = ObjectMap.get (new LONG (address));

31918

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31919

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31920

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31921

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31922

return ((XPCOMObject) object).method64 (args);

31923

}

31924

-static int /*long*/ callback65 (int /*long*/[] callbackArgs) {

31925

+static long /*int*/ callback65 (long /*int*/[] callbackArgs) {

31926

// find the object on which this call was invoked

31927

- int /*long*/ address = callbackArgs[0];

31928

+ long /*int*/ address = callbackArgs[0];

31929

Object object = ObjectMap.get (new LONG (address));

31930

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31931

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31932

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31933

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31934

return ((XPCOMObject) object).method65 (args);

31935

}

31936

-static int /*long*/ callback66 (int /*long*/[] callbackArgs) {

31937

+static long /*int*/ callback66 (long /*int*/[] callbackArgs) {

31938

// find the object on which this call was invoked

31939

- int /*long*/ address = callbackArgs[0];

31940

+ long /*int*/ address = callbackArgs[0];

31941

Object object = ObjectMap.get (new LONG (address));

31942

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31943

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31944

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31945

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31946

return ((XPCOMObject) object).method66 (args);

31947

}

31948

-static int /*long*/ callback67 (int /*long*/[] callbackArgs) {

31949

+static long /*int*/ callback67 (long /*int*/[] callbackArgs) {

31950

// find the object on which this call was invoked

31951

- int /*long*/ address = callbackArgs[0];

31952

+ long /*int*/ address = callbackArgs[0];

31953

Object object = ObjectMap.get (new LONG (address));

31954

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31955

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31956

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31957

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31958

return ((XPCOMObject) object).method67 (args);

31959

}

31960

-static int /*long*/ callback68 (int /*long*/[] callbackArgs) {

31961

+static long /*int*/ callback68 (long /*int*/[] callbackArgs) {

31962

// find the object on which this call was invoked

31963

- int /*long*/ address = callbackArgs[0];

31964

+ long /*int*/ address = callbackArgs[0];

31965

Object object = ObjectMap.get (new LONG (address));

31966

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31967

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31968

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31969

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31970

return ((XPCOMObject) object).method68 (args);

31971

}

31972

-static int /*long*/ callback69 (int /*long*/[] callbackArgs) {

31973

+static long /*int*/ callback69 (long /*int*/[] callbackArgs) {

31974

// find the object on which this call was invoked

31975

- int /*long*/ address = callbackArgs[0];

31976

+ long /*int*/ address = callbackArgs[0];

31977

Object object = ObjectMap.get (new LONG (address));

31978

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31979

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31980

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31981

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31982

return ((XPCOMObject) object).method69 (args);

31983

}

31984

-static int /*long*/ callback7 (int /*long*/[] callbackArgs) {

31985

+static long /*int*/ callback7 (long /*int*/[] callbackArgs) {

31986

// find the object on which this call was invoked

31987

- int /*long*/ address = callbackArgs[0];

31988

+ long /*int*/ address = callbackArgs[0];

31989

Object object = ObjectMap.get (new LONG (address));

31990

if (object == null) return XPCOM.NS_ERROR_FAILURE;

31991

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

31992

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

31993

System.arraycopy (callbackArgs, 1, args, 0, args.length);

31994

return ((XPCOMObject) object).method7 (args);

31995

}

31996

-static int /*long*/ callback70 (int /*long*/[] callbackArgs) {

31997

+static long /*int*/ callback70 (long /*int*/[] callbackArgs) {

31998

// find the object on which this call was invoked

31999

- int /*long*/ address = callbackArgs[0];

32000

+ long /*int*/ address = callbackArgs[0];

32001

Object object = ObjectMap.get (new LONG (address));

32002

if (object == null) return XPCOM.NS_ERROR_FAILURE;

32003

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

32004

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

32005

System.arraycopy (callbackArgs, 1, args, 0, args.length);

32006

return ((XPCOMObject) object).method70 (args);

32007

}

32008

-static int /*long*/ callback71 (int /*long*/[] callbackArgs) {

32009

+static long /*int*/ callback71 (long /*int*/[] callbackArgs) {

32010

// find the object on which this call was invoked

32011

- int /*long*/ address = callbackArgs[0];

32012

+ long /*int*/ address = callbackArgs[0];

32013

Object object = ObjectMap.get (new LONG (address));

32014

if (object == null) return XPCOM.NS_ERROR_FAILURE;

32015

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

32016

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

32017

System.arraycopy (callbackArgs, 1, args, 0, args.length);

32018

return ((XPCOMObject) object).method71 (args);

32019

}

32020

-static int /*long*/ callback72 (int /*long*/[] callbackArgs) {

32021

+static long /*int*/ callback72 (long /*int*/[] callbackArgs) {

32022

// find the object on which this call was invoked

32023

- int /*long*/ address = callbackArgs[0];

32024

+ long /*int*/ address = callbackArgs[0];

32025

Object object = ObjectMap.get (new LONG (address));

32026

if (object == null) return XPCOM.NS_ERROR_FAILURE;

32027

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

32028

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

32029

System.arraycopy (callbackArgs, 1, args, 0, args.length);

32030

return ((XPCOMObject) object).method72 (args);

32031

}

32032

-static int /*long*/ callback73 (int /*long*/[] callbackArgs) {

32033

+static long /*int*/ callback73 (long /*int*/[] callbackArgs) {

32034

// find the object on which this call was invoked

32035

- int /*long*/ address = callbackArgs[0];

32036

+ long /*int*/ address = callbackArgs[0];

32037

Object object = ObjectMap.get (new LONG (address));

32038

if (object == null) return XPCOM.NS_ERROR_FAILURE;

32039

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

32040

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

32041

System.arraycopy (callbackArgs, 1, args, 0, args.length);

32042

return ((XPCOMObject) object).method73 (args);

32043

}

32044

-static int /*long*/ callback74 (int /*long*/[] callbackArgs) {

32045

+static long /*int*/ callback74 (long /*int*/[] callbackArgs) {

32046

// find the object on which this call was invoked

32047

- int /*long*/ address = callbackArgs[0];

32048

+ long /*int*/ address = callbackArgs[0];

32049

Object object = ObjectMap.get (new LONG (address));

32050

if (object == null) return XPCOM.NS_ERROR_FAILURE;

32051

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

32052

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

32053

System.arraycopy (callbackArgs, 1, args, 0, args.length);

32054

return ((XPCOMObject) object).method74 (args);

32055

}

32056

-static int /*long*/ callback75 (int /*long*/[] callbackArgs) {

32057

+static long /*int*/ callback75 (long /*int*/[] callbackArgs) {

32058

// find the object on which this call was invoked

32059

- int /*long*/ address = callbackArgs[0];

32060

+ long /*int*/ address = callbackArgs[0];

32061

Object object = ObjectMap.get (new LONG (address));

32062

if (object == null) return XPCOM.NS_ERROR_FAILURE;

32063

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

32064

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

32065

System.arraycopy (callbackArgs, 1, args, 0, args.length);

32066

return ((XPCOMObject) object).method75 (args);

32067

}

32068

-static int /*long*/ callback76 (int /*long*/[] callbackArgs) {

32069

+static long /*int*/ callback76 (long /*int*/[] callbackArgs) {

32070

// find the object on which this call was invoked

32071

- int /*long*/ address = callbackArgs[0];

32072

+ long /*int*/ address = callbackArgs[0];

32073

Object object = ObjectMap.get (new LONG (address));

32074

if (object == null) return XPCOM.NS_ERROR_FAILURE;

32075

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

32076

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

32077

System.arraycopy (callbackArgs, 1, args, 0, args.length);

32078

return ((XPCOMObject) object).method76 (args);

32079

}

32080

-static int /*long*/ callback77 (int /*long*/[] callbackArgs) {

32081

+static long /*int*/ callback77 (long /*int*/[] callbackArgs) {

32082

// find the object on which this call was invoked

32083

- int /*long*/ address = callbackArgs[0];

32084

+ long /*int*/ address = callbackArgs[0];

32085

Object object = ObjectMap.get (new LONG (address));

32086

if (object == null) return XPCOM.NS_ERROR_FAILURE;

32087

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

32088

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

32089

System.arraycopy (callbackArgs, 1, args, 0, args.length);

32090

return ((XPCOMObject) object).method77 (args);

32091

}

32092

-static int /*long*/ callback78 (int /*long*/[] callbackArgs) {

32093

+static long /*int*/ callback78 (long /*int*/[] callbackArgs) {

32094

// find the object on which this call was invoked

32095

- int /*long*/ address = callbackArgs[0];

32096

+ long /*int*/ address = callbackArgs[0];

32097

Object object = ObjectMap.get (new LONG (address));

32098

if (object == null) return XPCOM.NS_ERROR_FAILURE;

32099

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

32100

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

32101

System.arraycopy (callbackArgs, 1, args, 0, args.length);

32102

return ((XPCOMObject) object).method78 (args);

32103

}

32104

-static int /*long*/ callback79 (int /*long*/[] callbackArgs) {

32105

+static long /*int*/ callback79 (long /*int*/[] callbackArgs) {

32106

// find the object on which this call was invoked

32107

- int /*long*/ address = callbackArgs[0];

32108

+ long /*int*/ address = callbackArgs[0];

32109

Object object = ObjectMap.get (new LONG (address));

32110

if (object == null) return XPCOM.NS_ERROR_FAILURE;

32111

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

32112

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

32113

System.arraycopy (callbackArgs, 1, args, 0, args.length);

32114

return ((XPCOMObject) object).method79 (args);

32115

}

32116

-static int /*long*/ callback8 (int /*long*/[] callbackArgs) {

32117

+static long /*int*/ callback8 (long /*int*/[] callbackArgs) {

32118

// find the object on which this call was invoked

32119

- int /*long*/ address = callbackArgs[0];

32120

+ long /*int*/ address = callbackArgs[0];

32121

Object object = ObjectMap.get (new LONG (address));

32122

if (object == null) return XPCOM.NS_ERROR_FAILURE;

32123

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

32124

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

32125

System.arraycopy (callbackArgs, 1, args, 0, args.length);

32126

return ((XPCOMObject) object).method8 (args);

32127

}

32128

-static int /*long*/ callback9 (int /*long*/[] callbackArgs) {

32129

+static long /*int*/ callback9 (long /*int*/[] callbackArgs) {

32130

// find the object on which this call was invoked

32131

- int /*long*/ address = callbackArgs[0];

32132

+ long /*int*/ address = callbackArgs[0];

32133

Object object = ObjectMap.get (new LONG (address));

32134

if (object == null) return XPCOM.NS_ERROR_FAILURE;

32135

- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];

32136

+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];

32137

System.arraycopy (callbackArgs, 1, args, 0, args.length);

32138

return ((XPCOMObject) object).method9 (args);

32139

}

32140

32141

public void dispose() {

32142

// free the memory for this reference

32143

- int /*long*/[] pVtable = new int /*long*/[1];

32144

+ long /*int*/[] pVtable = new long /*int*/[1];

32145

XPCOM.memmove (pVtable, ppVtable, C.PTR_SIZEOF);

32146

C.free (pVtable[0]);

32147

C.free (ppVtable);

32148

@@ -783,248 +783,248 @@

32149

ppVtable = 0;

32150

}

32151

32152

-public int /*long*/ getAddress () {

32153

+public long /*int*/ getAddress () {

32154

return ppVtable;

32155

}

32156

32157

-public int /*long*/ method0 (int /*long*/[] args) {

32158

+public long /*int*/ method0 (long /*int*/[] args) {

32159

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32160

}

32161

-public int /*long*/ method1 (int /*long*/[] args) {

32162

+public long /*int*/ method1 (long /*int*/[] args) {

32163

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32164

}

32165

-public int /*long*/ method10 (int /*long*/[] args) {

32166

+public long /*int*/ method10 (long /*int*/[] args) {

32167

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32168

}

32169

-public int /*long*/ method11 (int /*long*/[] args) {

32170

+public long /*int*/ method11 (long /*int*/[] args) {

32171

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32172

}

32173

-public int /*long*/ method12 (int /*long*/[] args) {

32174

+public long /*int*/ method12 (long /*int*/[] args) {

32175

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32176

}

32177

-public int /*long*/ method13 (int /*long*/[] args) {

32178

+public long /*int*/ method13 (long /*int*/[] args) {

32179

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32180

}

32181

-public int /*long*/ method14 (int /*long*/[] args) {

32182

+public long /*int*/ method14 (long /*int*/[] args) {

32183

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32184

}

32185

-public int /*long*/ method15 (int /*long*/[] args) {

32186

+public long /*int*/ method15 (long /*int*/[] args) {

32187

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32188

}

32189

-public int /*long*/ method16 (int /*long*/[] args) {

32190

+public long /*int*/ method16 (long /*int*/[] args) {

32191

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32192

}

32193

-public int /*long*/ method17 (int /*long*/[] args) {

32194

+public long /*int*/ method17 (long /*int*/[] args) {

32195

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32196

}

32197

-public int /*long*/ method18 (int /*long*/[] args) {

32198

+public long /*int*/ method18 (long /*int*/[] args) {

32199

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32200

}

32201

-public int /*long*/ method19 (int /*long*/[] args) {

32202

+public long /*int*/ method19 (long /*int*/[] args) {

32203

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32204

}

32205

-public int /*long*/ method2 (int /*long*/[] args) {

32206

+public long /*int*/ method2 (long /*int*/[] args) {

32207

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32208

}

32209

-public int /*long*/ method20 (int /*long*/[] args) {

32210

+public long /*int*/ method20 (long /*int*/[] args) {

32211

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32212

}

32213

-public int /*long*/ method21 (int /*long*/[] args) {

32214

+public long /*int*/ method21 (long /*int*/[] args) {

32215

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32216

}

32217

-public int /*long*/ method22 (int /*long*/[] args) {

32218

+public long /*int*/ method22 (long /*int*/[] args) {

32219

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32220

}

32221

-public int /*long*/ method23 (int /*long*/[] args) {

32222

+public long /*int*/ method23 (long /*int*/[] args) {

32223

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32224

}

32225

-public int /*long*/ method24 (int /*long*/[] args) {

32226

+public long /*int*/ method24 (long /*int*/[] args) {

32227

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32228

}

32229

-public int /*long*/ method25 (int /*long*/[] args) {

32230

+public long /*int*/ method25 (long /*int*/[] args) {

32231

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32232

}

32233

-public int /*long*/ method26 (int /*long*/[] args) {

32234

+public long /*int*/ method26 (long /*int*/[] args) {

32235

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32236

}

32237

-public int /*long*/ method27 (int /*long*/[] args) {

32238

+public long /*int*/ method27 (long /*int*/[] args) {

32239

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32240

}

32241

-public int /*long*/ method28 (int /*long*/[] args) {

32242

+public long /*int*/ method28 (long /*int*/[] args) {

32243

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32244

}

32245

-public int /*long*/ method29 (int /*long*/[] args) {

32246

+public long /*int*/ method29 (long /*int*/[] args) {

32247

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32248

}

32249

-public int /*long*/ method3 (int /*long*/[] args) {

32250

+public long /*int*/ method3 (long /*int*/[] args) {

32251

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32252

}

32253

-public int /*long*/ method30 (int /*long*/[] args) {

32254

+public long /*int*/ method30 (long /*int*/[] args) {

32255

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32256

}

32257

-public int /*long*/ method31 (int /*long*/[] args) {

32258

+public long /*int*/ method31 (long /*int*/[] args) {

32259

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32260

}

32261

-public int /*long*/ method32 (int /*long*/[] args) {

32262

+public long /*int*/ method32 (long /*int*/[] args) {

32263

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32264

}

32265

-public int /*long*/ method33 (int /*long*/[] args) {

32266

+public long /*int*/ method33 (long /*int*/[] args) {

32267

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32268

}

32269

-public int /*long*/ method34 (int /*long*/[] args) {

32270

+public long /*int*/ method34 (long /*int*/[] args) {

32271

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32272

}

32273

-public int /*long*/ method35 (int /*long*/[] args) {

32274

+public long /*int*/ method35 (long /*int*/[] args) {

32275

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32276

}

32277

-public int /*long*/ method36 (int /*long*/[] args) {

32278

+public long /*int*/ method36 (long /*int*/[] args) {

32279

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32280

}

32281

-public int /*long*/ method37 (int /*long*/[] args) {

32282

+public long /*int*/ method37 (long /*int*/[] args) {

32283

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32284

}

32285

-public int /*long*/ method38 (int /*long*/[] args) {

32286

+public long /*int*/ method38 (long /*int*/[] args) {

32287

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32288

}

32289

-public int /*long*/ method39 (int /*long*/[] args) {

32290

+public long /*int*/ method39 (long /*int*/[] args) {

32291

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32292

}

32293

-public int /*long*/ method4 (int /*long*/[] args) {

32294

+public long /*int*/ method4 (long /*int*/[] args) {

32295

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32296

}

32297

-public int /*long*/ method40 (int /*long*/[] args) {

32298

+public long /*int*/ method40 (long /*int*/[] args) {

32299

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32300

}

32301

-public int /*long*/ method41 (int /*long*/[] args) {

32302

+public long /*int*/ method41 (long /*int*/[] args) {

32303

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32304

}

32305

-public int /*long*/ method42 (int /*long*/[] args) {

32306

+public long /*int*/ method42 (long /*int*/[] args) {

32307

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32308

}

32309

-public int /*long*/ method43 (int /*long*/[] args) {

32310

+public long /*int*/ method43 (long /*int*/[] args) {

32311

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32312

}

32313

-public int /*long*/ method44 (int /*long*/[] args) {

32314

+public long /*int*/ method44 (long /*int*/[] args) {

32315

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32316

}

32317

-public int /*long*/ method45 (int /*long*/[] args) {

32318

+public long /*int*/ method45 (long /*int*/[] args) {

32319

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32320

}

32321

-public int /*long*/ method46 (int /*long*/[] args) {

32322

+public long /*int*/ method46 (long /*int*/[] args) {

32323

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32324

}

32325

-public int /*long*/ method47 (int /*long*/[] args) {

32326

+public long /*int*/ method47 (long /*int*/[] args) {

32327

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32328

}

32329

-public int /*long*/ method48 (int /*long*/[] args) {

32330

+public long /*int*/ method48 (long /*int*/[] args) {

32331

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32332

}

32333

-public int /*long*/ method49 (int /*long*/[] args) {

32334

+public long /*int*/ method49 (long /*int*/[] args) {

32335

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32336

}

32337

-public int /*long*/ method5 (int /*long*/[] args) {

32338

+public long /*int*/ method5 (long /*int*/[] args) {

32339

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32340

}

32341

-public int /*long*/ method50 (int /*long*/[] args) {

32342

+public long /*int*/ method50 (long /*int*/[] args) {

32343

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32344

}

32345

-public int /*long*/ method51 (int /*long*/[] args) {

32346

+public long /*int*/ method51 (long /*int*/[] args) {

32347

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32348

}

32349

-public int /*long*/ method52 (int /*long*/[] args) {

32350

+public long /*int*/ method52 (long /*int*/[] args) {

32351

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32352

}

32353

-public int /*long*/ method53 (int /*long*/[] args) {

32354

+public long /*int*/ method53 (long /*int*/[] args) {

32355

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32356

}

32357

-public int /*long*/ method54 (int /*long*/[] args) {

32358

+public long /*int*/ method54 (long /*int*/[] args) {

32359

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32360

}

32361

-public int /*long*/ method55 (int /*long*/[] args) {

32362

+public long /*int*/ method55 (long /*int*/[] args) {

32363

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32364

}

32365

-public int /*long*/ method56 (int /*long*/[] args) {

32366

+public long /*int*/ method56 (long /*int*/[] args) {

32367

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32368

}

32369

-public int /*long*/ method57 (int /*long*/[] args) {

32370

+public long /*int*/ method57 (long /*int*/[] args) {

32371

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32372

}

32373

-public int /*long*/ method58 (int /*long*/[] args) {

32374

+public long /*int*/ method58 (long /*int*/[] args) {

32375

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32376

}

32377

-public int /*long*/ method59 (int /*long*/[] args) {

32378

+public long /*int*/ method59 (long /*int*/[] args) {

32379

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32380

}

32381

-public int /*long*/ method6 (int /*long*/[] args) {

32382

+public long /*int*/ method6 (long /*int*/[] args) {

32383

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32384

}

32385

-public int /*long*/ method60 (int /*long*/[] args) {

32386

+public long /*int*/ method60 (long /*int*/[] args) {

32387

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32388

}

32389

-public int /*long*/ method61 (int /*long*/[] args) {

32390

+public long /*int*/ method61 (long /*int*/[] args) {

32391

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32392

}

32393

-public int /*long*/ method62 (int /*long*/[] args) {

32394

+public long /*int*/ method62 (long /*int*/[] args) {

32395

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32396

}

32397

-public int /*long*/ method63 (int /*long*/[] args) {

32398

+public long /*int*/ method63 (long /*int*/[] args) {

32399

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32400

}

32401

-public int /*long*/ method64 (int /*long*/[] args) {

32402

+public long /*int*/ method64 (long /*int*/[] args) {

32403

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32404

}

32405

-public int /*long*/ method65 (int /*long*/[] args) {

32406

+public long /*int*/ method65 (long /*int*/[] args) {

32407

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32408

}

32409

-public int /*long*/ method66 (int /*long*/[] args) {

32410

+public long /*int*/ method66 (long /*int*/[] args) {

32411

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32412

}

32413

-public int /*long*/ method67 (int /*long*/[] args) {

32414

+public long /*int*/ method67 (long /*int*/[] args) {

32415

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32416

}

32417

-public int /*long*/ method68 (int /*long*/[] args) {

32418

+public long /*int*/ method68 (long /*int*/[] args) {

32419

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32420

}

32421

-public int /*long*/ method69 (int /*long*/[] args) {

32422

+public long /*int*/ method69 (long /*int*/[] args) {

32423

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32424

}

32425

-public int /*long*/ method7 (int /*long*/[] args) {

32426

+public long /*int*/ method7 (long /*int*/[] args) {

32427

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32428

}

32429

-public int /*long*/ method70 (int /*long*/[] args) {

32430

+public long /*int*/ method70 (long /*int*/[] args) {

32431

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32432

}

32433

-public int /*long*/ method71 (int /*long*/[] args) {

32434

+public long /*int*/ method71 (long /*int*/[] args) {

32435

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32436

}

32437

-public int /*long*/ method72 (int /*long*/[] args) {

32438

+public long /*int*/ method72 (long /*int*/[] args) {

32439

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32440

}

32441

-public int /*long*/ method73 (int /*long*/[] args) {

32442

+public long /*int*/ method73 (long /*int*/[] args) {

32443

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32444

}

32445

-public int /*long*/ method74 (int /*long*/[] args) {

32446

+public long /*int*/ method74 (long /*int*/[] args) {

32447

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32448

}

32449

-public int /*long*/ method75 (int /*long*/[] args) {

32450

+public long /*int*/ method75 (long /*int*/[] args) {

32451

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32452

}

32453

-public int /*long*/ method76 (int /*long*/[] args) {

32454

+public long /*int*/ method76 (long /*int*/[] args) {

32455

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32456

}

32457

-public int /*long*/ method77 (int /*long*/[] args) {

32458

+public long /*int*/ method77 (long /*int*/[] args) {

32459

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32460

}

32461

-public int /*long*/ method78 (int /*long*/[] args) {

32462

+public long /*int*/ method78 (long /*int*/[] args) {

32463

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32464

}

32465

-public int /*long*/ method79 (int /*long*/[] args) {

32466

+public long /*int*/ method79 (long /*int*/[] args) {

32467

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32468

}

32469

-public int /*long*/ method8 (int /*long*/[] args) {

32470

+public long /*int*/ method8 (long /*int*/[] args) {

32471

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32472

}

32473

-public int /*long*/ method9 (int /*long*/[] args) {

32474

+public long /*int*/ method9 (long /*int*/[] args) {

32475

return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

32476

}

32477

}

32478

diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt/internal/opengl/glx/GLX.java

32479

--- x86/org/eclipse/swt/internal/opengl/glx/GLX.java 2009-05-29 17:30:30.000000000 -0400

32480

+++ x86_64/org/eclipse/swt/internal/opengl/glx/GLX.java 2009-09-17 08:48:22.000000000 -0400

32481

@@ -231,8 +231,8 @@

32482

}

32483

}

32484

/** @param dpy cast=(Display *) */

32485

-public static final native int /*long*/ _glXChooseVisual(int /*long*/ dpy, int screen, int[] attribList);

32486

-public static final int /*long*/ glXChooseVisual(int /*long*/ dpy, int screen, int[] attribList) {

32487

+public static final native long /*int*/ _glXChooseVisual(long /*int*/ dpy, int screen, int[] attribList);

32488

+public static final long /*int*/ glXChooseVisual(long /*int*/ dpy, int screen, int[] attribList) {

32489

lock.lock();

32490

try {

32491

return _glXChooseVisual(dpy, screen, attribList);

32492

@@ -245,8 +245,8 @@

32493

* @param src cast=(GLXContext)

32494

* @param dst cast=(GLXContext)

32495

*/

32496

-public static final native void _glXCopyContext(int /*long*/ dpy, int /*long*/ src, int /*long*/ dst, int mask);

32497

-public static final void glXCopyContext(int /*long*/ dpy, int /*long*/ src, int /*long*/ dst, int mask) {

32498

+public static final native void _glXCopyContext(long /*int*/ dpy, long /*int*/ src, long /*int*/ dst, int mask);

32499

+public static final void glXCopyContext(long /*int*/ dpy, long /*int*/ src, long /*int*/ dst, int mask) {

32500

lock.lock();

32501

try {

32502

_glXCopyContext(dpy, src, dst, mask);

32503

@@ -258,8 +258,8 @@

32504

* @param dpy cast=(Display *)

32505

* @param shareList cast=(GLXContext)

32506

*/

32507

-public static final native int /*long*/ _glXCreateContext(int /*long*/ dpy, XVisualInfo vis, int /*long*/ shareList, boolean direct);

32508

-public static final int /*long*/ glXCreateContext(int /*long*/ dpy, XVisualInfo vis, int /*long*/ shareList, boolean direct) {

32509

+public static final native long /*int*/ _glXCreateContext(long /*int*/ dpy, XVisualInfo vis, long /*int*/ shareList, boolean direct);

32510

+public static final long /*int*/ glXCreateContext(long /*int*/ dpy, XVisualInfo vis, long /*int*/ shareList, boolean direct) {

32511

lock.lock();

32512

try {

32513

return _glXCreateContext(dpy, vis, shareList, direct);

32514

@@ -271,8 +271,8 @@

32515

* @param dpy cast=(Display *)

32516

* @param pixmap cast=(Pixmap)

32517

*/

32518

-public static final native int /*long*/ _glXCreateGLXPixmap(int /*long*/ dpy, XVisualInfo vis, int /*long*/ pixmap);

32519

-public static final int /*long*/ glXCreateGLXPixmap(int /*long*/ dpy, XVisualInfo vis, int /*long*/ pixmap) {

32520

+public static final native long /*int*/ _glXCreateGLXPixmap(long /*int*/ dpy, XVisualInfo vis, long /*int*/ pixmap);

32521

+public static final long /*int*/ glXCreateGLXPixmap(long /*int*/ dpy, XVisualInfo vis, long /*int*/ pixmap) {

32522

lock.lock();

32523

try {

32524

return _glXCreateGLXPixmap(dpy, vis, pixmap);

32525

@@ -284,8 +284,8 @@

32526

* @param dpy cast=(Display *)

32527

* @param ctx cast=(GLXContext)

32528

*/

32529

-public static final native void _glXDestroyContext(int /*long*/ dpy, int /*long*/ ctx);

32530

-public static final void glXDestroyContext(int /*long*/ dpy, int /*long*/ ctx) {

32531

+public static final native void _glXDestroyContext(long /*int*/ dpy, long /*int*/ ctx);

32532

+public static final void glXDestroyContext(long /*int*/ dpy, long /*int*/ ctx) {

32533

lock.lock();

32534

try {

32535

_glXDestroyContext(dpy, ctx);

32536

@@ -297,8 +297,8 @@

32537

* @param dpy cast=(Display *)

32538

* @param pix cast=(GLXPixmap)

32539

*/

32540

-public static final native void _glXDestroyGLXPixmap(int /*long*/ dpy, int /*long*/ pix);

32541

-public static final void glXDestroyGLXPixmap(int /*long*/ dpy, int /*long*/ pix) {

32542

+public static final native void _glXDestroyGLXPixmap(long /*int*/ dpy, long /*int*/ pix);

32543

+public static final void glXDestroyGLXPixmap(long /*int*/ dpy, long /*int*/ pix) {

32544

lock.lock();

32545

try {

32546

_glXDestroyGLXPixmap(dpy, pix);

32547

@@ -307,8 +307,8 @@

32548

}

32549

}

32550

/** @param dpy cast=(Display *) */

32551

-public static final native int /*long*/ _glXGetClientString(int /*long*/ dpy, int name);

32552

-public static final int /*long*/ glXGetClientString(int /*long*/ dpy, int name) {

32553

+public static final native long /*int*/ _glXGetClientString(long /*int*/ dpy, int name);

32554

+public static final long /*int*/ glXGetClientString(long /*int*/ dpy, int name) {

32555

lock.lock();

32556

try {

32557

return _glXGetClientString(dpy, name);

32558

@@ -317,8 +317,8 @@

32559

}

32560

}

32561

/** @param dpy cast=(Display *) */

32562

-public static final native int _glXGetConfig(int /*long*/ dpy, XVisualInfo vis, int attrib, int[] value);

32563

-public static final int glXGetConfig(int /*long*/ dpy, XVisualInfo vis, int attrib, int[] value) {

32564

+public static final native int _glXGetConfig(long /*int*/ dpy, XVisualInfo vis, int attrib, int[] value);

32565

+public static final int glXGetConfig(long /*int*/ dpy, XVisualInfo vis, int attrib, int[] value) {

32566

lock.lock();

32567

try {

32568

return _glXGetConfig(dpy, vis, attrib, value);

32569

@@ -326,8 +326,8 @@

32570

lock.unlock();

32571

}

32572

}

32573

-public static final native int /*long*/ _glXGetCurrentContext();

32574

-public static final int /*long*/ glXGetCurrentContext() {

32575

+public static final native long /*int*/ _glXGetCurrentContext();

32576

+public static final long /*int*/ glXGetCurrentContext() {

32577

lock.lock();

32578

try {

32579

return _glXGetCurrentContext();

32580

@@ -335,8 +335,8 @@

32581

lock.unlock();

32582

}

32583

}

32584

-public static final native int /*long*/ _glXGetCurrentDrawable();

32585

-public static final int /*long*/ glXGetCurrentDrawable() {

32586

+public static final native long /*int*/ _glXGetCurrentDrawable();

32587

+public static final long /*int*/ glXGetCurrentDrawable() {

32588

lock.lock();

32589

try {

32590

return _glXGetCurrentDrawable();

32591

@@ -348,8 +348,8 @@

32592

* @param dpy cast=(Display *)

32593

* @param ctx cast=(GLXContext)

32594

*/

32595

-public static final native boolean _glXIsDirect(int /*long*/ dpy, int /*long*/ ctx);

32596

-public static final boolean glXIsDirect(int /*long*/ dpy, int /*long*/ ctx) {

32597

+public static final native boolean _glXIsDirect(long /*int*/ dpy, long /*int*/ ctx);

32598

+public static final boolean glXIsDirect(long /*int*/ dpy, long /*int*/ ctx) {

32599

lock.lock();

32600

try {

32601

return _glXIsDirect(dpy, ctx);

32602

@@ -362,8 +362,8 @@

32603

* @param drawable cast=(GLXDrawable)

32604

* @param ctx cast=(GLXContext)

32605

*/

32606

-public static final native boolean _glXMakeCurrent(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ ctx);

32607

-public static final boolean glXMakeCurrent(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ ctx) {

32608

+public static final native boolean _glXMakeCurrent(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ ctx);

32609

+public static final boolean glXMakeCurrent(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ ctx) {

32610

lock.lock();

32611

try {

32612

return _glXMakeCurrent(dpy, drawable, ctx);

32613

@@ -372,8 +372,8 @@

32614

}

32615

}

32616

/** @param dpy cast=(Display *) */

32617

-public static final native boolean _glXQueryExtension(int /*long*/ dpy, int[] errorBase, int[] eventBase);

32618

-public static final boolean glXQueryExtension(int /*long*/ dpy, int[] errorBase, int[] eventBase) {

32619

+public static final native boolean _glXQueryExtension(long /*int*/ dpy, int[] errorBase, int[] eventBase);

32620

+public static final boolean glXQueryExtension(long /*int*/ dpy, int[] errorBase, int[] eventBase) {

32621

lock.lock();

32622

try {

32623

return _glXQueryExtension(dpy, errorBase, eventBase);

32624

@@ -382,8 +382,8 @@

32625

}

32626

}

32627

/** @param dpy cast=(Display *) */

32628

-public static final native int /*long*/ _glXQueryExtensionsString(int /*long*/ dpy, int screen);

32629

-public static final int /*long*/ glXQueryExtensionsString(int /*long*/ dpy, int screen) {

32630

+public static final native long /*int*/ _glXQueryExtensionsString(long /*int*/ dpy, int screen);

32631

+public static final long /*int*/ glXQueryExtensionsString(long /*int*/ dpy, int screen) {

32632

lock.lock();

32633

try {

32634

return _glXQueryExtensionsString(dpy, screen);

32635

@@ -392,8 +392,8 @@

32636

}

32637

}

32638

/** @param dpy cast=(Display *) */

32639

-public static final native int /*long*/ _glXQueryServerString(int /*long*/ dpy, int screen, int name);

32640

-public static final int /*long*/ glXQueryServerString(int /*long*/ dpy, int screen, int name) {

32641

+public static final native long /*int*/ _glXQueryServerString(long /*int*/ dpy, int screen, int name);

32642

+public static final long /*int*/ glXQueryServerString(long /*int*/ dpy, int screen, int name) {

32643

lock.lock();

32644

try {

32645

return _glXQueryServerString(dpy, screen, name);

32646

@@ -406,8 +406,8 @@

32647

* @param major flags=no_in

32648

* @param minor flags=no_in

32649

*/

32650

-public static final native boolean _glXQueryVersion(int /*long*/ dpy, int[] major, int[] minor);

32651

-public static final boolean glXQueryVersion(int /*long*/ dpy, int[] major, int[] minor) {

32652

+public static final native boolean _glXQueryVersion(long /*int*/ dpy, int[] major, int[] minor);

32653

+public static final boolean glXQueryVersion(long /*int*/ dpy, int[] major, int[] minor) {

32654

lock.lock();

32655

try {

32656

return _glXQueryVersion(dpy, major, minor);

32657

@@ -419,8 +419,8 @@

32658

* @param dpy cast=(Display *)

32659

* @param drawable cast=(GLXDrawable)

32660

*/

32661

-public static final native void _glXSwapBuffers(int /*long*/ dpy, int /*long*/ drawable);

32662

-public static final void glXSwapBuffers(int /*long*/ dpy, int /*long*/ drawable) {

32663

+public static final native void _glXSwapBuffers(long /*int*/ dpy, long /*int*/ drawable);

32664

+public static final void glXSwapBuffers(long /*int*/ dpy, long /*int*/ drawable) {

32665

lock.lock();

32666

try {

32667

_glXSwapBuffers(dpy, drawable);

32668

@@ -450,5 +450,5 @@

32669

* @param src cast=(const void *)

32670

* @param size cast=(size_t)

32671

*/

32672

-public static final native void memmove(XVisualInfo dest, int /*long*/ src, int size);

32673

+public static final native void memmove(XVisualInfo dest, long /*int*/ src, int size);

32674

}

32675

diff -urN x86/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java x86_64/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java

32676

--- x86/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java 2009-05-29 17:30:32.000000000 -0400

32677

+++ x86_64/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java 2009-09-17 08:48:22.000000000 -0400

32678

@@ -12,7 +12,7 @@

32679

32680

public class XVisualInfo {

32681

/** @field cast=(Visual *) */

32682

- public int /*long*/ visual;

32683

+ public long /*int*/ visual;

32684

public int visualid;

32685

public int screen;

32686

public int depth;

32687

diff -urN x86/org/eclipse/swt/internal/theme/ButtonDrawData.java x86_64/org/eclipse/swt/internal/theme/ButtonDrawData.java

32688

--- x86/org/eclipse/swt/internal/theme/ButtonDrawData.java 2006-04-26 14:44:02.000000000 -0400

32689

+++ x86_64/org/eclipse/swt/internal/theme/ButtonDrawData.java 2009-09-17 08:48:24.000000000 -0400

32690

@@ -25,10 +25,10 @@

32691

void draw(Theme theme, GC gc, Rectangle bounds) {

32692

int state = this.state[DrawData.WIDGET_WHOLE];

32693

32694

- int /*long*/ drawable = gc.getGCData().drawable;

32695

+ long /*int*/ drawable = gc.getGCData().drawable;

32696

if ((style & SWT.RADIO) != 0) {

32697

- int /*long*/ radioButtonHandle = theme.radioButtonHandle;

32698

- int /*long*/ gtkStyle = OS.gtk_widget_get_style (radioButtonHandle);

32699

+ long /*int*/ radioButtonHandle = theme.radioButtonHandle;

32700

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (radioButtonHandle);

32701

theme.transferClipping (gc, gtkStyle);

32702

int indicator_size = theme.getWidgetProperty(radioButtonHandle, "indicator-size");

32703

int indicator_spacing = theme.getWidgetProperty(radioButtonHandle, "indicator-spacing");

32704

@@ -74,8 +74,8 @@

32705

}

32706

32707

if ((style & SWT.CHECK) != 0) {

32708

- int /*long*/ checkButtonHandle = theme.checkButtonHandle;

32709

- int /*long*/ gtkStyle = OS.gtk_widget_get_style (checkButtonHandle);

32710

+ long /*int*/ checkButtonHandle = theme.checkButtonHandle;

32711

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (checkButtonHandle);

32712

theme.transferClipping (gc, gtkStyle);

32713

int indicator_size = theme.getWidgetProperty(checkButtonHandle, "indicator-size");

32714

int indicator_spacing = theme.getWidgetProperty(checkButtonHandle, "indicator-spacing");

32715

@@ -122,8 +122,8 @@

32716

32717

32718

if ((style & SWT.PUSH) != 0) {

32719

- int /*long*/ buttonHandle = theme.buttonHandle;

32720

- int /*long*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);

32721

+ long /*int*/ buttonHandle = theme.buttonHandle;

32722

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);

32723

theme.transferClipping (gc, gtkStyle);

32724

int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");

32725

int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");

32726

diff -urN x86/org/eclipse/swt/internal/theme/ComboDrawData.java x86_64/org/eclipse/swt/internal/theme/ComboDrawData.java

32727

--- x86/org/eclipse/swt/internal/theme/ComboDrawData.java 2006-04-26 14:44:02.000000000 -0400

32728

+++ x86_64/org/eclipse/swt/internal/theme/ComboDrawData.java 2009-09-17 08:48:24.000000000 -0400

32729

@@ -24,9 +24,9 @@

32730

}

32731

32732

void draw(Theme theme, GC gc, Rectangle bounds) {

32733

- int /*long*/ buttonHandle = theme.buttonHandle;

32734

- int /*long*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle);

32735

- int /*long*/ drawable = gc.getGCData().drawable;

32736

+ long /*int*/ buttonHandle = theme.buttonHandle;

32737

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle);

32738

+ long /*int*/ drawable = gc.getGCData().drawable;

32739

theme.transferClipping(gc, gtkStyle);

32740

32741

int x = bounds.x;

32742

@@ -61,10 +61,10 @@

32743

OS.gtk_paint_box(gtkStyle, drawable, state_type, shadow_type, null, buttonHandle, detail, arrow_button_x, y, arrow_button_width, height);

32744

}

32745

byte[] arrow_detail = Converter.wcsToMbcs(null, "arrow", true);

32746

- int /*long*/ arrowHandle = theme.arrowHandle;

32747

+ long /*int*/ arrowHandle = theme.arrowHandle;

32748

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);

32749

32750

- int /*long*/ entryHandle = theme.entryHandle;

32751

+ long /*int*/ entryHandle = theme.entryHandle;

32752

gtkStyle = OS.gtk_widget_get_style(entryHandle);

32753

theme.transferClipping(gc, gtkStyle);

32754

state_type = getStateType(DrawData.WIDGET_WHOLE);

32755

@@ -100,8 +100,8 @@

32756

32757

int hit(Theme theme, Point position, Rectangle bounds) {

32758

if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;

32759

- int /*long*/ buttonHandle = theme.buttonHandle;

32760

- int /*long*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle);

32761

+ long /*int*/ buttonHandle = theme.buttonHandle;

32762

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle);

32763

int interior_focus = theme.getWidgetProperty(buttonHandle, "interior-focus");

32764

int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");

32765

int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");

32766

diff -urN x86/org/eclipse/swt/internal/theme/DrawData.java x86_64/org/eclipse/swt/internal/theme/DrawData.java

32767

--- x86/org/eclipse/swt/internal/theme/DrawData.java 2006-04-26 14:44:04.000000000 -0400

32768

+++ x86_64/org/eclipse/swt/internal/theme/DrawData.java 2009-09-17 08:48:24.000000000 -0400

32769

@@ -79,21 +79,21 @@

32770

}

32771

32772

void drawImage(Theme theme, Image image, GC gc, Rectangle bounds) {

32773

- int /*long*/ drawable = gc.getGCData().drawable;

32774

+ long /*int*/ drawable = gc.getGCData().drawable;

32775

Rectangle rect = image.getBounds();

32776

int state_type = getStateType(DrawData.WIDGET_WHOLE);

32777

if (state_type == OS.GTK_STATE_NORMAL) {

32778

gc.drawImage(image, 0, 0, rect.width, rect.height, bounds.x, bounds.y, bounds.width, bounds.height);

32779

} else {

32780

- int /*long*/ pixbuf = Theme.createPixbuf(image);

32781

- int /*long*/ source = OS.gtk_icon_source_new();

32782

+ long /*int*/ pixbuf = Theme.createPixbuf(image);

32783

+ long /*int*/ source = OS.gtk_icon_source_new();

32784

if (source != 0) {

32785

OS.gtk_icon_source_set_pixbuf(source, pixbuf);

32786

//TODO - always uses buttonHandle

32787

- int /*long*/ buttonHandle = theme.buttonHandle;

32788

- int /*long*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);

32789

+ long /*int*/ buttonHandle = theme.buttonHandle;

32790

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);

32791

theme.transferClipping(gc, gtkStyle);

32792

- int /*long*/ rendered = OS.gtk_style_render_icon(gtkStyle, source, OS.GTK_TEXT_DIR_NONE, state_type, -1, buttonHandle, null);

32793

+ long /*int*/ rendered = OS.gtk_style_render_icon(gtkStyle, source, OS.GTK_TEXT_DIR_NONE, state_type, -1, buttonHandle, null);

32794

OS.g_object_unref(pixbuf);

32795

//TODO - stretching

32796

if (rendered != 0) {

32797

@@ -106,12 +106,12 @@

32798

}

32799

32800

void drawText(Theme theme, String text, int flags, GC gc, Rectangle bounds) {

32801

- int /*long*/ widget = getTextHandle(theme);

32802

- int /*long*/ gtkStyle = OS.gtk_widget_get_style(widget);

32803

- int /*long*/ drawable = gc.getGCData().drawable;

32804

+ long /*int*/ widget = getTextHandle(theme);

32805

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style(widget);

32806

+ long /*int*/ drawable = gc.getGCData().drawable;

32807

theme.transferClipping (gc, gtkStyle);

32808

byte[] buffer = Converter.wcsToMbcs(null, text, true);

32809

- int /*long*/ layout = OS.gtk_widget_create_pango_layout(widget, buffer);

32810

+ long /*int*/ layout = OS.gtk_widget_create_pango_layout(widget, buffer);

32811

int[] width = new int[1], height = new int[1];

32812

OS.pango_layout_get_size(layout, width, height);

32813

OS.pango_layout_set_width(layout, bounds.width * OS.PANGO_SCALE);

32814

@@ -160,7 +160,7 @@

32815

return state_type;

32816

}

32817

32818

-int /*long*/ getTextHandle(Theme theme) {

32819

+long /*int*/ getTextHandle(Theme theme) {

32820

return theme.labelHandle;

32821

}

32822

32823

@@ -169,9 +169,9 @@

32824

}

32825

32826

Rectangle measureText(Theme theme, String text, int flags, GC gc, Rectangle bounds) {

32827

- int /*long*/ widget = getTextHandle(theme);

32828

+ long /*int*/ widget = getTextHandle(theme);

32829

byte[] buffer = Converter.wcsToMbcs(null, text, true);

32830

- int /*long*/ layout = OS.gtk_widget_create_pango_layout(widget, buffer);

32831

+ long /*int*/ layout = OS.gtk_widget_create_pango_layout(widget, buffer);

32832

if (bounds != null) OS.pango_layout_set_width(layout, bounds.width);

32833

if ((flags & DrawData.DRAW_LEFT) != 0) {

32834

OS.pango_layout_set_alignment(layout, OS.PANGO_ALIGN_LEFT);

32835

diff -urN x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java x86_64/org/eclipse/swt/internal/theme/ExpanderDrawData.java

32836

--- x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java 2006-04-26 14:44:02.000000000 -0400

32837

+++ x86_64/org/eclipse/swt/internal/theme/ExpanderDrawData.java 2009-09-17 08:48:24.000000000 -0400

32838

@@ -22,9 +22,9 @@

32839

}

32840

32841

void draw(Theme theme, GC gc, Rectangle bounds) {

32842

- int /*long*/ treeHandle = theme.treeHandle;

32843

- int /*long*/ gtkStyle = OS.gtk_widget_get_style (treeHandle);

32844

- int /*long*/ drawable = gc.getGCData().drawable;

32845

+ long /*int*/ treeHandle = theme.treeHandle;

32846

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (treeHandle);

32847

+ long /*int*/ drawable = gc.getGCData().drawable;

32848

theme.transferClipping(gc, gtkStyle);

32849

int state_type = getStateType(DrawData.WIDGET_WHOLE);

32850

int expander_style = OS.GTK_EXPANDER_COLAPSED;

32851

@@ -38,7 +38,7 @@

32852

32853

int hit(Theme theme, Point position, Rectangle bounds) {

32854

if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;

32855

- int /*long*/ treeHandle = theme.treeHandle;

32856

+ long /*int*/ treeHandle = theme.treeHandle;

32857

int expander_size = theme.getWidgetProperty(treeHandle, "expander-size");

32858

if (new Rectangle(bounds.x, bounds.y, expander_size, expander_size).contains(position)) {

32859

return DrawData.WIDGET_WHOLE;

32860

diff -urN x86/org/eclipse/swt/internal/theme/GroupDrawData.java x86_64/org/eclipse/swt/internal/theme/GroupDrawData.java

32861

--- x86/org/eclipse/swt/internal/theme/GroupDrawData.java 2006-04-26 14:44:02.000000000 -0400

32862

+++ x86_64/org/eclipse/swt/internal/theme/GroupDrawData.java 2009-09-17 08:48:24.000000000 -0400

32863

@@ -29,9 +29,9 @@

32864

static final int GROUP_HEADER_X = 9;

32865

static final int GROUP_HEADER_PAD = 2;

32866

void draw(Theme theme, GC gc, Rectangle bounds) {

32867

- int /*long*/ frameHandle = theme.frameHandle;

32868

- int /*long*/ gtkStyle = OS.gtk_widget_get_style (frameHandle);

32869

- int /*long*/ drawable = gc.getGCData().drawable;

32870

+ long /*int*/ frameHandle = theme.frameHandle;

32871

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (frameHandle);

32872

+ long /*int*/ drawable = gc.getGCData().drawable;

32873

theme.transferClipping(gc, gtkStyle);

32874

int xthickness = OS.gtk_style_get_xthickness(gtkStyle);

32875

int ythickness = OS.gtk_style_get_ythickness(gtkStyle);

32876

diff -urN x86/org/eclipse/swt/internal/theme/ProgressBarDrawData.java x86_64/org/eclipse/swt/internal/theme/ProgressBarDrawData.java

32877

--- x86/org/eclipse/swt/internal/theme/ProgressBarDrawData.java 2006-04-26 14:44:04.000000000 -0400

32878

+++ x86_64/org/eclipse/swt/internal/theme/ProgressBarDrawData.java 2009-09-17 08:48:24.000000000 -0400

32879

@@ -22,9 +22,9 @@

32880

}

32881

32882

void draw(Theme theme, GC gc, Rectangle bounds) {

32883

- int /*long*/ progressHandle = theme.progressHandle;

32884

- int /*long*/ gtkStyle = OS.gtk_widget_get_style (progressHandle);

32885

- int /*long*/ drawable = gc.getGCData().drawable;

32886

+ long /*int*/ progressHandle = theme.progressHandle;

32887

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (progressHandle);

32888

+ long /*int*/ drawable = gc.getGCData().drawable;

32889

theme.transferClipping(gc, gtkStyle);

32890

byte[] detail = Converter.wcsToMbcs(null, "trough", true);

32891

int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;

32892

diff -urN x86/org/eclipse/swt/internal/theme/TabFolderDrawData.java x86_64/org/eclipse/swt/internal/theme/TabFolderDrawData.java

32893

--- x86/org/eclipse/swt/internal/theme/TabFolderDrawData.java 2006-04-26 14:44:04.000000000 -0400

32894

+++ x86_64/org/eclipse/swt/internal/theme/TabFolderDrawData.java 2009-09-17 08:48:24.000000000 -0400

32895

@@ -31,9 +31,9 @@

32896

}

32897

32898

void draw(Theme theme, GC gc, Rectangle bounds) {

32899

- int /*long*/ notebookHandle = theme.notebookHandle;

32900

- int /*long*/ gtkStyle = OS.gtk_widget_get_style (notebookHandle);

32901

- int /*long*/ drawable = gc.getGCData().drawable;

32902

+ long /*int*/ notebookHandle = theme.notebookHandle;

32903

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (notebookHandle);

32904

+ long /*int*/ drawable = gc.getGCData().drawable;

32905

theme.transferClipping(gc, gtkStyle);

32906

int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;

32907

height -= tabsHeight;

32908

diff -urN x86/org/eclipse/swt/internal/theme/TabItemDrawData.java x86_64/org/eclipse/swt/internal/theme/TabItemDrawData.java

32909

--- x86/org/eclipse/swt/internal/theme/TabItemDrawData.java 2006-04-26 14:44:02.000000000 -0400

32910

+++ x86_64/org/eclipse/swt/internal/theme/TabItemDrawData.java 2009-09-17 08:48:24.000000000 -0400

32911

@@ -27,8 +27,8 @@

32912

}

32913

32914

Rectangle computeTrim(Theme theme, GC gc) {

32915

- int /*long*/ notebookHandle = theme.notebookHandle;

32916

- int /*long*/ gtkStyle = OS.gtk_widget_get_style(notebookHandle);

32917

+ long /*int*/ notebookHandle = theme.notebookHandle;

32918

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style(notebookHandle);

32919

int hborder, vborder;

32920

if (OS.GTK_VERSION >= OS.VERSION(2, 4, 0)) {

32921

hborder = theme.getWidgetProperty(notebookHandle, "tab-hborder");

32922

@@ -50,9 +50,9 @@

32923

}

32924

32925

void draw(Theme theme, GC gc, Rectangle bounds) {

32926

- int /*long*/ notebookHandle = theme.notebookHandle;

32927

- int /*long*/ gtkStyle = OS.gtk_widget_get_style (notebookHandle);

32928

- int /*long*/ drawable = gc.getGCData().drawable;

32929

+ long /*int*/ notebookHandle = theme.notebookHandle;

32930

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (notebookHandle);

32931

+ long /*int*/ drawable = gc.getGCData().drawable;

32932

theme.transferClipping(gc, gtkStyle);

32933

int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;

32934

if ((state[DrawData.WIDGET_WHOLE] & DrawData.SELECTED) == 0) {

32935

diff -urN x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/internal/theme/Theme.java

32936

--- x86/org/eclipse/swt/internal/theme/Theme.java 2006-04-26 14:44:02.000000000 -0400

32937

+++ x86_64/org/eclipse/swt/internal/theme/Theme.java 2009-09-17 08:48:24.000000000 -0400

32938

@@ -18,7 +18,7 @@

32939

public class Theme {

32940

Device device;

32941

32942

- int /*long*/ shellHandle, fixedHandle, buttonHandle, arrowHandle,

32943

+ long /*int*/ shellHandle, fixedHandle, buttonHandle, arrowHandle,

32944

frameHandle, entryHandle, checkButtonHandle, radioButtonHandle,

32945

notebookHandle, treeHandle, progressHandle, toolbarHandle,

32946

labelHandle, separatorHandle;

32947

@@ -68,29 +68,29 @@

32948

}

32949

32950

//TODO - share this code

32951

-static int /*long*/ createPixbuf(Image image) {

32952

+static long /*int*/ createPixbuf(Image image) {

32953

int [] w = new int [1], h = new int [1];

32954

OS.gdk_drawable_get_size (image.pixmap, w, h);

32955

- int /*long*/ colormap = OS.gdk_colormap_get_system ();

32956

- int /*long*/ pixbuf;

32957

+ long /*int*/ colormap = OS.gdk_colormap_get_system ();

32958

+ long /*int*/ pixbuf;

32959

boolean hasMask = image.mask != 0 && OS.gdk_drawable_get_depth (image.mask) == 1;

32960

if (hasMask) {

32961

pixbuf = OS.gdk_pixbuf_new (OS.GDK_COLORSPACE_RGB, true, 8, w [0], h [0]);

32962

if (pixbuf == 0) SWT.error (SWT.ERROR_NO_HANDLES);

32963

OS.gdk_pixbuf_get_from_drawable (pixbuf, image.pixmap, colormap, 0, 0, 0, 0, w [0], h [0]);

32964

- int /*long*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, w [0], h [0]);

32965

+ long /*int*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, w [0], h [0]);

32966

if (maskPixbuf == 0) SWT.error (SWT.ERROR_NO_HANDLES);

32967

OS.gdk_pixbuf_get_from_drawable(maskPixbuf, image.mask, 0, 0, 0, 0, 0, w [0], h [0]);

32968

int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);

32969

- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

32970

+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

32971

byte[] line = new byte[stride];

32972

int maskStride = OS.gdk_pixbuf_get_rowstride(maskPixbuf);

32973

- int /*long*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);

32974

+ long /*int*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);

32975

byte[] maskLine = new byte[maskStride];

32976

for (int y=0; y<h[0]; y++) {

32977

- int /*long*/ offset = pixels + (y * stride);

32978

+ long /*int*/ offset = pixels + (y * stride);

32979

OS.memmove(line, offset, stride);

32980

- int /*long*/ maskOffset = maskPixels + (y * maskStride);

32981

+ long /*int*/ maskOffset = maskPixels + (y * maskStride);

32982

OS.memmove(maskLine, maskOffset, maskStride);

32983

for (int x=0; x<w[0]; x++) {

32984

if (maskLine[x * 3] == 0) {

32985

@@ -109,10 +109,10 @@

32986

if (hasAlpha) {

32987

byte [] alpha = data.alphaData;

32988

int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);

32989

- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels (pixbuf);

32990

+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels (pixbuf);

32991

byte [] line = new byte [stride];

32992

for (int y = 0; y < h [0]; y++) {

32993

- int /*long*/ offset = pixels + (y * stride);

32994

+ long /*int*/ offset = pixels + (y * stride);

32995

OS.memmove (line, offset, stride);

32996

for (int x = 0; x < w [0]; x++) {

32997

line [x*4+3] = alpha [y*w [0]+x];

32998

@@ -218,18 +218,18 @@

32999

return data.measureText(this, text, flags, gc, bounds);

33000

}

33001

33002

-int getWidgetProperty(int /*long*/ handle, String name) {

33003

+int getWidgetProperty(long /*int*/ handle, String name) {

33004

byte[] propertyName = Converter.wcsToMbcs(null, name, true);

33005

int[] result = new int[1];

33006

OS.gtk_widget_style_get(handle, propertyName, result, 0);

33007

return result[0];

33008

}

33009

33010

-void transferClipping(GC gc, int /*long*/ style) {

33011

+void transferClipping(GC gc, long /*int*/ style) {

33012

GCData data = gc.getGCData();

33013

- int /*long*/ clipRgn = data.clipRgn;

33014

- int /*long*/ damageRgn = data.damageRgn;

33015

- int /*long*/ clipping = clipRgn;

33016

+ long /*int*/ clipRgn = data.clipRgn;

33017

+ long /*int*/ damageRgn = data.damageRgn;

33018

+ long /*int*/ clipping = clipRgn;

33019

if (damageRgn != 0) {

33020

if (clipping != 0) {

33021

clipping = OS.gdk_region_new();

33022

@@ -239,7 +239,7 @@

33023

clipping = damageRgn;

33024

}

33025

}

33026

- int /*long*/ [] curGC = new int /*long*/ [1];

33027

+ long /*int*/ [] curGC = new long /*int*/ [1];

33028

for (int i = 0; i < 5; i++) {

33029

OS.gtk_style_get_fg_gc (style, i, curGC);

33030

if (curGC[0] != 0) OS.gdk_gc_set_clip_region (curGC[0], clipping);

33031

diff -urN x86/org/eclipse/swt/internal/theme/ToolBarDrawData.java x86_64/org/eclipse/swt/internal/theme/ToolBarDrawData.java

33032

--- x86/org/eclipse/swt/internal/theme/ToolBarDrawData.java 2006-04-26 14:44:02.000000000 -0400

33033

+++ x86_64/org/eclipse/swt/internal/theme/ToolBarDrawData.java 2009-09-17 08:48:24.000000000 -0400

33034

@@ -21,9 +21,9 @@

33035

}

33036

33037

void draw(Theme theme, GC gc, Rectangle bounds) {

33038

- int /*long*/ toolbarHandle = theme.toolbarHandle;

33039

- int /*long*/ gtkStyle = OS.gtk_widget_get_style (toolbarHandle);

33040

- int /*long*/ drawable = gc.getGCData().drawable;

33041

+ long /*int*/ toolbarHandle = theme.toolbarHandle;

33042

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (toolbarHandle);

33043

+ long /*int*/ drawable = gc.getGCData().drawable;

33044

theme.transferClipping(gc, gtkStyle);

33045

int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;

33046

byte[] detail = Converter.wcsToMbcs(null, "toolbar", true);

33047

diff -urN x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/eclipse/swt/internal/theme/ToolItemDrawData.java

33048

--- x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java 2006-04-26 14:44:02.000000000 -0400

33049

+++ x86_64/org/eclipse/swt/internal/theme/ToolItemDrawData.java 2009-09-17 08:48:24.000000000 -0400

33050

@@ -27,8 +27,8 @@

33051

}

33052

33053

Rectangle computeTrim(Theme theme, GC gc) {

33054

- int /*long*/ buttonHandle = theme.buttonHandle;

33055

- int /*long*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle);

33056

+ long /*int*/ buttonHandle = theme.buttonHandle;

33057

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle);

33058

int focus_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");

33059

int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");

33060

int xthickness = OS.gtk_style_get_xthickness(gtkStyle);

33061

@@ -47,13 +47,13 @@

33062

33063

void draw(Theme theme, GC gc, Rectangle bounds) {

33064

int state = this.state[DrawData.WIDGET_WHOLE];

33065

- int /*long*/ drawable = gc.getGCData().drawable;

33066

+ long /*int*/ drawable = gc.getGCData().drawable;

33067

33068

if ((style & SWT.SEPARATOR) != 0) {

33069

int state_type = getStateType(DrawData.WIDGET_WHOLE);

33070

- int /*long*/ separatorHandle = theme.separatorHandle;

33071

+ long /*int*/ separatorHandle = theme.separatorHandle;

33072

byte[] detail = Converter.wcsToMbcs(null, "vseparator", true);

33073

- int /*long*/ gtkStyle = OS.gtk_widget_get_style (separatorHandle);

33074

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (separatorHandle);

33075

theme.transferClipping(gc, gtkStyle);

33076

if ((parent.style & SWT.VERTICAL) != 0) {

33077

OS.gtk_paint_hline(gtkStyle, drawable, state_type, null, separatorHandle, detail, bounds.x, bounds.x + bounds.width, bounds.y + bounds.height / 2);

33078

@@ -63,8 +63,8 @@

33079

return;

33080

}

33081

33082

- int /*long*/ buttonHandle = theme.buttonHandle;

33083

- int /*long*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);

33084

+ long /*int*/ buttonHandle = theme.buttonHandle;

33085

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);

33086

theme.transferClipping (gc, gtkStyle);

33087

int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");

33088

int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");

33089

@@ -83,7 +83,7 @@

33090

}

33091

33092

int[] relief = new int[1];

33093

- int /*long*/ toolbarHandle = theme.toolbarHandle;

33094

+ long /*int*/ toolbarHandle = theme.toolbarHandle;

33095

OS.gtk_widget_style_get(toolbarHandle, OS.button_relief, relief, 0);

33096

33097

int shadow_type = OS.GTK_SHADOW_OUT;

33098

@@ -149,8 +149,8 @@

33099

int hit(Theme theme, Point position, Rectangle bounds) {

33100

if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;

33101

if ((style & SWT.DROP_DOWN) != 0) {

33102

- int /*long*/ buttonHandle = theme.buttonHandle;

33103

- int /*long*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);

33104

+ long /*int*/ buttonHandle = theme.buttonHandle;

33105

+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);

33106

int xthickness = OS.gtk_style_get_xthickness(gtkStyle);

33107

int interior_focus = theme.getWidgetProperty(buttonHandle, "interior-focus");

33108

int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");

33109

diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl/GLCanvas.java

33110

--- x86/org/eclipse/swt/opengl/GLCanvas.java 2009-05-29 17:30:26.000000000 -0400

33111

+++ x86_64/org/eclipse/swt/opengl/GLCanvas.java 2009-09-17 08:48:22.000000000 -0400

33112

@@ -27,9 +27,9 @@

33113

*/

33114

33115

public class GLCanvas extends Canvas {

33116

- int /*long*/ context;

33117

- int /*long*/ xWindow;

33118

- int /*long*/ glWindow;

33119

+ long /*int*/ context;

33120

+ long /*int*/ xWindow;

33121

+ long /*int*/ glWindow;

33122

XVisualInfo vinfo;

33123

static final int MAX_ATTRIBUTES = 32;

33124

33125

@@ -104,9 +104,9 @@

33126

}

33127

glxAttrib [pos++] = 0;

33128

OS.gtk_widget_realize (handle);

33129

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle);

33130

- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);

33131

- int /*long*/ infoPtr = GLX.glXChooseVisual (xDisplay, OS.XDefaultScreen (xDisplay), glxAttrib);

33132

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle);

33133

+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);

33134

+ long /*int*/ infoPtr = GLX.glXChooseVisual (xDisplay, OS.XDefaultScreen (xDisplay), glxAttrib);

33135

if (infoPtr == 0) {

33136

dispose ();

33137

SWT.error (SWT.ERROR_UNSUPPORTED_DEPTH);

33138

@@ -114,9 +114,9 @@

33139

vinfo = new XVisualInfo ();

33140

GLX.memmove (vinfo, infoPtr, XVisualInfo.sizeof);

33141

OS.XFree (infoPtr);

33142

- int /*long*/ screen = OS.gdk_screen_get_default ();

33143

- int /*long*/ gdkvisual = OS.gdk_x11_screen_lookup_visual (screen, vinfo.visualid);

33144

- int /*long*/ share = data.shareContext != null ? data.shareContext.context : 0;

33145

+ long /*int*/ screen = OS.gdk_screen_get_default ();

33146

+ long /*int*/ gdkvisual = OS.gdk_x11_screen_lookup_visual (screen, vinfo.visualid);

33147

+ long /*int*/ share = data.shareContext != null ? data.shareContext.context : 0;

33148

context = GLX.glXCreateContext (xDisplay, vinfo, share, true);

33149

if (context == 0) SWT.error (SWT.ERROR_NO_HANDLES);

33150

GdkWindowAttr attrs = new GdkWindowAttr ();

33151

@@ -156,8 +156,8 @@

33152

OS.gdk_window_resize (glWindow, clientArea.width, clientArea.height);

33153

break;

33154

case SWT.Dispose:

33155

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle);

33156

- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);

33157

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle);

33158

+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);

33159

if (context != 0) {

33160

if (GLX.glXGetCurrentContext () == context) {

33161

GLX.glXMakeCurrent (xDisplay, 0, 0);

33162

@@ -189,8 +189,8 @@

33163

*/

33164

public GLData getGLData () {

33165

checkWidget ();

33166

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle);

33167

- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);

33168

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle);

33169

+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);

33170

GLData data = new GLData ();

33171

int [] value = new int [1];

33172

GLX.glXGetConfig (xDisplay, vinfo, GLX.GLX_DOUBLEBUFFER, value);

33173

@@ -252,8 +252,8 @@

33174

public void setCurrent () {

33175

checkWidget ();

33176

if (GLX.glXGetCurrentContext () == context) return;

33177

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle);

33178

- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);

33179

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle);

33180

+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);

33181

GLX.glXMakeCurrent (xDisplay, xWindow, context);

33182

}

33183

33184

@@ -267,8 +267,8 @@

33185

*/

33186

public void swapBuffers () {

33187

checkWidget ();

33188

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle);

33189

- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);

33190

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle);

33191

+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);

33192

GLX.glXSwapBuffers (xDisplay, xWindow);

33193

}

33194

}

33195

diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/printing/PrintDialog.java

33196

--- x86/org/eclipse/swt/printing/PrintDialog.java 2009-05-29 17:30:32.000000000 -0400

33197

+++ x86_64/org/eclipse/swt/printing/PrintDialog.java 2009-09-17 08:48:24.000000000 -0400

33198

@@ -34,7 +34,7 @@

33199

public class PrintDialog extends Dialog {

33200

PrinterData printerData = new PrinterData();

33201

33202

- int /*long*/ handle;

33203

+ long /*int*/ handle;

33204

int index;

33205

byte [] settingsData;

33206

33207

@@ -292,7 +292,7 @@

33208

return Printer.getDefaultPrinterData();

33209

} else {

33210

byte [] titleBytes = Converter.wcsToMbcs (null, getText(), true);

33211

- int /*long*/ topHandle = getParent().handle;

33212

+ long /*int*/ topHandle = getParent().handle;

33213

while (topHandle != 0 && !OS.GTK_IS_WINDOW(topHandle)) {

33214

topHandle = OS.gtk_widget_get_parent(topHandle);

33215

}

33216

@@ -305,8 +305,8 @@

33217

OS.GTK_PRINT_CAPABILITY_COLLATE | OS.GTK_PRINT_CAPABILITY_COPIES | OS.GTK_PRINT_CAPABILITY_PAGE_SET);

33218

33219

/* Set state into print dialog settings. */

33220

- int /*long*/ settings = OS.gtk_print_settings_new();

33221

- int /*long*/ page_setup = OS.gtk_page_setup_new();

33222

+ long /*int*/ settings = OS.gtk_print_settings_new();

33223

+ long /*int*/ page_setup = OS.gtk_page_setup_new();

33224

33225

if (printerData.otherData != null) {

33226

Printer.restore(printerData.otherData, settings, page_setup);

33227

@@ -361,7 +361,7 @@

33228

Display display = getParent() != null ? getParent().getDisplay (): Display.getCurrent ();

33229

33230

int signalId = 0;

33231

- int /*long*/ hookId = 0;

33232

+ long /*int*/ hookId = 0;

33233

if ((getStyle () & SWT.RIGHT_TO_LEFT) != 0) {

33234

signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());

33235

hookId = OS.g_signal_add_emission_hook (signalId, 0, ((LONG) display.getData (GET_EMISSION_PROC_KEY)).value, handle, 0);

33236

@@ -380,7 +380,7 @@

33237

OS.g_signal_remove_emission_hook (signalId, hookId);

33238

}

33239

if (response == OS.GTK_RESPONSE_OK) {

33240

- int /*long*/ printer = OS.gtk_print_unix_dialog_get_selected_printer(handle);

33241

+ long /*int*/ printer = OS.gtk_print_unix_dialog_get_selected_printer(handle);

33242

if (printer != 0) {

33243

/* Get state from print dialog. */

33244

settings = OS.gtk_print_unix_dialog_get_settings(handle); // must unref

33245

@@ -394,7 +394,7 @@

33246

case OS.GTK_PRINT_PAGES_RANGES:

33247

data.scope = PrinterData.PAGE_RANGE;

33248

int[] num_ranges = new int[1];

33249

- int /*long*/ page_ranges = OS.gtk_print_settings_get_page_ranges(settings, num_ranges);

33250

+ long /*int*/ page_ranges = OS.gtk_print_settings_get_page_ranges(settings, num_ranges);

33251

int [] pageRange = new int[2];

33252

int length = num_ranges[0];

33253

int min = Integer.MAX_VALUE, max = 0;

33254

@@ -416,7 +416,7 @@

33255

33256

data.printToFile = data.name.equals("Print to File"); //$NON-NLS-1$

33257

if (data.printToFile) {

33258

- int /*long*/ address = OS.gtk_print_settings_get(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI);

33259

+ long /*int*/ address = OS.gtk_print_settings_get(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI);

33260

int length = OS.strlen (address);

33261

byte [] buffer = new byte [length];

33262

OS.memmove (buffer, address, length);

33263

@@ -429,7 +429,7 @@

33264

33265

/* Save other print_settings data as key/value pairs in otherData. */

33266

Callback printSettingsCallback = new Callback(this, "GtkPrintSettingsFunc", 3); //$NON-NLS-1$

33267

- int /*long*/ GtkPrintSettingsFunc = printSettingsCallback.getAddress();

33268

+ long /*int*/ GtkPrintSettingsFunc = printSettingsCallback.getAddress();

33269

if (GtkPrintSettingsFunc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);

33270

index = 0;

33271

settingsData = new byte[1024];

33272

@@ -445,7 +445,7 @@

33273

store("bottom_margin", OS.gtk_page_setup_get_bottom_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$

33274

store("left_margin", OS.gtk_page_setup_get_left_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$

33275

store("right_margin", OS.gtk_page_setup_get_right_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$

33276

- int /*long*/ paper_size = OS.gtk_page_setup_get_paper_size(page_setup); //$NON-NLS-1$

33277

+ long /*int*/ paper_size = OS.gtk_page_setup_get_paper_size(page_setup); //$NON-NLS-1$

33278

storeBytes("paper_size_name", OS.gtk_paper_size_get_name(paper_size)); //$NON-NLS-1$

33279

storeBytes("paper_size_display_name", OS.gtk_paper_size_get_display_name(paper_size)); //$NON-NLS-1$

33280

storeBytes("paper_size_ppd_name", OS.gtk_paper_size_get_ppd_name(paper_size)); //$NON-NLS-1$

33281

@@ -463,7 +463,7 @@

33282

}

33283

}

33284

33285

-int /*long*/ GtkPrintSettingsFunc (int /*long*/ key, int /*long*/ value, int /*long*/ data) {

33286

+long /*int*/ GtkPrintSettingsFunc (long /*int*/ key, long /*int*/ value, long /*int*/ data) {

33287

int length = OS.strlen (key);

33288

byte [] keyBuffer = new byte [length];

33289

OS.memmove (keyBuffer, key, length);

33290

@@ -486,7 +486,7 @@

33291

store(key, String.valueOf(value));

33292

}

33293

33294

-void storeBytes(String key, int /*long*/ value) {

33295

+void storeBytes(String key, long /*int*/ value) {

33296

int length = OS.strlen (value);

33297

byte [] valueBuffer = new byte [length];

33298

OS.memmove (valueBuffer, value, length);

33299

diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printing/Printer.java

33300

--- x86/org/eclipse/swt/printing/Printer.java 2009-05-29 17:30:32.000000000 -0400

33301

+++ x86_64/org/eclipse/swt/printing/Printer.java 2009-09-17 08:48:24.000000000 -0400

33302

@@ -46,12 +46,12 @@

33303

static PrinterData [] printerList;

33304

33305

PrinterData data;

33306

- int /*long*/ printer;

33307

- int /*long*/ printJob;

33308

- int /*long*/ settings;

33309

- int /*long*/ pageSetup;

33310

- int /*long*/ surface;

33311

- int /*long*/ cairo;

33312

+ long /*int*/ printer;

33313

+ long /*int*/ printJob;

33314

+ long /*int*/ settings;

33315

+ long /*int*/ pageSetup;

33316

+ long /*int*/ surface;

33317

+ long /*int*/ cairo;

33318

33319

/**

33320

* whether or not a GC was created for this printer

33321

@@ -82,18 +82,18 @@

33322

OS.g_thread_init (0);

33323

}

33324

OS.gtk_set_locale();

33325

- if (!OS.gtk_init_check (new int /*long*/ [] {0}, null)) {

33326

+ if (!OS.gtk_init_check (new long /*int*/ [] {0}, null)) {

33327

SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]");

33328

}

33329

Callback printerCallback = new Callback(Printer.class, "GtkPrinterFunc_List", 2); //$NON-NLS-1$

33330

- int /*long*/ GtkPrinterFunc_List = printerCallback.getAddress();

33331

+ long /*int*/ GtkPrinterFunc_List = printerCallback.getAddress();

33332

if (GtkPrinterFunc_List == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);

33333

OS.gtk_enumerate_printers(GtkPrinterFunc_List, 0, 0, true);

33334

printerCallback.dispose ();

33335

return printerList;

33336

}

33337

33338

-static int /*long*/ GtkPrinterFunc_List (int /*long*/ printer, int /*long*/ user_data) {

33339

+static long /*int*/ GtkPrinterFunc_List (long /*int*/ printer, long /*int*/ user_data) {

33340

int length = printerList.length;

33341

PrinterData [] newList = new PrinterData [length + 1];

33342

System.arraycopy (printerList, 0, newList, 0, length);

33343

@@ -129,18 +129,18 @@

33344

OS.g_thread_init (0);

33345

}

33346

OS.gtk_set_locale();

33347

- if (!OS.gtk_init_check (new int /*long*/ [] {0}, null)) {

33348

+ if (!OS.gtk_init_check (new long /*int*/ [] {0}, null)) {

33349

SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]");

33350

}

33351

Callback printerCallback = new Callback(Printer.class, "GtkPrinterFunc_Default", 2); //$NON-NLS-1$

33352

- int /*long*/ GtkPrinterFunc_Default = printerCallback.getAddress();

33353

+ long /*int*/ GtkPrinterFunc_Default = printerCallback.getAddress();

33354

if (GtkPrinterFunc_Default == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);

33355

OS.gtk_enumerate_printers(GtkPrinterFunc_Default, 0, 0, true);

33356

printerCallback.dispose ();

33357

return printerList[0];

33358

}

33359

33360

-static int /*long*/ GtkPrinterFunc_Default (int /*long*/ printer, int /*long*/ user_data) {

33361

+static long /*int*/ GtkPrinterFunc_Default (long /*int*/ printer, long /*int*/ user_data) {

33362

if (OS.gtk_printer_is_default(printer)) {

33363

printerList[0] = printerDataFromGtkPrinter(printer);

33364

return 1;

33365

@@ -150,9 +150,9 @@

33366

return 0;

33367

}

33368

33369

-int /*long*/ gtkPrinterFromPrinterData() {

33370

+long /*int*/ gtkPrinterFromPrinterData() {

33371

Callback printerCallback = new Callback(this, "GtkPrinterFunc_FindNamedPrinter", 2); //$NON-NLS-1$

33372

- int /*long*/ GtkPrinterFunc_FindNamedPrinter = printerCallback.getAddress();

33373

+ long /*int*/ GtkPrinterFunc_FindNamedPrinter = printerCallback.getAddress();

33374

if (GtkPrinterFunc_FindNamedPrinter == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);

33375

printer = 0;

33376

OS.gtk_enumerate_printers(GtkPrinterFunc_FindNamedPrinter, 0, 0, true);

33377

@@ -160,7 +160,7 @@

33378

return printer;

33379

}

33380

33381

-int /*long*/ GtkPrinterFunc_FindNamedPrinter (int /*long*/ printer, int /*long*/ user_data) {

33382

+long /*int*/ GtkPrinterFunc_FindNamedPrinter (long /*int*/ printer, long /*int*/ user_data) {

33383

PrinterData pd = printerDataFromGtkPrinter(printer);

33384

if (pd.driver.equals(data.driver) && pd.name.equals(data.name)) {

33385

this.printer = printer;

33386

@@ -172,9 +172,9 @@

33387

return 0;

33388

}

33389

33390

-static PrinterData printerDataFromGtkPrinter(int /*long*/ printer) {

33391

- int /*long*/ backend = OS.gtk_printer_get_backend(printer);

33392

- int /*long*/ address = OS.G_OBJECT_TYPE_NAME(backend);

33393

+static PrinterData printerDataFromGtkPrinter(long /*int*/ printer) {

33394

+ long /*int*/ backend = OS.gtk_printer_get_backend(printer);

33395

+ long /*int*/ address = OS.G_OBJECT_TYPE_NAME(backend);

33396

int length = OS.strlen (address);

33397

byte [] buffer = new byte [length];

33398

OS.memmove (buffer, address, length);

33399

@@ -192,7 +192,7 @@

33400

/*

33401

* Restore printer settings and page_setup data from data.

33402

*/

33403

-static void restore(byte [] data, int /*long*/ settings, int /*long*/ page_setup) {

33404

+static void restore(byte [] data, long /*int*/ settings, long /*int*/ page_setup) {

33405

settingsData = data;

33406

start = end = 0;

33407

while (end < settingsData.length && settingsData[end] != 0) {

33408

@@ -225,7 +225,7 @@

33409

double width = restoreDouble("paper_size_width"); //$NON-NLS-1$

33410

double height = restoreDouble("paper_size_height"); //$NON-NLS-1$

33411

boolean custom = restoreBoolean("paper_size_is_custom"); //$NON-NLS-1$

33412

- int /*long*/ paper_size = 0;

33413

+ long /*int*/ paper_size = 0;

33414

if (custom) {

33415

if (ppd_name.length > 0) {

33416

paper_size = OS.gtk_paper_size_new_from_ppd(ppd_name, display_name, width, height);

33417

@@ -350,8 +350,8 @@

33418

public Font getSystemFont () {

33419

checkDevice ();

33420

if (systemFont != null) return systemFont;

33421

- int /*long*/ style = OS.gtk_widget_get_default_style();

33422

- int /*long*/ defaultFont = OS.pango_font_description_copy (OS.gtk_style_get_font_desc (style));

33423

+ long /*int*/ style = OS.gtk_widget_get_default_style();

33424

+ long /*int*/ defaultFont = OS.pango_font_description_copy (OS.gtk_style_get_font_desc (style));

33425

return systemFont = Font.gtk_new (this, defaultFont);

33426

}

33427

33428

@@ -368,11 +368,11 @@

33429

* @param data the platform specific GC data

33430

* @return the platform specific GC handle

33431

*/

33432

-public int /*long*/ internal_new_GC(GCData data) {

33433

+public long /*int*/ internal_new_GC(GCData data) {

33434

GdkVisual visual = new GdkVisual ();

33435

OS.memmove (visual, OS.gdk_visual_get_system());

33436

- int /*long*/ drawable = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), 1, 1, visual.depth);

33437

- int /*long*/ gdkGC = OS.gdk_gc_new (drawable);

33438

+ long /*int*/ drawable = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), 1, 1, visual.depth);

33439

+ long /*int*/ gdkGC = OS.gdk_gc_new (drawable);

33440

if (gdkGC == 0) SWT.error (SWT.ERROR_NO_HANDLES);

33441

if (data != null) {

33442

if (isGCCreated) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

33443

@@ -408,7 +408,7 @@

33444

* @param hDC the platform specific GC handle

33445

* @param data the platform specific GC data

33446

*/

33447

-public void internal_dispose_GC(int /*long*/ gdkGC, GCData data) {

33448

+public void internal_dispose_GC(long /*int*/ gdkGC, GCData data) {

33449

if (data != null) isGCCreated = false;

33450

OS.g_object_unref (gdkGC);

33451

if (data != null) {

33452

diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/program/Program.java

33453

--- x86/org/eclipse/swt/program/Program.java 2008-08-05 10:59:14.000000000 -0400

33454

+++ x86_64/org/eclipse/swt/program/Program.java 2009-09-17 08:48:24.000000000 -0400

33455

@@ -42,7 +42,7 @@

33456

*/

33457

boolean gnomeExpectUri;

33458

33459

- static int /*long*/ cdeShell;

33460

+ static long /*int*/ cdeShell;

33461

33462

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$

33463

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$

33464

@@ -70,11 +70,11 @@

33465

int desktop = DESKTOP_UNKNOWN;

33466

33467

/* Get the list of properties on the root window. */

33468

- int /*long*/ xDisplay = OS.GDK_DISPLAY();

33469

- int /*long*/ rootWindow = OS.XDefaultRootWindow(xDisplay);

33470

+ long /*int*/ xDisplay = OS.GDK_DISPLAY();

33471

+ long /*int*/ rootWindow = OS.XDefaultRootWindow(xDisplay);

33472

int[] numProp = new int[1];

33473

- int /*long*/ propList = OS.XListProperties(xDisplay, rootWindow, numProp);

33474

- int /*long*/ [] property = new int /*long*/ [numProp[0]];

33475

+ long /*int*/ propList = OS.XListProperties(xDisplay, rootWindow, numProp);

33476

+ long /*int*/ [] property = new long /*int*/ [numProp[0]];

33477

if (propList != 0) {

33478

OS.memmove(property, propList, (property.length * OS.PTR_SIZEOF));

33479

OS.XFree(propList);

33480

@@ -93,10 +93,10 @@

33481

*/

33482

if (desktop == DESKTOP_UNKNOWN) {

33483

byte[] gnomeName = Converter.wcsToMbcs(null, "_NET_SUPPORTING_WM_CHECK", true);

33484

- int /*long*/ gnome = OS.XInternAtom(xDisplay, gnomeName, true);

33485

+ long /*int*/ gnome = OS.XInternAtom(xDisplay, gnomeName, true);

33486

if (gnome != OS.None && (OS.GTK_VERSION >= OS.VERSION (2, 2, 0)) && gnome_init()) {

33487

desktop = DESKTOP_GNOME;

33488

- int /*long*/ icon_theme = GNOME.gnome_icon_theme_new();

33489

+ long /*int*/ icon_theme = GNOME.gnome_icon_theme_new();

33490

display.setData(ICON_THEME_DATA, new LONG(icon_theme));

33491

display.addListener(SWT.Dispose, new Listener() {

33492

public void handleEvent(Event event) {

33493

@@ -112,10 +112,10 @@

33494

});

33495

/* Check for libgnomevfs-2 version 2.4 */

33496

byte[] buffer = Converter.wcsToMbcs(null, "libgnomevfs-2.so.0", true);

33497

- int /*long*/ libgnomevfs = OS.dlopen(buffer, OS.RTLD_LAZY);

33498

+ long /*int*/ libgnomevfs = OS.dlopen(buffer, OS.RTLD_LAZY);

33499

if (libgnomevfs != 0) {

33500

buffer = Converter.wcsToMbcs(null, "gnome_vfs_url_show", true);

33501

- int /*long*/ gnome_vfs_url_show = OS.dlsym(libgnomevfs, buffer);

33502

+ long /*int*/ gnome_vfs_url_show = OS.dlsym(libgnomevfs, buffer);

33503

if (gnome_vfs_url_show != 0) {

33504

desktop = DESKTOP_GNOME_24;

33505

}

33506

@@ -131,7 +131,7 @@

33507

*/

33508

if (desktop == DESKTOP_UNKNOWN) {

33509

byte[] cdeName = Converter.wcsToMbcs(null, "_DT_SM_PREFERENCES", true);

33510

- int /*long*/ cde = OS.XInternAtom(xDisplay, cdeName, true);

33511

+ long /*int*/ cde = OS.XInternAtom(xDisplay, cdeName, true);

33512

for (int index = 0; desktop == DESKTOP_UNKNOWN && index < property.length; index++) {

33513

if (property[index] == OS.None) continue; /* do not match atoms that do not exist */

33514

if (property[index] == cde && cde_init(display)) desktop = DESKTOP_CDE;

33515

@@ -146,7 +146,7 @@

33516

/* Use the character encoding for the default locale */

33517

byte[] action = Converter.wcsToMbcs(null, command, true);

33518

byte[] fileArg = Converter.wcsToMbcs(null, fileName, true);

33519

- int /*long*/ ptr = OS.g_malloc(fileArg.length);

33520

+ long /*int*/ ptr = OS.g_malloc(fileArg.length);

33521

OS.memmove(ptr, fileArg, fileArg.length);

33522

DtActionArg args = new DtActionArg();

33523

args.argClass = CDE.DtACTION_FILE;

33524

@@ -176,7 +176,7 @@

33525

byte[] dataTypeBuf = Converter.wcsToMbcs(null, dataType, true);

33526

byte[] attrNameBuf = Converter.wcsToMbcs(null, attrName, true);

33527

byte[] optNameBuf = null;

33528

- int /*long*/ attrValue = CDE.DtDtsDataTypeToAttributeValue(dataTypeBuf, attrNameBuf, optNameBuf);

33529

+ long /*int*/ attrValue = CDE.DtDtsDataTypeToAttributeValue(dataTypeBuf, attrNameBuf, optNameBuf);

33530

if (attrValue == 0) return null;

33531

int length = OS.strlen(attrValue);

33532

byte[] attrValueBuf = new byte[length];

33533

@@ -189,11 +189,11 @@

33534

static Hashtable cde_getDataTypeInfo() {

33535

Hashtable dataTypeInfo = new Hashtable();

33536

int index;

33537

- int /*long*/ dataTypeList = CDE.DtDtsDataTypeNames();

33538

+ long /*int*/ dataTypeList = CDE.DtDtsDataTypeNames();

33539

if (dataTypeList != 0) {

33540

/* For each data type name in the list */

33541

index = 0;

33542

- int /*long*/ [] dataType = new int /*long*/ [1];

33543

+ long /*int*/ [] dataType = new long /*int*/ [1];

33544

OS.memmove(dataType, dataTypeList + (index++ * 4), 4);

33545

while (dataType[0] != 0) {

33546

int length = OS.strlen(dataType[0]);

33547

@@ -277,13 +277,13 @@

33548

33549

/* Use the character encoding for the default locale */

33550

CDE.XtToolkitInitialize();

33551

- int /*long*/ xtContext = CDE.XtCreateApplicationContext ();

33552

- int /*long*/ xDisplay = OS.GDK_DISPLAY();

33553

+ long /*int*/ xtContext = CDE.XtCreateApplicationContext ();

33554

+ long /*int*/ xDisplay = OS.GDK_DISPLAY();

33555

byte[] appName = Converter.wcsToMbcs(null, "CDE", true);

33556

byte[] appClass = Converter.wcsToMbcs(null, "CDE", true);

33557

- int /*long*/ [] argc = new int /*long*/ [] {0};

33558

+ long /*int*/ [] argc = new long /*int*/ [] {0};

33559

CDE.XtDisplayInitialize(xtContext, xDisplay, appName, appClass, 0, 0, argc, 0);

33560

- int /*long*/ widgetClass = CDE.topLevelShellWidgetClass ();

33561

+ long /*int*/ widgetClass = CDE.topLevelShellWidgetClass ();

33562

cdeShell = CDE.XtAppCreateShell (appName, appClass, widgetClass, xDisplay, null, 0);

33563

CDE.XtSetMappedWhenManaged (cdeShell, false);

33564

CDE.XtResizeWidget (cdeShell, 10, 10, 0);

33565

@@ -343,10 +343,10 @@

33566

*/

33567

boolean gnome_24_execute(String fileName) {

33568

byte[] mimeTypeBuffer = Converter.wcsToMbcs(null, name, true);

33569

- int /*long*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer);

33570

+ long /*int*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer);

33571

byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);

33572

- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT);

33573

- int /*long*/ list = GNOME.g_list_append(0, uri);

33574

+ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT);

33575

+ long /*int*/ list = GNOME.g_list_append(0, uri);

33576

int result = GNOME.gnome_vfs_mime_application_launch(ptr, list);

33577

GNOME.gnome_vfs_mime_application_free(ptr);

33578

GNOME.g_free(uri);

33579

@@ -359,7 +359,7 @@

33580

*/

33581

static boolean gnome_24_launch(String fileName) {

33582

byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);

33583

- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT);

33584

+ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT);

33585

int result = GNOME.gnome_vfs_url_show(uri);

33586

GNOME.g_free(uri);

33587

return (result == GNOME.GNOME_VFS_OK);

33588

@@ -372,7 +372,7 @@

33589

if (gnomeExpectUri) {

33590

/* Convert the given path into a URL */

33591

byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);

33592

- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input(fileNameBuffer);

33593

+ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input(fileNameBuffer);

33594

if (uri != 0) {

33595

int length = OS.strlen(uri);

33596

if (length > 0) {

33597

@@ -436,24 +436,24 @@

33598

*/

33599

static Hashtable gnome_getMimeInfo() {

33600

Hashtable mimeInfo = new Hashtable();

33601

- int /*long*/[] mimeData = new int /*long*/[1];

33602

- int /*long*/[] extensionData = new int /*long*/[1];

33603

- int /*long*/ mimeList = GNOME.gnome_vfs_get_registered_mime_types();

33604

- int /*long*/ mimeElement = mimeList;

33605

+ long /*int*/[] mimeData = new long /*int*/[1];

33606

+ long /*int*/[] extensionData = new long /*int*/[1];

33607

+ long /*int*/ mimeList = GNOME.gnome_vfs_get_registered_mime_types();

33608

+ long /*int*/ mimeElement = mimeList;

33609

while (mimeElement != 0) {

33610

OS.memmove (mimeData, mimeElement, OS.PTR_SIZEOF);

33611

- int /*long*/ mimePtr = mimeData[0];

33612

+ long /*int*/ mimePtr = mimeData[0];

33613

int mimeLength = OS.strlen(mimePtr);

33614

byte[] mimeTypeBuffer = new byte[mimeLength];

33615

OS.memmove(mimeTypeBuffer, mimePtr, mimeLength);

33616

String mimeType = new String(Converter.mbcsToWcs(null, mimeTypeBuffer));

33617

- int /*long*/ extensionList = GNOME.gnome_vfs_mime_get_extensions_list(mimePtr);

33618

+ long /*int*/ extensionList = GNOME.gnome_vfs_mime_get_extensions_list(mimePtr);

33619

if (extensionList != 0) {

33620

Vector extensions = new Vector();

33621

- int /*long*/ extensionElement = extensionList;

33622

+ long /*int*/ extensionElement = extensionList;

33623

while (extensionElement != 0) {

33624

OS.memmove(extensionData, extensionElement, OS.PTR_SIZEOF);

33625

- int /*long*/ extensionPtr = extensionData[0];

33626

+ long /*int*/ extensionPtr = extensionData[0];

33627

int extensionLength = OS.strlen(extensionPtr);

33628

byte[] extensionBuffer = new byte[extensionLength];

33629

OS.memmove(extensionBuffer, extensionPtr, extensionLength);

33630

@@ -475,7 +475,7 @@

33631

String mimeType = null;

33632

String fileName = "swt" + extension;

33633

byte[] extensionBuffer = Converter.wcsToMbcs(null, fileName, true);

33634

- int /*long*/ typeName = GNOME.gnome_vfs_mime_type_from_name(extensionBuffer);

33635

+ long /*int*/ typeName = GNOME.gnome_vfs_mime_type_from_name(extensionBuffer);

33636

if (typeName != 0) {

33637

int length = OS.strlen(typeName);

33638

if (length > 0) {

33639

@@ -490,7 +490,7 @@

33640

static Program gnome_getProgram(Display display, String mimeType) {

33641

Program program = null;

33642

byte[] mimeTypeBuffer = Converter.wcsToMbcs(null, mimeType, true);

33643

- int /*long*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer);

33644

+ long /*int*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer);

33645

if (ptr != 0) {

33646

program = new Program();

33647

program.display = display;

33648

@@ -507,9 +507,9 @@

33649

buffer = new byte[length + 1];

33650

OS.memmove(buffer, application.id, length);

33651

LONG gnomeIconTheme = (LONG)display.getData(ICON_THEME_DATA);

33652

- int /*long*/ icon_name = GNOME.gnome_icon_lookup(gnomeIconTheme.value, 0, null, buffer, 0, mimeTypeBuffer,

33653

+ long /*int*/ icon_name = GNOME.gnome_icon_lookup(gnomeIconTheme.value, 0, null, buffer, 0, mimeTypeBuffer,

33654

GNOME.GNOME_ICON_LOOKUP_FLAGS_NONE, null);

33655

- int /*long*/ path = 0;

33656

+ long /*int*/ path = 0;

33657

if (icon_name != 0) path = GNOME.gnome_icon_theme_lookup_icon(gnomeIconTheme.value, icon_name, PREFERRED_ICON_SIZE, null, null);

33658

if (path != 0) {

33659

length = OS.strlen(path);

33660

diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets/Button.java

33661

--- x86/org/eclipse/swt/widgets/Button.java 2009-05-29 17:30:04.000000000 -0400

33662

+++ x86_64/org/eclipse/swt/widgets/Button.java 2009-09-17 08:48:24.000000000 -0400

33663

@@ -46,7 +46,7 @@

33664

* @noextend This class is not intended to be subclassed by clients.

33665

*/

33666

public class Button extends Control {

33667

- int /*long*/ boxHandle, labelHandle, imageHandle, arrowHandle, groupHandle;

33668

+ long /*int*/ boxHandle, labelHandle, imageHandle, arrowHandle, groupHandle;

33669

boolean selected, grayed;

33670

ImageList imageList;

33671

Image image;

33672

@@ -165,7 +165,7 @@

33673

}

33674

if (wHint != SWT.DEFAULT || hHint != SWT.DEFAULT) {

33675

if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_CAN_DEFAULT) != 0) {

33676

- int /*long*/ [] buffer = new int /*long*/ [1];

33677

+ long /*int*/ [] buffer = new long /*int*/ [1];

33678

GtkBorder border = new GtkBorder ();

33679

OS.gtk_widget_style_get (handle, OS.default_border, buffer, 0);

33680

if (buffer[0] != 0) {

33681

@@ -266,7 +266,7 @@

33682

if (arrowHandle != 0) display.removeWidget (arrowHandle);

33683

}

33684

33685

-int /*long*/ fontHandle () {

33686

+long /*int*/ fontHandle () {

33687

if (labelHandle != 0) return labelHandle;

33688

return super.fontHandle ();

33689

}

33690

@@ -382,14 +382,14 @@

33691

return text;

33692

}

33693

33694

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

33695

- int /*long*/ result = super.gtk_button_press_event (widget, event);

33696

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

33697

+ long /*int*/ result = super.gtk_button_press_event (widget, event);

33698

if (result != 0) return result;

33699

if ((style & SWT.RADIO) != 0) selected = getSelection ();

33700

return result;

33701

}

33702

33703

-int /*long*/ gtk_clicked (int /*long*/ widget) {

33704

+long /*int*/ gtk_clicked (long /*int*/ widget) {

33705

if ((style & SWT.RADIO) != 0) {

33706

if ((parent.getStyle () & SWT.NO_RADIO_GROUP) != 0) {

33707

setSelection (!selected);

33708

@@ -411,8 +411,8 @@

33709

return 0;

33710

}

33711

33712

-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {

33713

- int /*long*/ result = super.gtk_focus_in_event (widget, event);

33714

+long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {

33715

+ long /*int*/ result = super.gtk_focus_in_event (widget, event);

33716

// widget could be disposed at this point

33717

if (handle == 0) return 0;

33718

if ((style & SWT.PUSH) != 0 && OS.GTK_WIDGET_HAS_DEFAULT (handle)) {

33719

@@ -422,8 +422,8 @@

33720

return result;

33721

}

33722

33723

-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {

33724

- int /*long*/ result = super.gtk_focus_out_event (widget, event);

33725

+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {

33726

+ long /*int*/ result = super.gtk_focus_out_event (widget, event);

33727

// widget could be disposed at this point

33728

if (handle == 0) return 0;

33729

if ((style & SWT.PUSH) != 0 && !OS.GTK_WIDGET_HAS_DEFAULT (handle)) {

33730

@@ -435,8 +435,8 @@

33731

return result;

33732

}

33733

33734

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {

33735

- int /*long*/ result = super.gtk_key_press_event (widget, event);

33736

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {

33737

+ long /*int*/ result = super.gtk_key_press_event (widget, event);

33738

if (result != 0) return result;

33739

if ((style & SWT.RADIO) != 0) selected = getSelection ();

33740

return result;

33741

@@ -640,7 +640,7 @@

33742

if (imageHandle != 0) setBackgroundColor(imageHandle, color);

33743

}

33744

33745

-void setFontDescription (int /*long*/ font) {

33746

+void setFontDescription (long /*int*/ font) {

33747

super.setFontDescription (font);

33748

if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);

33749

if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);

33750

@@ -715,7 +715,7 @@

33751

if (image.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);

33752

imageList = new ImageList ();

33753

int imageIndex = imageList.add (image);

33754

- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);

33755

+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);

33756

OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);

33757

if (text.length () == 0) OS.gtk_widget_hide (labelHandle);

33758

OS.gtk_widget_show (imageHandle);

33759

diff -urN x86/org/eclipse/swt/widgets/Canvas.java x86_64/org/eclipse/swt/widgets/Canvas.java

33760

--- x86/org/eclipse/swt/widgets/Canvas.java 2008-06-05 13:31:08.000000000 -0400

33761

+++ x86_64/org/eclipse/swt/widgets/Canvas.java 2009-09-17 08:48:24.000000000 -0400

33762

@@ -147,46 +147,46 @@

33763

return ime;

33764

}

33765

33766

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

33767

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

33768

if (ime != null) {

33769

- int /*long*/ result = ime.gtk_button_press_event (widget, event);

33770

+ long /*int*/ result = ime.gtk_button_press_event (widget, event);

33771

if (result != 0) return result;

33772

}

33773

return super.gtk_button_press_event (widget, event);

33774

}

33775

33776

-int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ text) {

33777

+long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ text) {

33778

if (ime != null) {

33779

- int /*long*/ result = ime.gtk_commit (imcontext, text);

33780

+ long /*int*/ result = ime.gtk_commit (imcontext, text);

33781

if (result != 0) return result;

33782

}

33783

return super.gtk_commit (imcontext, text);

33784

}

33785

33786

-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) {

33787

+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) {

33788

if ((state & OBSCURED) != 0) return 0;

33789

boolean isFocus = caret != null && caret.isFocusCaret ();

33790

if (isFocus) caret.killFocus ();

33791

- int /*long*/ result = super.gtk_expose_event (widget, event);

33792

+ long /*int*/ result = super.gtk_expose_event (widget, event);

33793

if (isFocus) caret.setFocus ();

33794

return result;

33795

}

33796

33797

-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {

33798

- int /*long*/ result = super.gtk_focus_in_event (widget, event);

33799

+long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {

33800

+ long /*int*/ result = super.gtk_focus_in_event (widget, event);

33801

if (caret != null) caret.setFocus ();

33802

return result;

33803

}

33804

33805

-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {

33806

- int /*long*/ result = super.gtk_focus_out_event (widget, event);

33807

+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {

33808

+ long /*int*/ result = super.gtk_focus_out_event (widget, event);

33809

if (caret != null) caret.killFocus ();

33810

return result;

33811

}

33812

33813

-int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {

33814

+long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) {

33815

if (ime != null) {

33816

- int /*long*/ result = ime.gtk_preedit_changed (imcontext);

33817

+ long /*int*/ result = ime.gtk_preedit_changed (imcontext);

33818

if (result != 0) return result;

33819

}

33820

return super.gtk_preedit_changed (imcontext);

33821

@@ -246,16 +246,16 @@

33822

if (!isVisible ()) return;

33823

boolean isFocus = caret != null && caret.isFocusCaret ();

33824

if (isFocus) caret.killFocus ();

33825

- int /*long*/ window = paintWindow ();

33826

- int /*long*/ visibleRegion = OS.gdk_drawable_get_visible_region (window);

33827

+ long /*int*/ window = paintWindow ();

33828

+ long /*int*/ visibleRegion = OS.gdk_drawable_get_visible_region (window);

33829

GdkRectangle srcRect = new GdkRectangle ();

33830

srcRect.x = x;

33831

srcRect.y = y;

33832

srcRect.width = width;

33833

srcRect.height = height;

33834

- int /*long*/ copyRegion = OS.gdk_region_rectangle (srcRect);

33835

+ long /*int*/ copyRegion = OS.gdk_region_rectangle (srcRect);

33836

OS.gdk_region_intersect(copyRegion, visibleRegion);

33837

- int /*long*/ invalidateRegion = OS.gdk_region_rectangle (srcRect);

33838

+ long /*int*/ invalidateRegion = OS.gdk_region_rectangle (srcRect);

33839

OS.gdk_region_subtract (invalidateRegion, visibleRegion);

33840

OS.gdk_region_offset (invalidateRegion, deltaX, deltaY);

33841

GdkRectangle copyRect = new GdkRectangle();

33842

@@ -272,7 +272,7 @@

33843

// GC gc = new GC (this);

33844

// gc.copyArea (x, y, width, height, destX, destY);

33845

// gc.dispose ();

33846

- int /*long*/ gdkGC = OS.gdk_gc_new (window);

33847

+ long /*int*/ gdkGC = OS.gdk_gc_new (window);

33848

OS.gdk_gc_set_exposures (gdkGC, true);

33849

OS.gdk_draw_drawable (window, gdkGC, window, copyRect.x, copyRect.y, copyRect.x + deltaX, copyRect.y + deltaY, copyRect.width, copyRect.height);

33850

OS.g_object_unref (gdkGC);

33851

@@ -394,7 +394,7 @@

33852

}

33853

33854

void updateCaret () {

33855

- int /*long*/ imHandle = imHandle ();

33856

+ long /*int*/ imHandle = imHandle ();

33857

if (imHandle == 0) return;

33858

GdkRectangle rect = new GdkRectangle ();

33859

rect.x = caret.x;

33860

diff -urN x86/org/eclipse/swt/widgets/Caret.java x86_64/org/eclipse/swt/widgets/Caret.java

33861

--- x86/org/eclipse/swt/widgets/Caret.java 2009-05-29 17:30:04.000000000 -0400

33862

+++ x86_64/org/eclipse/swt/widgets/Caret.java 2009-09-17 08:48:24.000000000 -0400

33863

@@ -97,13 +97,13 @@

33864

boolean drawCaret () {

33865

if (parent == null) return false;

33866

if (parent.isDisposed ()) return false;

33867

- int /*long*/ window = parent.paintWindow ();

33868

- int /*long*/ gc = OS.gdk_gc_new (window);

33869

+ long /*int*/ window = parent.paintWindow ();

33870

+ long /*int*/ gc = OS.gdk_gc_new (window);

33871

GdkColor color = new GdkColor ();

33872

color.red = (short) 0xffff;

33873

color.green = (short) 0xffff;

33874

color.blue = (short) 0xffff;

33875

- int /*long*/ colormap = OS.gdk_colormap_get_system ();

33876

+ long /*int*/ colormap = OS.gdk_colormap_get_system ();

33877

OS.gdk_colormap_alloc_color (colormap, color, true, true);

33878

OS.gdk_gc_set_foreground (gc, color);

33879

OS.gdk_gc_set_function (gc, OS.GDK_XOR);

33880

diff -urN x86/org/eclipse/swt/widgets/ColorDialog.java x86_64/org/eclipse/swt/widgets/ColorDialog.java

33881

--- x86/org/eclipse/swt/widgets/ColorDialog.java 2009-05-29 17:30:04.000000000 -0400

33882

+++ x86_64/org/eclipse/swt/widgets/ColorDialog.java 2009-09-17 08:48:24.000000000 -0400

33883

@@ -114,12 +114,12 @@

33884

*/

33885

public RGB open () {

33886

byte [] buffer = Converter.wcsToMbcs (null, title, true);

33887

- int /*long*/ handle = OS.gtk_color_selection_dialog_new (buffer);

33888

+ long /*int*/ handle = OS.gtk_color_selection_dialog_new (buffer);

33889

Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();

33890

if (parent != null) {

33891

- int /*long*/ shellHandle = parent.topHandle ();

33892

+ long /*int*/ shellHandle = parent.topHandle ();

33893

OS.gtk_window_set_transient_for (handle, shellHandle);

33894

- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);

33895

+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);

33896

if (pixbufs != 0) {

33897

OS.gtk_window_set_icon_list (handle, pixbufs);

33898

OS.g_list_free (pixbufs);

33899

@@ -143,7 +143,7 @@

33900

display.setModalDialog (this);

33901

}

33902

int signalId = 0;

33903

- int /*long*/ hookId = 0;

33904

+ long /*int*/ hookId = 0;

33905

if ((style & SWT.RIGHT_TO_LEFT) != 0) {

33906

signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());

33907

hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);

33908

diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/Combo.java

33909

--- x86/org/eclipse/swt/widgets/Combo.java 2009-05-29 17:30:04.000000000 -0400

33910

+++ x86_64/org/eclipse/swt/widgets/Combo.java 2009-09-17 08:48:24.000000000 -0400

33911

@@ -57,9 +57,9 @@

33912

* @noextend This class is not intended to be subclassed by clients.

33913

*/

33914

public class Combo extends Composite {

33915

- int /*long*/ buttonHandle, entryHandle, listHandle, textRenderer, cellHandle, popupHandle;

33916

+ long /*int*/ buttonHandle, entryHandle, listHandle, textRenderer, cellHandle, popupHandle;

33917

int lastEventTime, visibleCount = 5;

33918

- int /*long*/ gdkEventKey = 0;

33919

+ long /*int*/ gdkEventKey = 0;

33920

int fixStart = -1, fixEnd = -1;

33921

String [] items = new String [0];

33922

boolean ignoreSelect, lockText;

33923

@@ -182,13 +182,13 @@

33924

* stopping the "delete" and "insert_text" signal emission.

33925

*/

33926

ignoreSelect = lockText = true;

33927

- int /*long*/ item = OS.gtk_list_item_new_with_label (buffer);

33928

- int /*long*/ label = OS.gtk_bin_get_child (item);

33929

+ long /*int*/ item = OS.gtk_list_item_new_with_label (buffer);

33930

+ long /*int*/ label = OS.gtk_bin_get_child (item);

33931

setForegroundColor (label, getForegroundColor ());

33932

OS.gtk_widget_modify_font (label, getFontDescription ());

33933

OS.gtk_widget_set_direction (label, OS.gtk_widget_get_direction (handle));

33934

OS.gtk_widget_show (item);

33935

- int /*long*/ items = OS.g_list_append (0, item);

33936

+ long /*int*/ items = OS.g_list_append (0, item);

33937

OS.gtk_list_insert_items (listHandle, items, index);

33938

ignoreSelect = lockText = false;

33939

}

33940

@@ -343,9 +343,9 @@

33941

if ((style & SWT.READ_ONLY) != 0) {

33942

int index = OS.gtk_combo_box_get_active (handle);

33943

if (index != -1) {

33944

- int /*long*/ modelHandle = OS.gtk_combo_box_get_model (handle);

33945

- int /*long*/ [] ptr = new int /*long*/ [1];

33946

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

33947

+ long /*int*/ modelHandle = OS.gtk_combo_box_get_model (handle);

33948

+ long /*int*/ [] ptr = new long /*int*/ [1];

33949

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

33950

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

33951

OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);

33952

OS.g_free (iter);

33953

@@ -369,10 +369,10 @@

33954

if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;

33955

int[] w = new int [1], h = new int [1];

33956

OS.gtk_widget_realize (entryHandle);

33957

- int /*long*/ layout = OS.gtk_entry_get_layout (entryHandle);

33958

+ long /*int*/ layout = OS.gtk_entry_get_layout (entryHandle);

33959

OS.pango_layout_get_size (layout, w, h);

33960

int xborder = Display.INNER_BORDER, yborder = Display.INNER_BORDER;

33961

- int /*long*/ style = OS.gtk_widget_get_style (entryHandle);

33962

+ long /*int*/ style = OS.gtk_widget_get_style (entryHandle);

33963

xborder += OS.gtk_style_get_xthickness (style);

33964

yborder += OS.gtk_style_get_ythickness (style);

33965

int [] property = new int [1];

33966

@@ -388,7 +388,7 @@

33967

GtkRequisition arrowRequesition = new GtkRequisition ();

33968

OS.gtk_widget_size_request (buttonHandle, arrowRequesition);

33969

GtkRequisition listRequesition = new GtkRequisition ();

33970

- int /*long*/ listParent = OS.gtk_widget_get_parent (listHandle);

33971

+ long /*int*/ listParent = OS.gtk_widget_get_parent (listHandle);

33972

OS.gtk_widget_size_request (listParent != 0 ? listParent : listHandle, listRequesition);

33973

33974

width = Math.max (listRequesition.width, width) + arrowRequesition.width + 4;

33975

@@ -421,7 +421,7 @@

33976

if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);

33977

OS.gtk_fixed_set_has_window (fixedHandle, true);

33978

if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {

33979

- int /*long*/ oldList = OS.gtk_window_list_toplevels ();

33980

+ long /*int*/ oldList = OS.gtk_window_list_toplevels ();

33981

if ((style & SWT.READ_ONLY) != 0) {

33982

handle = OS.gtk_combo_box_new_text ();

33983

if (handle == 0) error (SWT.ERROR_NO_HANDLES);

33984

@@ -467,9 +467,9 @@

33985

*/

33986

OS.gtk_container_forall (handle, display.allChildrenProc, 0);

33987

if (display.allChildren != 0) {

33988

- int /*long*/ list = display.allChildren;

33989

+ long /*int*/ list = display.allChildren;

33990

while (list != 0) {

33991

- int /*long*/ widget = OS.g_list_data (list);

33992

+ long /*int*/ widget = OS.g_list_data (list);

33993

if (OS.GTK_IS_BUTTON (widget)) {

33994

buttonHandle = widget;

33995

break;

33996

@@ -498,14 +498,14 @@

33997

listHandle = combo.list;

33998

33999

if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {

34000

- int /*long*/ parentHandle = 0;

34001

- int /*long*/ temp = listHandle;

34002

+ long /*int*/ parentHandle = 0;

34003

+ long /*int*/ temp = listHandle;

34004

while ((temp = OS.gtk_widget_get_parent(temp)) != 0) {

34005

parentHandle = temp;

34006

}

34007

popupHandle = parentHandle;

34008

if (popupHandle != 0) {

34009

- int /*long*/ modalGroup = getShell().modalGroup;

34010

+ long /*int*/ modalGroup = getShell().modalGroup;

34011

if (modalGroup != 0) {

34012

OS.gtk_window_group_add_window (modalGroup, popupHandle);

34013

}

34014

@@ -518,11 +518,11 @@

34015

* to hook events. The fix is to find the first child that is

34016

* not the entry or list and assume this is the arrow handle.

34017

*/

34018

- int /*long*/ list = OS.gtk_container_get_children (handle);

34019

+ long /*int*/ list = OS.gtk_container_get_children (handle);

34020

if (list != 0) {

34021

int i = 0, count = OS.g_list_length (list);

34022

while (i<count) {

34023

- int /*long*/ childHandle = OS.g_list_nth_data (list, i);

34024

+ long /*int*/ childHandle = OS.g_list_nth_data (list, i);

34025

if (childHandle != entryHandle && childHandle != listHandle) {

34026

buttonHandle = childHandle;

34027

break;

34028

@@ -563,15 +563,15 @@

34029

if (buttonHandle != 0) display.removeWidget (buttonHandle);

34030

if (entryHandle != 0) display.removeWidget (entryHandle);

34031

if (listHandle != 0) display.removeWidget (listHandle);

34032

- int /*long*/ imContext = imContext ();

34033

+ long /*int*/ imContext = imContext ();

34034

if (imContext != 0) display.removeWidget (imContext);

34035

}

34036

34037

-boolean filterKey (int keyval, int /*long*/ event) {

34038

+boolean filterKey (int keyval, long /*int*/ event) {

34039

int time = OS.gdk_event_get_time (event);

34040

if (time != lastEventTime) {

34041

lastEventTime = time;

34042

- int /*long*/ imContext = imContext ();

34043

+ long /*int*/ imContext = imContext ();

34044

if (imContext != 0) {

34045

return OS.gtk_im_context_filter_keypress (imContext, event);

34046

}

34047

@@ -580,18 +580,18 @@

34048

return false;

34049

}

34050

34051

-int /*long*/ findPopupHandle (int /*long*/ oldList) {

34052

- int /*long*/ hdl = 0;

34053

- int /*long*/ currentList = OS.gtk_window_list_toplevels();

34054

- int /*long*/ oldFromList = oldList;

34055

- int /*long*/ newFromList = currentList;

34056

+long /*int*/ findPopupHandle (long /*int*/ oldList) {

34057

+ long /*int*/ hdl = 0;

34058

+ long /*int*/ currentList = OS.gtk_window_list_toplevels();

34059

+ long /*int*/ oldFromList = oldList;

34060

+ long /*int*/ newFromList = currentList;

34061

boolean isFound;

34062

while (newFromList != 0) {

34063

- int /*long*/ newToplevel = OS.g_list_data(newFromList);

34064

+ long /*int*/ newToplevel = OS.g_list_data(newFromList);

34065

isFound = false;

34066

oldFromList = oldList;

34067

while (oldFromList != 0) {

34068

- int /*long*/ oldToplevel = OS.g_list_data(oldFromList);

34069

+ long /*int*/ oldToplevel = OS.g_list_data(oldFromList);

34070

if (newToplevel == oldToplevel) {

34071

isFound = true;

34072

break;

34073

@@ -609,7 +609,7 @@

34074

return hdl;

34075

}

34076

34077

-void fixModal (int /*long*/ group, int /*long*/ modalGroup) {

34078

+void fixModal (long /*int*/ group, long /*int*/ modalGroup) {

34079

if (popupHandle != 0) {

34080

if (group != 0) {

34081

OS.gtk_window_group_add_window (group, popupHandle);

34082

@@ -631,7 +631,7 @@

34083

* filter has to be called by SWT.

34084

*/

34085

if (gdkEventKey != 0 && gdkEventKey != -1) {

34086

- int /*long*/ imContext = imContext ();

34087

+ long /*int*/ imContext = imContext ();

34088

if (imContext != 0) {

34089

OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);

34090

gdkEventKey = -1;

34091

@@ -641,12 +641,12 @@

34092

gdkEventKey = 0;

34093

}

34094

34095

-int /*long*/ fontHandle () {

34096

+long /*int*/ fontHandle () {

34097

if (entryHandle != 0) return entryHandle;

34098

return super.fontHandle ();

34099

}

34100

34101

-int /*long*/ focusHandle () {

34102

+long /*int*/ focusHandle () {

34103

if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {

34104

if ((style & SWT.READ_ONLY) != 0 && buttonHandle != 0) return buttonHandle;

34105

}

34106

@@ -676,9 +676,9 @@

34107

}

34108

int eventMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK |

34109

OS.GDK_BUTTON_RELEASE_MASK;

34110

- int /*long*/ [] handles = new int /*long*/ [] {buttonHandle, entryHandle, listHandle};

34111

+ long /*int*/ [] handles = new long /*int*/ [] {buttonHandle, entryHandle, listHandle};

34112

for (int i=0; i<handles.length; i++) {

34113

- int /*long*/ eventHandle = handles [i];

34114

+ long /*int*/ eventHandle = handles [i];

34115

if (eventHandle != 0) {

34116

/* Connect the mouse signals */

34117

OS.gtk_widget_add_events (eventHandle, eventMask);

34118

@@ -702,7 +702,7 @@

34119

}

34120

}

34121

}

34122

- int /*long*/ imContext = imContext ();

34123

+ long /*int*/ imContext = imContext ();

34124

if (imContext != 0) {

34125

OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false);

34126

int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());

34127

@@ -711,7 +711,7 @@

34128

}

34129

}

34130

34131

-int /*long*/ imContext () {

34132

+long /*int*/ imContext () {

34133

return entryHandle != 0 ? OS.GTK_ENTRY_IM_CONTEXT (entryHandle) : 0;

34134

}

34135

34136

@@ -736,8 +736,8 @@

34137

}

34138

} else {

34139

ignoreSelect = true;

34140

- int /*long*/ children = OS.gtk_container_get_children (listHandle);

34141

- int /*long*/ item = OS.g_list_nth_data (children, index);

34142

+ long /*int*/ children = OS.gtk_container_get_children (listHandle);

34143

+ long /*int*/ item = OS.g_list_nth_data (children, index);

34144

boolean selected = OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED;

34145

if (selected) {

34146

OS.gtk_list_unselect_all (listHandle);

34147

@@ -778,9 +778,9 @@

34148

if (filter && entryHandle != 0) {

34149

int [] index = new int [1];

34150

int [] trailing = new int [1];

34151

- int /*long*/ layout = OS.gtk_entry_get_layout (entryHandle);

34152

+ long /*int*/ layout = OS.gtk_entry_get_layout (entryHandle);

34153

OS.pango_layout_xy_to_index (layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, trailing);

34154

- int /*long*/ ptr = OS.pango_layout_get_text (layout);

34155

+ long /*int*/ ptr = OS.pango_layout_get_text (layout);

34156

int position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];

34157

Point selection = getSelection ();

34158

if (selection.x <= position && position < selection.y) {

34159

@@ -794,11 +794,11 @@

34160

return super.dragDetect (x, y, filter, consume);

34161

}

34162

34163

-int /*long*/ enterExitHandle () {

34164

+long /*int*/ enterExitHandle () {

34165

return fixedHandle;

34166

}

34167

34168

-int /*long*/ eventWindow () {

34169

+long /*int*/ eventWindow () {

34170

return paintWindow ();

34171

}

34172

34173

@@ -963,7 +963,7 @@

34174

int index = OS.gtk_combo_box_get_active (handle);

34175

if (index != -1) length = getItem (index).length ();

34176

} else {

34177

- int /*long*/ str = OS.gtk_entry_get_text (entryHandle);

34178

+ long /*int*/ str = OS.gtk_entry_get_text (entryHandle);

34179

if (str != 0) length = (int)/*64*/OS.g_utf8_strlen (str, -1);

34180

}

34181

return new Point (0, length);

34182

@@ -993,10 +993,10 @@

34183

return OS.gtk_combo_box_get_active (handle);

34184

}

34185

int index = 0, result = -1;

34186

- int /*long*/ children = OS.gtk_container_get_children (listHandle);

34187

- int /*long*/ temp = children;

34188

+ long /*int*/ children = OS.gtk_container_get_children (listHandle);

34189

+ long /*int*/ temp = children;

34190

while (temp != 0) {

34191

- int /*long*/ item = OS.g_list_data (temp);

34192

+ long /*int*/ item = OS.g_list_data (temp);

34193

if (OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED) {

34194

result = index;

34195

break;

34196

@@ -1023,7 +1023,7 @@

34197

public String getText () {

34198

checkWidget();

34199

if (entryHandle != 0) {

34200

- int /*long*/ str = OS.gtk_entry_get_text (entryHandle);

34201

+ long /*int*/ str = OS.gtk_entry_get_text (entryHandle);

34202

if (str == 0) return "";

34203

int length = OS.strlen (str);

34204

byte [] buffer = new byte [length];

34205

@@ -1104,12 +1104,12 @@

34206

return visibleCount;

34207

}

34208

34209

-int /*long*/ gtk_activate (int /*long*/ widget) {

34210

+long /*int*/ gtk_activate (long /*int*/ widget) {

34211

postEvent (SWT.DefaultSelection);

34212

return 0;

34213

}

34214

34215

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

34216

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

34217

/*

34218

* Feature in GTK. Depending on where the user clicks, GTK prevents

34219

* the left mouse button event from being propagated. The fix is to

34220

@@ -1125,7 +1125,7 @@

34221

return super.gtk_button_press_event (widget, event);

34222

}

34223

34224

-int /*long*/ gtk_changed (int /*long*/ widget) {

34225

+long /*int*/ gtk_changed (long /*int*/ widget) {

34226

if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {

34227

if (widget == handle) {

34228

if (entryHandle == 0) {

34229

@@ -1149,7 +1149,7 @@

34230

}

34231

} else {

34232

if (!ignoreSelect) {

34233

- int /*long*/ ptr = OS.gtk_entry_get_text (entryHandle);

34234

+ long /*int*/ ptr = OS.gtk_entry_get_text (entryHandle);

34235

int length = OS.strlen (ptr);

34236

byte [] buffer = new byte [length];

34237

OS.memmove (buffer, ptr, length);

34238

@@ -1170,7 +1170,7 @@

34239

* is to post the modify event when the user is typing.

34240

*/

34241

boolean keyPress = false;

34242

- int /*long*/ eventPtr = OS.gtk_get_current_event ();

34243

+ long /*int*/ eventPtr = OS.gtk_get_current_event ();

34244

if (eventPtr != 0) {

34245

GdkEventKey gdkEvent = new GdkEventKey ();

34246

OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);

34247

@@ -1189,7 +1189,7 @@

34248

return 0;

34249

}

34250

34251

-int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) {

34252

+long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {

34253

if (text == 0) return 0;

34254

if (!OS.gtk_editable_get_editable (entryHandle)) return 0;

34255

int length = OS.strlen (text);

34256

@@ -1227,7 +1227,7 @@

34257

return 0;

34258

}

34259

34260

-int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /*long*/ end_pos) {

34261

+long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) {

34262

if (lockText) {

34263

OS.gtk_list_unselect_item (listHandle, 0);

34264

OS.g_signal_stop_emission_by_name (entryHandle, OS.delete_text);

34265

@@ -1253,7 +1253,7 @@

34266

return 0;

34267

}

34268

34269

-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {

34270

+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {

34271

/*

34272

* Feature in GTK. Depending on where the user clicks, GTK prevents

34273

* the left mouse button event from being propagated. The fix is to

34274

@@ -1305,12 +1305,12 @@

34275

return super.gtk_event_after(widget, gdkEvent);

34276

}

34277

34278

-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {

34279

+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {

34280

fixIM ();

34281

return super.gtk_focus_out_event (widget, event);

34282

}

34283

34284

-int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*long*/ new_text_length, int /*long*/ position) {

34285

+long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /*int*/ new_text_length, long /*int*/ position) {

34286

if (lockText) {

34287

OS.gtk_list_unselect_item (listHandle, 0);

34288

OS.g_signal_stop_emission_by_name (entryHandle, OS.insert_text);

34289

@@ -1324,7 +1324,7 @@

34290

int [] pos = new int [1];

34291

OS.memmove (pos, position, 4);

34292

if (pos [0] == -1) {

34293

- int /*long*/ ptr = OS.gtk_entry_get_text (entryHandle);

34294

+ long /*int*/ ptr = OS.gtk_entry_get_text (entryHandle);

34295

pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);

34296

}

34297

String newText = verifyText (oldText, pos [0], pos [0]);

34298

@@ -1356,8 +1356,8 @@

34299

return 0;

34300

}

34301

34302

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {

34303

- int /*long*/ result = super.gtk_key_press_event (widget, event);

34304

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {

34305

+ long /*int*/ result = super.gtk_key_press_event (widget, event);

34306

if (result != 0) fixIM ();

34307

if (gdkEventKey == -1) result = 1;

34308

gdkEventKey = 0;

34309

@@ -1403,7 +1403,7 @@

34310

return result;

34311

}

34312

34313

-int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) {

34314

+long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) {

34315

if ((style & SWT.RIGHT_TO_LEFT) != 0) {

34316

OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);

34317

OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);

34318

@@ -1470,14 +1470,14 @@

34319

return super.isFocusHandle (widget);

34320

}

34321

34322

-int /*long*/ paintWindow () {

34323

- int /*long*/ childHandle = entryHandle != 0 ? entryHandle : handle;

34324

+long /*int*/ paintWindow () {

34325

+ long /*int*/ childHandle = entryHandle != 0 ? entryHandle : handle;

34326

OS.gtk_widget_realize (childHandle);

34327

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (childHandle);

34328

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (childHandle);

34329

if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {

34330

if ((style & SWT.READ_ONLY) != 0) return window;

34331

}

34332

- int /*long*/ children = OS.gdk_window_get_children (window);

34333

+ long /*int*/ children = OS.gdk_window_get_children (window);

34334

if (children != 0) window = OS.g_list_data (children);

34335

OS.g_list_free (children);

34336

return window;

34337

@@ -1502,7 +1502,7 @@

34338

if (entryHandle != 0) OS.gtk_editable_paste_clipboard (entryHandle);

34339

}

34340

34341

-int /*long*/ parentingHandle() {

34342

+long /*int*/ parentingHandle() {

34343

return fixedHandle;

34344

}

34345

34346

@@ -1511,7 +1511,7 @@

34347

if (buttonHandle != 0) display.addWidget (buttonHandle, this);

34348

if (entryHandle != 0) display.addWidget (entryHandle, this);

34349

if (listHandle != 0) display.addWidget (listHandle, this);

34350

- int /*long*/ imContext = imContext ();

34351

+ long /*int*/ imContext = imContext ();

34352

if (imContext != 0) display.addWidget (imContext, this);

34353

}

34354

34355

@@ -1555,10 +1555,10 @@

34356

OS.gtk_combo_box_remove_text (handle, index);

34357

} else {

34358

ignoreSelect = true;

34359

- int /*long*/ children = OS.gtk_container_get_children (listHandle);

34360

- int /*long*/ item = OS.g_list_nth_data (children, index);

34361

+ long /*int*/ children = OS.gtk_container_get_children (listHandle);

34362

+ long /*int*/ item = OS.g_list_nth_data (children, index);

34363

boolean selected = OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED;

34364

- int /*long*/ items = OS.g_list_append (0, item);

34365

+ long /*int*/ items = OS.g_list_append (0, item);

34366

OS.gtk_list_remove_items (listHandle, items);

34367

OS.g_list_free (items);

34368

OS.g_list_free (children);

34369

@@ -1605,10 +1605,10 @@

34370

} else {

34371

boolean selected = false;

34372

ignoreSelect = true;

34373

- int /*long*/ items = 0;

34374

- int /*long*/ children = OS.gtk_container_get_children (listHandle);

34375

+ long /*int*/ items = 0;

34376

+ long /*int*/ children = OS.gtk_container_get_children (listHandle);

34377

for (int i = start; i <= end; i++) {

34378

- int /*long*/ item = OS.g_list_nth_data (children, i);

34379

+ long /*int*/ item = OS.g_list_nth_data (children, i);

34380

selected |= OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED;

34381

items = OS.g_list_append (items, item);

34382

}

34383

@@ -1798,7 +1798,7 @@

34384

return super.setBounds (x, y, width, newHeight, move, resize);

34385

}

34386

34387

-void setFontDescription (int /*long*/ font) {

34388

+void setFontDescription (long /*int*/ font) {

34389

super.setFontDescription (font);

34390

if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {

34391

if (entryHandle != 0) OS.gtk_widget_modify_font (entryHandle, font);

34392

@@ -1819,11 +1819,11 @@

34393

OS.gtk_widget_modify_font (entryHandle, font);

34394

if (listHandle != 0) {

34395

OS.gtk_widget_modify_font (listHandle, font);

34396

- int /*long*/ itemsList = OS.gtk_container_get_children (listHandle);

34397

+ long /*int*/ itemsList = OS.gtk_container_get_children (listHandle);

34398

if (itemsList != 0) {

34399

int count = OS.g_list_length (itemsList);

34400

for (int i=count - 1; i>=0; i--) {

34401

- int /*long*/ widget = OS.gtk_bin_get_child (OS.g_list_nth_data (itemsList, i));

34402

+ long /*int*/ widget = OS.gtk_bin_get_child (OS.g_list_nth_data (itemsList, i));

34403

OS.gtk_widget_modify_font (widget, font);

34404

}

34405

OS.g_list_free (itemsList);

34406

@@ -1841,11 +1841,11 @@

34407

setForegroundColor (entryHandle, color);

34408

if (listHandle != 0) {

34409

setForegroundColor (listHandle, color);

34410

- int /*long*/ itemsList = OS.gtk_container_get_children (listHandle);

34411

+ long /*int*/ itemsList = OS.gtk_container_get_children (listHandle);

34412

if (itemsList != 0) {

34413

int count = OS.g_list_length (itemsList);

34414

for (int i=count - 1; i>=0; i--) {

34415

- int /*long*/ widget = OS.gtk_bin_get_child (OS.g_list_nth_data (itemsList, i));

34416

+ long /*int*/ widget = OS.gtk_bin_get_child (OS.g_list_nth_data (itemsList, i));

34417

setForegroundColor (widget, color);

34418

}

34419

OS.g_list_free (itemsList);

34420

@@ -1886,9 +1886,9 @@

34421

}

34422

} else {

34423

ignoreSelect = true;

34424

- int /*long*/ children = OS.gtk_container_get_children (listHandle);

34425

- int /*long*/ item = OS.g_list_nth_data (children, index);

34426

- int /*long*/ label = OS.gtk_bin_get_child (item);

34427

+ long /*int*/ children = OS.gtk_container_get_children (listHandle);

34428

+ long /*int*/ item = OS.g_list_nth_data (children, index);

34429

+ long /*int*/ label = OS.gtk_bin_get_child (item);

34430

OS.gtk_label_set_text (label, buffer);

34431

OS.g_list_free (children);

34432

ignoreSelect = false;

34433

@@ -1934,15 +1934,15 @@

34434

} else {

34435

lockText = ignoreSelect = true;

34436

OS.gtk_list_clear_items (listHandle, 0, -1);

34437

- int /*long*/ font = getFontDescription ();

34438

+ long /*int*/ font = getFontDescription ();

34439

GdkColor color = getForegroundColor ();

34440

int direction = OS.gtk_widget_get_direction (handle);

34441

int i = 0;

34442

while (i < items.length) {

34443

String string = items [i];

34444

byte [] buffer = Converter.wcsToMbcs (null, string, true);

34445

- int /*long*/ item = OS.gtk_list_item_new_with_label (buffer);

34446

- int /*long*/ label = OS.gtk_bin_get_child (item);

34447

+ long /*int*/ item = OS.gtk_list_item_new_with_label (buffer);

34448

+ long /*int*/ label = OS.gtk_bin_get_child (item);

34449

setForegroundColor (label, color);

34450

OS.gtk_widget_modify_font (label, font);

34451

OS.gtk_widget_set_direction (label, direction);

34452

@@ -2020,11 +2020,11 @@

34453

if (entryHandle != 0) OS.gtk_widget_set_direction (entryHandle, dir);

34454

if (listHandle != 0) {

34455

OS.gtk_widget_set_direction (listHandle, dir);

34456

- int /*long*/ itemsList = OS.gtk_container_get_children (listHandle);

34457

+ long /*int*/ itemsList = OS.gtk_container_get_children (listHandle);

34458

if (itemsList != 0) {

34459

int count = OS.g_list_length (itemsList);

34460

for (int i=count - 1; i>=0; i--) {

34461

- int /*long*/ widget = OS.gtk_bin_get_child (OS.g_list_nth_data (itemsList, i));

34462

+ long /*int*/ widget = OS.gtk_bin_get_child (OS.g_list_nth_data (itemsList, i));

34463

OS.gtk_widget_set_direction (widget, dir);

34464

}

34465

OS.g_list_free (itemsList);

34466

@@ -2111,7 +2111,7 @@

34467

* fix is to block the firing of these events and fire them ourselves in a consistent manner.

34468

*/

34469

if (hooks (SWT.Verify) || filters (SWT.Verify)) {

34470

- int /*long*/ ptr = OS.gtk_entry_get_text (entryHandle);

34471

+ long /*int*/ ptr = OS.gtk_entry_get_text (entryHandle);

34472

string = verifyText (string, 0, (int)/*64*/OS.g_utf8_strlen (ptr, -1));

34473

if (string == null) return;

34474

}

34475

@@ -2195,9 +2195,9 @@

34476

switch (key) {

34477

case OS.GDK_KP_Enter:

34478

case OS.GDK_Return: {

34479

- int /*long*/ imContext = imContext ();

34480

+ long /*int*/ imContext = imContext ();

34481

if (imContext != 0) {

34482

- int /*long*/ [] preeditString = new int /*long*/ [1];

34483

+ long /*int*/ [] preeditString = new long /*int*/ [1];

34484

OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);

34485

if (preeditString [0] != 0) {

34486

int length = OS.strlen (preeditString [0]);

34487

@@ -2216,7 +2216,7 @@

34488

event.text = string;

34489

event.start = start;

34490

event.end = end;

34491

- int /*long*/ eventPtr = OS.gtk_get_current_event ();

34492

+ long /*int*/ eventPtr = OS.gtk_get_current_event ();

34493

if (eventPtr != 0) {

34494

GdkEventKey gdkEvent = new GdkEventKey ();

34495

OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);

34496

diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widgets/Composite.java

34497

--- x86/org/eclipse/swt/widgets/Composite.java 2009-05-29 17:30:04.000000000 -0400

34498

+++ x86_64/org/eclipse/swt/widgets/Composite.java 2009-09-17 08:48:24.000000000 -0400

34499

@@ -47,8 +47,8 @@

34500

* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>

34501

*/

34502

public class Composite extends Scrollable {

34503

- public int /*long*/ embeddedHandle;

34504

- int /*long*/ imHandle, socketHandle;

34505

+ public long /*int*/ embeddedHandle;

34506

+ long /*int*/ imHandle, socketHandle;

34507

Layout layout;

34508

Control[] tabList;

34509

int layoutCount, backgroundMode;

34510

@@ -101,15 +101,15 @@

34511

}

34512

34513

Control [] _getChildren () {

34514

- int /*long*/ parentHandle = parentingHandle ();

34515

- int /*long*/ list = OS.gtk_container_get_children (parentHandle);

34516

+ long /*int*/ parentHandle = parentingHandle ();

34517

+ long /*int*/ list = OS.gtk_container_get_children (parentHandle);

34518

if (list == 0) return new Control [0];

34519

int count = OS.g_list_length (list);

34520

Control [] children = new Control [count];

34521

int i = 0;

34522

- int /*long*/ temp = list;

34523

+ long /*int*/ temp = list;

34524

while (temp != 0) {

34525

- int /*long*/ handle = OS.g_list_data (temp);

34526

+ long /*int*/ handle = OS.g_list_data (temp);

34527

if (handle != 0) {

34528

Widget widget = display.getWidget (handle);

34529

if (widget != null && widget != this) {

34530

@@ -203,7 +203,7 @@

34531

/* Do nothing - Subclassing is allowed */

34532

}

34533

34534

-int /*long*/ childStyle () {

34535

+long /*int*/ childStyle () {

34536

if (scrolledHandle != 0) return 0;

34537

return super.childStyle ();

34538

}

34539

@@ -263,9 +263,9 @@

34540

if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);

34541

OS.gtk_fixed_set_has_window (fixedHandle, true);

34542

}

34543

- int /*long*/ vadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);

34544

+ long /*int*/ vadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);

34545

if (vadj == 0) error (SWT.ERROR_NO_HANDLES);

34546

- int /*long*/ hadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);

34547

+ long /*int*/ hadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);

34548

if (hadj == 0) error (SWT.ERROR_NO_HANDLES);

34549

scrolledHandle = OS.gtk_scrolled_window_new (hadj, vadj);

34550

if (scrolledHandle == 0) SWT.error (SWT.ERROR_NO_HANDLES);

34551

@@ -333,7 +333,7 @@

34552

Control control = findBackgroundControl ();

34553

if (control != null) {

34554

GCData data = gc.getGCData ();

34555

- int /*long*/ cairo = data.cairo;

34556

+ long /*int*/ cairo = data.cairo;

34557

if (cairo != 0) {

34558

Cairo.cairo_save (cairo);

34559

if (control.backgroundImage != null) {

34560

@@ -341,15 +341,15 @@

34561

Cairo.cairo_translate (cairo, -pt.x, -pt.y);

34562

x += pt.x;

34563

y += pt.y;

34564

- int /*long*/ xDisplay = OS.GDK_DISPLAY ();

34565

- int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual (OS.gdk_visual_get_system());

34566

- int /*long*/ drawable = control.backgroundImage.pixmap;

34567

- int /*long*/ xDrawable = OS.GDK_PIXMAP_XID (drawable);

34568

+ long /*int*/ xDisplay = OS.GDK_DISPLAY ();

34569

+ long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual (OS.gdk_visual_get_system());

34570

+ long /*int*/ drawable = control.backgroundImage.pixmap;

34571

+ long /*int*/ xDrawable = OS.GDK_PIXMAP_XID (drawable);

34572

int [] w = new int [1], h = new int [1];

34573

OS.gdk_drawable_get_size (drawable, w, h);

34574

- int /*long*/ surface = Cairo.cairo_xlib_surface_create (xDisplay, xDrawable, xVisual, w [0], h [0]);

34575

+ long /*int*/ surface = Cairo.cairo_xlib_surface_create (xDisplay, xDrawable, xVisual, w [0], h [0]);

34576

if (surface == 0) error (SWT.ERROR_NO_HANDLES);

34577

- int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface (surface);

34578

+ long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface (surface);

34579

if (pattern == 0) error (SWT.ERROR_NO_HANDLES);

34580

Cairo.cairo_pattern_set_extend (pattern, Cairo.CAIRO_EXTEND_REPEAT);

34581

if ((data.style & SWT.MIRRORED) != 0) {

34582

@@ -367,7 +367,7 @@

34583

Cairo.cairo_fill (cairo);

34584

Cairo.cairo_restore (cairo);

34585

} else {

34586

- int /*long*/ gdkGC = gc.handle;

34587

+ long /*int*/ gdkGC = gc.handle;

34588

GdkGCValues values = new GdkGCValues ();

34589

OS.gdk_gc_get_values (gdkGC, values);

34590

if (control.backgroundImage != null) {

34591

@@ -425,7 +425,7 @@

34592

}

34593

}

34594

34595

-void fixModal(int /*long*/ group, int /*long*/ modalGroup) {

34596

+void fixModal(long /*int*/ group, long /*int*/ modalGroup) {

34597

Control[] controls = _getChildren ();

34598

for (int i = 0; i < controls.length; i++) {

34599

controls[i].fixModal (group, modalGroup);

34600

@@ -464,15 +464,15 @@

34601

34602

void fixZOrder () {

34603

if ((state & CANVAS) != 0) return;

34604

- int /*long*/ parentHandle = parentingHandle ();

34605

- int /*long*/ parentWindow = OS.GTK_WIDGET_WINDOW (parentHandle);

34606

+ long /*int*/ parentHandle = parentingHandle ();

34607

+ long /*int*/ parentWindow = OS.GTK_WIDGET_WINDOW (parentHandle);

34608

if (parentWindow == 0) return;

34609

- int /*long*/ [] userData = new int /*long*/ [1];

34610

- int /*long*/ windowList = OS.gdk_window_get_children (parentWindow);

34611

+ long /*int*/ [] userData = new long /*int*/ [1];

34612

+ long /*int*/ windowList = OS.gdk_window_get_children (parentWindow);

34613

if (windowList != 0) {

34614

- int /*long*/ windows = windowList;

34615

+ long /*int*/ windows = windowList;

34616

while (windows != 0) {

34617

- int /*long*/ window = OS.g_list_data (windows);

34618

+ long /*int*/ window = OS.g_list_data (windows);

34619

if (window != redrawWindow) {

34620

OS.gdk_window_get_user_data (window, userData);

34621

if (userData [0] == 0 || OS.G_OBJECT_TYPE (userData [0]) != display.gtk_fixed_get_type ()) {

34622

@@ -485,12 +485,12 @@

34623

}

34624

}

34625

34626

-int /*long*/ focusHandle () {

34627

+long /*int*/ focusHandle () {

34628

if (socketHandle != 0) return socketHandle;

34629

return super.focusHandle ();

34630

}

34631

34632

-boolean forceFocus (int /*long*/ focusHandle) {

34633

+boolean forceFocus (long /*int*/ focusHandle) {

34634

if (socketHandle != 0) OS.GTK_WIDGET_SET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);

34635

boolean result = super.forceFocus (focusHandle);

34636

if (socketHandle != 0) OS.GTK_WIDGET_UNSET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);

34637

@@ -551,7 +551,7 @@

34638

* NOTE: The current implementation will count

34639

* non-registered children.

34640

*/

34641

- int /*long*/ list = OS.gtk_container_get_children (handle);

34642

+ long /*int*/ list = OS.gtk_container_get_children (handle);

34643

if (list == 0) return 0;

34644

int count = OS.g_list_length (list);

34645

OS.g_list_free (list);

34646

@@ -565,7 +565,7 @@

34647

return new Rectangle (0, 0, 0, 0);

34648

}

34649

forceResize ();

34650

- int /*long*/ clientHandle = clientHandle ();

34651

+ long /*int*/ clientHandle = clientHandle ();

34652

int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);

34653

int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);

34654

return new Rectangle (0, 0, width, height);

34655

@@ -646,8 +646,8 @@

34656

return tabList;

34657

}

34658

34659

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

34660

- int /*long*/ result = super.gtk_button_press_event (widget, event);

34661

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

34662

+ long /*int*/ result = super.gtk_button_press_event (widget, event);

34663

if (result != 0) return result;

34664

if ((state & CANVAS) != 0) {

34665

if ((style & SWT.NO_FOCUS) == 0 && hooksKeys ()) {

34666

@@ -661,7 +661,7 @@

34667

return result;

34668

}

34669

34670

-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {

34671

+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {

34672

if ((state & OBSCURED) != 0) return 0;

34673

if ((state & CANVAS) == 0) {

34674

return super.gtk_expose_event (widget, eventPtr);

34675

@@ -672,7 +672,7 @@

34676

if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0;

34677

GdkEventExpose gdkEvent = new GdkEventExpose ();

34678

OS.memmove(gdkEvent, eventPtr, GdkEventExpose.sizeof);

34679

- int /*long*/ [] rectangles = new int /*long*/ [1];

34680

+ long /*int*/ [] rectangles = new long /*int*/ [1];

34681

int [] n_rectangles = new int [1];

34682

OS.gdk_region_get_rectangles (gdkEvent.region, rectangles, n_rectangles);

34683

GdkRectangle rect = new GdkRectangle ();

34684

@@ -684,7 +684,7 @@

34685

event.width = rect.width;

34686

event.height = rect.height;

34687

if ((style & SWT.MIRRORED) != 0) event.x = getClientWidth () - event.width - event.x;

34688

- int /*long*/ damageRgn = OS.gdk_region_new ();

34689

+ long /*int*/ damageRgn = OS.gdk_region_new ();

34690

OS.gdk_region_union_with_rect (damageRgn, rect);

34691

GCData data = new GCData ();

34692

data.damageRgn = damageRgn;

34693

@@ -699,8 +699,8 @@

34694

return 0;

34695

}

34696

34697

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {

34698

- int /*long*/ result = super.gtk_key_press_event (widget, event);

34699

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {

34700

+ long /*int*/ result = super.gtk_key_press_event (widget, event);

34701

if (result != 0) return result;

34702

/*

34703

* Feature in GTK. The default behavior when the return key

34704

@@ -720,30 +720,30 @@

34705

return result;

34706

}

34707

34708

-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) {

34709

+long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) {

34710

if (widget == socketHandle) return 0;

34711

return super.gtk_focus (widget, directionType);

34712

}

34713

34714

-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {

34715

- int /*long*/ result = super.gtk_focus_in_event (widget, event);

34716

+long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {

34717

+ long /*int*/ result = super.gtk_focus_in_event (widget, event);

34718

return (state & CANVAS) != 0 ? 1 : result;

34719

}

34720

34721

-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {

34722

- int /*long*/ result = super.gtk_focus_out_event (widget, event);

34723

+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {

34724

+ long /*int*/ result = super.gtk_focus_out_event (widget, event);

34725

return (state & CANVAS) != 0 ? 1 : result;

34726

}

34727

34728

-int /*long*/ gtk_map (int /*long*/ widget) {

34729

+long /*int*/ gtk_map (long /*int*/ widget) {

34730

fixZOrder ();

34731

return 0;

34732

}

34733

34734

-int /*long*/ gtk_realize (int /*long*/ widget) {

34735

- int /*long*/ result = super.gtk_realize (widget);

34736

+long /*int*/ gtk_realize (long /*int*/ widget) {

34737

+ long /*int*/ result = super.gtk_realize (widget);

34738

if ((style & SWT.NO_BACKGROUND) != 0) {

34739

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ());

34740

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ());

34741

if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, false);

34742

}

34743

if (socketHandle != 0) {

34744

@@ -752,16 +752,16 @@

34745

return result;

34746

}

34747

34748

-int /*long*/ gtk_scroll_child (int /*long*/ widget, int /*long*/ scrollType, int /*long*/ horizontal) {

34749

+long /*int*/ gtk_scroll_child (long /*int*/ widget, long /*int*/ scrollType, long /*int*/ horizontal) {

34750

/* Stop GTK scroll child signal for canvas */

34751

OS.g_signal_stop_emission_by_name (widget, OS.scroll_child);

34752

return 1;

34753

}

34754

34755

-int /*long*/ gtk_style_set (int /*long*/ widget, int /*long*/ previousStyle) {

34756

- int /*long*/ result = super.gtk_style_set (widget, previousStyle);

34757

+long /*int*/ gtk_style_set (long /*int*/ widget, long /*int*/ previousStyle) {

34758

+ long /*int*/ result = super.gtk_style_set (widget, previousStyle);

34759

if ((style & SWT.NO_BACKGROUND) != 0) {

34760

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ());

34761

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ());

34762

if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, false);

34763

}

34764

return result;

34765

@@ -785,7 +785,7 @@

34766

return hooks (SWT.KeyDown) || hooks (SWT.KeyUp);

34767

}

34768

34769

-int /*long*/ imHandle () {

34770

+long /*int*/ imHandle () {

34771

return imHandle;

34772

}

34773

34774

@@ -1003,16 +1003,16 @@

34775

}

34776

}

34777

34778

-void moveAbove (int /*long*/ child, int /*long*/ sibling) {

34779

+void moveAbove (long /*int*/ child, long /*int*/ sibling) {

34780

if (child == sibling) return;

34781

- int /*long*/ parentHandle = parentingHandle ();

34782

+ long /*int*/ parentHandle = parentingHandle ();

34783

GtkFixed fixed = new GtkFixed ();

34784

OS.memmove (fixed, parentHandle);

34785

- int /*long*/ children = fixed.children;

34786

+ long /*int*/ children = fixed.children;

34787

if (children == 0) return;

34788

- int /*long*/ [] data = new int /*long*/ [1];

34789

- int /*long*/ [] widget = new int /*long*/ [1];

34790

- int /*long*/ childData = 0, childLink = 0, siblingLink = 0, temp = children;

34791

+ long /*int*/ [] data = new long /*int*/ [1];

34792

+ long /*int*/ [] widget = new long /*int*/ [1];

34793

+ long /*int*/ childData = 0, childLink = 0, siblingLink = 0, temp = children;

34794

while (temp != 0) {

34795

OS.memmove (data, temp, OS.PTR_SIZEOF);

34796

OS.memmove (widget, data [0], OS.PTR_SIZEOF);

34797

@@ -1040,20 +1040,20 @@

34798

OS.memmove (parentHandle, fixed);

34799

}

34800

34801

-void moveBelow (int /*long*/ child, int /*long*/ sibling) {

34802

+void moveBelow (long /*int*/ child, long /*int*/ sibling) {

34803

if (child == sibling) return;

34804

- int /*long*/ parentHandle = parentingHandle ();

34805

+ long /*int*/ parentHandle = parentingHandle ();

34806

if (sibling == 0 && parentHandle == fixedHandle) {

34807

moveAbove (child, scrolledHandle != 0 ? scrolledHandle : handle);

34808

return;

34809

}

34810

GtkFixed fixed = new GtkFixed ();

34811

OS.memmove (fixed, parentHandle);

34812

- int /*long*/ children = fixed.children;

34813

+ long /*int*/ children = fixed.children;

34814

if (children == 0) return;

34815

- int /*long*/ [] data = new int /*long*/ [1];

34816

- int /*long*/ [] widget = new int /*long*/ [1];

34817

- int /*long*/ childData = 0, childLink = 0, siblingLink = 0, temp = children;

34818

+ long /*int*/ [] data = new long /*int*/ [1];

34819

+ long /*int*/ [] widget = new long /*int*/ [1];

34820

+ long /*int*/ childData = 0, childLink = 0, siblingLink = 0, temp = children;

34821

while (temp != 0) {

34822

OS.memmove (data, temp, OS.PTR_SIZEOF);

34823

OS.memmove (widget, data [0], OS.PTR_SIZEOF);

34824

@@ -1085,7 +1085,7 @@

34825

Control[] children = _getChildren ();

34826

for (int i = 0; i < children.length; i++) {

34827

Control child = children[i];

34828

- int /*long*/ topHandle = child.topHandle ();

34829

+ long /*int*/ topHandle = child.topHandle ();

34830

int x = OS.GTK_WIDGET_X (topHandle);

34831

int y = OS.GTK_WIDGET_Y (topHandle);

34832

int controlWidth = (child.state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);

34833

@@ -1127,12 +1127,12 @@

34834

return new Point (width, height);

34835

}

34836

34837

-int /*long*/ parentingHandle () {

34838

+long /*int*/ parentingHandle () {

34839

if ((state & CANVAS) != 0) return handle;

34840

return fixedHandle != 0 ? fixedHandle : handle;

34841

}

34842

34843

-void printWidget (GC gc, int /*long*/ drawable, int depth, int x, int y) {

34844

+void printWidget (GC gc, long /*int*/ drawable, int depth, int x, int y) {

34845

Region oldClip = new Region (gc.getDevice ());

34846

Region newClip = new Region (gc.getDevice ());

34847

gc.getClipping (oldClip);

34848

diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets/Control.java

34849

--- x86/org/eclipse/swt/widgets/Control.java 2009-08-07 14:50:38.000000000 -0400

34850

+++ x86_64/org/eclipse/swt/widgets/Control.java 2009-09-17 08:48:24.000000000 -0400

34851

@@ -44,8 +44,8 @@

34852

* @noextend This class is not intended to be subclassed by clients.

34853

*/

34854

public abstract class Control extends Widget implements Drawable {

34855

- int /*long*/ fixedHandle;

34856

- int /*long*/ redrawWindow, enableWindow;

34857

+ long /*int*/ fixedHandle;

34858

+ long /*int*/ redrawWindow, enableWindow;

34859

int drawCount;

34860

Composite parent;

34861

Cursor cursor;

34862

@@ -105,13 +105,13 @@

34863

void deregister () {

34864

super.deregister ();

34865

if (fixedHandle != 0) display.removeWidget (fixedHandle);

34866

- int /*long*/ imHandle = imHandle ();

34867

+ long /*int*/ imHandle = imHandle ();

34868

if (imHandle != 0) display.removeWidget (imHandle);

34869

}

34870

34871

boolean drawGripper (int x, int y, int width, int height, boolean vertical) {

34872

- int /*long*/ paintHandle = paintHandle ();

34873

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (paintHandle);

34874

+ long /*int*/ paintHandle = paintHandle ();

34875

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (paintHandle);

34876

if (window == 0) return false;

34877

int orientation = vertical ? OS.GTK_ORIENTATION_HORIZONTAL : OS.GTK_ORIENTATION_VERTICAL;

34878

if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - width - x;

34879

@@ -123,16 +123,16 @@

34880

OS.gtk_widget_set_sensitive (handle, enabled);

34881

}

34882

34883

-int /*long*/ enterExitHandle () {

34884

+long /*int*/ enterExitHandle () {

34885

return eventHandle ();

34886

}

34887

34888

-int /*long*/ eventHandle () {

34889

+long /*int*/ eventHandle () {

34890

return handle;

34891

}

34892

34893

-int /*long*/ eventWindow () {

34894

- int /*long*/ eventHandle = eventHandle ();

34895

+long /*int*/ eventWindow () {

34896

+ long /*int*/ eventHandle = eventHandle ();

34897

OS.gtk_widget_realize (eventHandle);

34898

return OS.GTK_WIDGET_WINDOW (eventHandle);

34899

}

34900

@@ -144,7 +144,7 @@

34901

if (control.setFocus ()) return;

34902

}

34903

shell.setSavedFocus (focusControl);

34904

- int /*long*/ focusHandle = shell.vboxHandle;

34905

+ long /*int*/ focusHandle = shell.vboxHandle;

34906

OS.GTK_WIDGET_SET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);

34907

OS.gtk_widget_grab_focus (focusHandle);

34908

OS.GTK_WIDGET_UNSET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);

34909

@@ -154,7 +154,7 @@

34910

if (fixedHandle != 0) fixStyle (fixedHandle);

34911

}

34912

34913

-void fixStyle (int /*long*/ handle) {

34914

+void fixStyle (long /*int*/ handle) {

34915

/*

34916

* Feature in GTK. Some GTK themes apply a different background to

34917

* the contents of a GtkNotebook. However, in an SWT TabFolder, the

34918

@@ -168,7 +168,7 @@

34919

*/

34920

if ((state & BACKGROUND) != 0) return;

34921

if ((state & THEME_BACKGROUND) == 0) return;

34922

- int /*long*/ childStyle = parent.childStyle ();

34923

+ long /*int*/ childStyle = parent.childStyle ();

34924

if (childStyle != 0) {

34925

GdkColor color = new GdkColor();

34926

OS.gtk_style_get_bg (childStyle, 0, color);

34927

@@ -176,11 +176,11 @@

34928

}

34929

}

34930

34931

-int /*long*/ focusHandle () {

34932

+long /*int*/ focusHandle () {

34933

return handle;

34934

}

34935

34936

-int /*long*/ fontHandle () {

34937

+long /*int*/ fontHandle () {

34938

return handle;

34939

}

34940

34941

@@ -190,7 +190,7 @@

34942

34943

void hookEvents () {

34944

/* Connect the keyboard signals */

34945

- int /*long*/ focusHandle = focusHandle ();

34946

+ long /*int*/ focusHandle = focusHandle ();

34947

int focusMask = OS.GDK_KEY_PRESS_MASK | OS.GDK_KEY_RELEASE_MASK | OS.GDK_FOCUS_CHANGE_MASK;

34948

OS.gtk_widget_add_events (focusHandle, focusMask);

34949

OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [POPUP_MENU], 0, display.closures [POPUP_MENU], false);

34950

@@ -202,7 +202,7 @@

34951

OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [FOCUS_OUT_EVENT], 0, display.closures [FOCUS_OUT_EVENT], false);

34952

34953

/* Connect the mouse signals */

34954

- int /*long*/ eventHandle = eventHandle ();

34955

+ long /*int*/ eventHandle = eventHandle ();

34956

int eventMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK | OS.GDK_BUTTON_RELEASE_MASK;

34957

OS.gtk_widget_add_events (eventHandle, eventMask);

34958

OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT], false);

34959

@@ -211,7 +211,7 @@

34960

OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [SCROLL_EVENT], 0, display.closures [SCROLL_EVENT], false);

34961

34962

/* Connect enter/exit signals */

34963

- int /*long*/ enterExitHandle = enterExitHandle ();

34964

+ long /*int*/ enterExitHandle = enterExitHandle ();

34965

int enterExitMask = OS.GDK_ENTER_NOTIFY_MASK | OS.GDK_LEAVE_NOTIFY_MASK;

34966

OS.gtk_widget_add_events (enterExitHandle, enterExitMask);

34967

OS.g_signal_connect_closure_by_id (enterExitHandle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.closures [ENTER_NOTIFY_EVENT], false);

34968

@@ -227,7 +227,7 @@

34969

* The signal is hooked to the fixedHandle to catch events sent to

34970

* lightweight widgets.

34971

*/

34972

- int /*long*/ blockHandle = fixedHandle != 0 ? fixedHandle : eventHandle;

34973

+ long /*int*/ blockHandle = fixedHandle != 0 ? fixedHandle : eventHandle;

34974

OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT_INVERSE], true);

34975

OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT_INVERSE], true);

34976

OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [MOTION_NOTIFY_EVENT], 0, display.closures [MOTION_NOTIFY_EVENT_INVERSE], true);

34977

@@ -239,7 +239,7 @@

34978

}

34979

34980

/* Connect the paint signal */

34981

- int /*long*/ paintHandle = paintHandle ();

34982

+ long /*int*/ paintHandle = paintHandle ();

34983

int paintMask = OS.GDK_EXPOSURE_MASK | OS.GDK_VISIBILITY_NOTIFY_MASK;

34984

OS.gtk_widget_add_events (paintHandle, paintMask);

34985

OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [EXPOSE_EVENT], 0, display.closures [EXPOSE_EVENT_INVERSE], false);

34986

@@ -249,7 +249,7 @@

34987

/* Connect the Input Method signals */

34988

OS.g_signal_connect_closure_by_id (handle, display.signalIds [REALIZE], 0, display.closures [REALIZE], true);

34989

OS.g_signal_connect_closure_by_id (handle, display.signalIds [UNREALIZE], 0, display.closures [UNREALIZE], false);

34990

- int /*long*/ imHandle = imHandle ();

34991

+ long /*int*/ imHandle = imHandle ();

34992

if (imHandle != 0) {

34993

OS.g_signal_connect_closure (imHandle, OS.commit, display.closures [COMMIT], false);

34994

OS.g_signal_connect_closure (imHandle, OS.preedit_changed, display.closures [PREEDIT_CHANGED], false);

34995

@@ -257,11 +257,11 @@

34996

34997

OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [STYLE_SET], 0, display.closures [STYLE_SET], false);

34998

34999

- int /*long*/ topHandle = topHandle ();

35000

+ long /*int*/ topHandle = topHandle ();

35001

OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.closures [MAP], true);

35002

}

35003

35004

-int /*long*/ hoverProc (int /*long*/ widget) {

35005

+long /*int*/ hoverProc (long /*int*/ widget) {

35006

int [] x = new int [1], y = new int [1], mask = new int [1];

35007

OS.gdk_window_get_pointer (0, x, y, mask);

35008

sendMouseEvent (SWT.MouseHover, 0, /*time*/0, x [0], y [0], false, mask [0]);

35009

@@ -269,14 +269,14 @@

35010

return 0;

35011

}

35012

35013

-int /*long*/ topHandle() {

35014

+long /*int*/ topHandle() {

35015

if (fixedHandle != 0) return fixedHandle;

35016

return super.topHandle ();

35017

}

35018

35019

-int /*long*/ paintHandle () {

35020

- int /*long*/ topHandle = topHandle ();

35021

- int /*long*/ paintHandle = handle;

35022

+long /*int*/ paintHandle () {

35023

+ long /*int*/ topHandle = topHandle ();

35024

+ long /*int*/ paintHandle = handle;

35025

while (paintHandle != topHandle) {

35026

if ((OS.GTK_WIDGET_FLAGS (paintHandle) & OS.GTK_NO_WINDOW) == 0) break;

35027

paintHandle = OS.gtk_widget_get_parent (paintHandle);

35028

@@ -284,8 +284,8 @@

35029

return paintHandle;

35030

}

35031

35032

-int /*long*/ paintWindow () {

35033

- int /*long*/ paintHandle = paintHandle ();

35034

+long /*int*/ paintWindow () {

35035

+ long /*int*/ paintHandle = paintHandle ();

35036

OS.gtk_widget_realize (paintHandle);

35037

return OS.GTK_WIDGET_WINDOW (paintHandle);

35038

}

35039

@@ -311,25 +311,25 @@

35040

checkWidget ();

35041

if (gc == null) error (SWT.ERROR_NULL_ARGUMENT);

35042

if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);

35043

- int /*long*/ topHandle = topHandle ();

35044

+ long /*int*/ topHandle = topHandle ();

35045

OS.gtk_widget_realize (topHandle);

35046

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topHandle);

35047

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topHandle);

35048

GCData data = gc.getGCData ();

35049

OS.gdk_window_process_updates (window, true);

35050

printWidget (gc, data.drawable, OS.gdk_drawable_get_depth (data.drawable), 0, 0);

35051

return true;

35052

}

35053

35054

-void printWidget (GC gc, int /*long*/ drawable, int depth, int x, int y) {

35055

+void printWidget (GC gc, long /*int*/ drawable, int depth, int x, int y) {

35056

boolean obscured = (state & OBSCURED) != 0;

35057

state &= ~OBSCURED;

35058

- int /*long*/ topHandle = topHandle ();

35059

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topHandle);

35060

+ long /*int*/ topHandle = topHandle ();

35061

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topHandle);

35062

printWindow (true, this, gc, drawable, depth, window, x, y);

35063

if (obscured) state |= OBSCURED;

35064

}

35065

35066

-void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable, int depth, int /*long*/ window, int x, int y) {

35067

+void printWindow (boolean first, Control control, GC gc, long /*int*/ drawable, int depth, long /*int*/ window, int x, int y) {

35068

if (OS.gdk_drawable_get_depth (window) != depth) return;

35069

GdkRectangle rect = new GdkRectangle ();

35070

int [] width = new int [1], height = new int [1];

35071

@@ -337,13 +337,13 @@

35072

rect.width = width [0];

35073

rect.height = height [0];

35074

OS.gdk_window_begin_paint_rect (window, rect);

35075

- int /*long*/ [] real_drawable = new int /*long*/ [1];

35076

+ long /*int*/ [] real_drawable = new long /*int*/ [1];

35077

int [] x_offset = new int [1], y_offset = new int [1];

35078

OS.gdk_window_get_internal_paint_info (window, real_drawable, x_offset, y_offset);

35079

- int /*long*/ [] userData = new int /*long*/ [1];

35080

+ long /*int*/ [] userData = new long /*int*/ [1];

35081

OS.gdk_window_get_user_data (window, userData);

35082

if (userData [0] != 0) {

35083

- int /*long*/ eventPtr = OS.gdk_event_new (OS.GDK_EXPOSE);

35084

+ long /*int*/ eventPtr = OS.gdk_event_new (OS.GDK_EXPOSE);

35085

GdkEventExpose event = new GdkEventExpose ();

35086

event.type = OS.GDK_EXPOSE;

35087

event.window = OS.g_object_ref (window);

35088

@@ -359,7 +359,7 @@

35089

if (!first) {

35090

int [] cX = new int [1], cY = new int [1];

35091

OS.gdk_window_get_position (window, cX, cY);

35092

- int /*long*/ parentWindow = OS.gdk_window_get_parent (window);

35093

+ long /*int*/ parentWindow = OS.gdk_window_get_parent (window);

35094

int [] pW = new int [1], pH = new int [1];

35095

OS.gdk_drawable_get_size (parentWindow, pW, pH);

35096

srcX = x_offset [0] - cX [0];

35097

@@ -370,18 +370,18 @@

35098

destHeight = Math.min (cY [0] + height [0], pH [0]);

35099

}

35100

GCData gcData = gc.getGCData();

35101

- int /*long*/ cairo = gcData.cairo;

35102

+ long /*int*/ cairo = gcData.cairo;

35103

if (cairo != 0) {

35104

- int /*long*/ xDisplay = OS.GDK_DISPLAY();

35105

- int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());

35106

- int /*long*/ xDrawable = OS.GDK_PIXMAP_XID(real_drawable [0]);

35107

- int /*long*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width [0], height [0]);

35108

+ long /*int*/ xDisplay = OS.GDK_DISPLAY();

35109

+ long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());

35110

+ long /*int*/ xDrawable = OS.GDK_PIXMAP_XID(real_drawable [0]);

35111

+ long /*int*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width [0], height [0]);

35112

if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);

35113

Cairo.cairo_save(cairo);

35114

Cairo.cairo_rectangle(cairo, destX , destY, destWidth, destHeight);

35115

Cairo.cairo_clip(cairo);

35116

Cairo.cairo_translate(cairo, destX, destY);

35117

- int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface(surface);

35118

+ long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface(surface);

35119

if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);

35120

Cairo.cairo_pattern_set_filter(pattern, Cairo.CAIRO_FILTER_BEST);

35121

Cairo.cairo_set_source(cairo, pattern);

35122

@@ -397,13 +397,13 @@

35123

OS.gdk_draw_drawable (drawable, gc.handle, real_drawable [0], srcX, srcY, destX, destY, destWidth, destHeight);

35124

}

35125

OS.gdk_window_end_paint (window);

35126

- int /*long*/ children = OS.gdk_window_get_children (window);

35127

+ long /*int*/ children = OS.gdk_window_get_children (window);

35128

if (children != 0) {

35129

- int /*long*/ windows = children;

35130

+ long /*int*/ windows = children;

35131

while (windows != 0) {

35132

- int /*long*/ child = OS.g_list_data (windows);

35133

+ long /*int*/ child = OS.g_list_data (windows);

35134

if (OS.gdk_window_is_visible (child)) {

35135

- int /*long*/ [] data = new int /*long*/ [1];

35136

+ long /*int*/ [] data = new long /*int*/ [1];

35137

OS.gdk_window_get_user_data (child, data);

35138

if (data [0] != 0) {

35139

Widget widget = display.findWidget (data [0]);

35140

@@ -517,7 +517,7 @@

35141

if ((style & SWT.RIGHT_TO_LEFT) != 0) style |= SWT.MIRRORED;

35142

}

35143

35144

-int /*long*/ childStyle () {

35145

+long /*int*/ childStyle () {

35146

return parent.childStyle ();

35147

}

35148

35149

@@ -577,7 +577,7 @@

35150

return computeNativeSize (handle, wHint, hHint, changed);

35151

}

35152

35153

-Point computeNativeSize (int /*long*/ h, int wHint, int hHint, boolean changed) {

35154

+Point computeNativeSize (long /*int*/ h, int wHint, int hHint, boolean changed) {

35155

int width = wHint, height = hHint;

35156

if (wHint == SWT.DEFAULT && hHint == SWT.DEFAULT) {

35157

GtkRequisition requisition = new GtkRequisition ();

35158

@@ -603,7 +603,7 @@

35159

* topHandle. Note that all calls to gtk_widget_size_allocate()

35160

* must be preceded by a call to gtk_widget_size_request().

35161

*/

35162

- int /*long*/ topHandle = topHandle ();

35163

+ long /*int*/ topHandle = topHandle ();

35164

GtkRequisition requisition = new GtkRequisition ();

35165

gtk_widget_size_request (topHandle, requisition);

35166

GtkAllocation allocation = new GtkAllocation ();

35167

@@ -654,7 +654,7 @@

35168

*/

35169

public Rectangle getBounds () {

35170

checkWidget();

35171

- int /*long*/ topHandle = topHandle ();

35172

+ long /*int*/ topHandle = topHandle ();

35173

int x = OS.GTK_WIDGET_X (topHandle);

35174

int y = OS.GTK_WIDGET_Y (topHandle);

35175

int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);

35176

@@ -719,7 +719,7 @@

35177

/* Do nothing */

35178

}

35179

35180

-void modifyStyle (int /*long*/ handle, int /*long*/ style) {

35181

+void modifyStyle (long /*int*/ handle, long /*int*/ style) {

35182

super.modifyStyle(handle, style);

35183

/*

35184

* Bug in GTK. When changing the style of a control that

35185

@@ -730,8 +730,8 @@

35186

}

35187

35188

void moveHandle (int x, int y) {

35189

- int /*long*/ topHandle = topHandle ();

35190

- int /*long*/ parentHandle = parent.parentingHandle ();

35191

+ long /*int*/ topHandle = topHandle ();

35192

+ long /*int*/ parentHandle = parent.parentingHandle ();

35193

/*

35194

* Feature in GTK. Calling gtk_fixed_move() to move a child causes

35195

* the whole parent to redraw. This is a performance problem. The

35196

@@ -749,13 +749,13 @@

35197

}

35198

35199

void resizeHandle (int width, int height) {

35200

- int /*long*/ topHandle = topHandle ();

35201

+ long /*int*/ topHandle = topHandle ();

35202

OS.gtk_widget_set_size_request (topHandle, width, height);

35203

if (topHandle != handle) OS.gtk_widget_set_size_request (handle, width, height);

35204

}

35205

35206

int setBounds (int x, int y, int width, int height, boolean move, boolean resize) {

35207

- int /*long*/ topHandle = topHandle ();

35208

+ long /*int*/ topHandle = topHandle ();

35209

boolean sendMove = move;

35210

if ((parent.style & SWT.MIRRORED) != 0) {

35211

int clientWidth = parent.getClientWidth ();

35212

@@ -879,7 +879,7 @@

35213

*/

35214

public Point getLocation () {

35215

checkWidget();

35216

- int /*long*/ topHandle = topHandle ();

35217

+ long /*int*/ topHandle = topHandle ();

35218

int x = OS.GTK_WIDGET_X (topHandle);

35219

int y = OS.GTK_WIDGET_Y (topHandle);

35220

if ((parent.style & SWT.MIRRORED) != 0) {

35221

@@ -944,7 +944,7 @@

35222

*/

35223

public Point getSize () {

35224

checkWidget();

35225

- int /*long*/ topHandle = topHandle ();

35226

+ long /*int*/ topHandle = topHandle ();

35227

int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);

35228

int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (topHandle);

35229

return new Point (width, height);

35230

@@ -994,15 +994,15 @@

35231

public void setRegion (Region region) {

35232

checkWidget ();

35233

if (region != null && region.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);

35234

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topHandle ());

35235

- int /*long*/ shape_region = (region == null) ? 0 : region.handle;

35236

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topHandle ());

35237

+ long /*int*/ shape_region = (region == null) ? 0 : region.handle;

35238

OS.gdk_window_shape_combine_region (window, shape_region, 0, 0);

35239

this.region = region;

35240

}

35241

35242

void setRelations () {

35243

- int /*long*/ parentHandle = parent.parentingHandle ();

35244

- int /*long*/ list = OS.gtk_container_get_children (parentHandle);

35245

+ long /*int*/ parentHandle = parent.parentingHandle ();

35246

+ long /*int*/ list = OS.gtk_container_get_children (parentHandle);

35247

if (list == 0) return;

35248

int count = OS.g_list_length (list);

35249

if (count > 1) {

35250

@@ -1010,7 +1010,7 @@

35251

* the receiver is the last item in the list, so its predecessor will

35252

* be the second-last item in the list

35253

*/

35254

- int /*long*/ handle = OS.g_list_nth_data (list, count - 2);

35255

+ long /*int*/ handle = OS.g_list_nth_data (list, count - 2);

35256

if (handle != 0) {

35257

Widget widget = display.getWidget (handle);

35258

if (widget != null && widget != this) {

35259

@@ -1058,7 +1058,7 @@

35260

return true;

35261

}

35262

35263

-boolean isFocusHandle (int /*long*/ widget) {

35264

+boolean isFocusHandle (long /*int*/ widget) {

35265

return widget == focusHandle ();

35266

}

35267

35268

@@ -1197,7 +1197,7 @@

35269

*/

35270

public Point toControl (int x, int y) {

35271

checkWidget ();

35272

- int /*long*/ window = eventWindow ();

35273

+ long /*int*/ window = eventWindow ();

35274

int [] origin_x = new int [1], origin_y = new int [1];

35275

OS.gdk_window_get_origin (window, origin_x, origin_y);

35276

x -= origin_x [0];

35277

@@ -1246,7 +1246,7 @@

35278

*/

35279

public Point toDisplay (int x, int y) {

35280

checkWidget();

35281

- int /*long*/ window = eventWindow ();

35282

+ long /*int*/ window = eventWindow ();

35283

int [] origin_x = new int [1], origin_y = new int [1];

35284

OS.gdk_window_get_origin (window, origin_x, origin_y);

35285

if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - x;

35286

@@ -1894,12 +1894,12 @@

35287

*/

35288

void removeRelation () {

35289

if (!isDescribedByLabel ()) return; /* there will not be any */

35290

- int /*long*/ accessible = OS.gtk_widget_get_accessible (handle);

35291

+ long /*int*/ accessible = OS.gtk_widget_get_accessible (handle);

35292

if (accessible == 0) return;

35293

- int /*long*/ set = ATK.atk_object_ref_relation_set (accessible);

35294

+ long /*int*/ set = ATK.atk_object_ref_relation_set (accessible);

35295

int count = ATK.atk_relation_set_get_n_relations (set);

35296

for (int i = 0; i < count; i++) {

35297

- int /*long*/ relation = ATK.atk_relation_set_get_relation (set, 0);

35298

+ long /*int*/ relation = ATK.atk_relation_set_get_relation (set, 0);

35299

ATK.atk_relation_set_remove (set, relation);

35300

}

35301

OS.g_object_unref (set);

35302

@@ -2022,7 +2022,7 @@

35303

boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {

35304

boolean quit = false, dragging = false;

35305

while (!quit) {

35306

- int /*long*/ eventPtr = 0;

35307

+ long /*int*/ eventPtr = 0;

35308

/*

35309

* There should be an event on the queue already, but

35310

* in cases where there isn't one, stop trying after

35311

@@ -2077,8 +2077,8 @@

35312

return dragging;

35313

}

35314

35315

-boolean filterKey (int keyval, int /*long*/ event) {

35316

- int /*long*/ imHandle = imHandle ();

35317

+boolean filterKey (int keyval, long /*int*/ event) {

35318

+ long /*int*/ imHandle = imHandle ();

35319

if (imHandle != 0) {

35320

return OS.gtk_im_context_filter_keypress (imHandle, event);

35321

}

35322

@@ -2100,13 +2100,13 @@

35323

oldDecorations.fixDecorations (newDecorations, this, menus);

35324

}

35325

35326

-int /*long*/ fixedMapProc (int /*long*/ widget) {

35327

+long /*int*/ fixedMapProc (long /*int*/ widget) {

35328

OS.GTK_WIDGET_SET_FLAGS (widget, OS.GTK_MAPPED);

35329

- int /*long*/ widgetList = OS.gtk_container_get_children (widget);

35330

+ long /*int*/ widgetList = OS.gtk_container_get_children (widget);

35331

if (widgetList != 0) {

35332

- int /*long*/ widgets = widgetList;

35333

+ long /*int*/ widgets = widgetList;

35334

while (widgets != 0) {

35335

- int /*long*/ child = OS.g_list_data (widgets);

35336

+ long /*int*/ child = OS.g_list_data (widgets);

35337

if (OS.GTK_WIDGET_VISIBLE (child) && OS.gtk_widget_get_child_visible (child) && !OS.GTK_WIDGET_MAPPED (child)) {

35338

OS.gtk_widget_map (child);

35339

}

35340

@@ -2120,7 +2120,7 @@

35341

return 0;

35342

}

35343

35344

-void fixModal(int /*long*/ group, int /*long*/ modalGroup) {

35345

+void fixModal(long /*int*/ group, long /*int*/ modalGroup) {

35346

}

35347

35348

/**

35349

@@ -2146,14 +2146,14 @@

35350

return forceFocus (focusHandle ());

35351

}

35352

35353

-boolean forceFocus (int /*long*/ focusHandle) {

35354

+boolean forceFocus (long /*int*/ focusHandle) {

35355

if (OS.GTK_WIDGET_HAS_FOCUS (focusHandle)) return true;

35356

/* When the control is zero sized it must be realized */

35357

OS.gtk_widget_realize (focusHandle);

35358

OS.gtk_widget_grab_focus (focusHandle);

35359

Shell shell = getShell ();

35360

- int /*long*/ shellHandle = shell.shellHandle;

35361

- int /*long*/ handle = OS.gtk_window_get_focus (shellHandle);

35362

+ long /*int*/ shellHandle = shell.shellHandle;

35363

+ long /*int*/ handle = OS.gtk_window_get_focus (shellHandle);

35364

while (handle != 0) {

35365

if (handle == focusHandle) {

35366

/* Cancel any previous ignoreFocus requests */

35367

@@ -2214,7 +2214,7 @@

35368

}

35369

35370

GdkColor getBgColor () {

35371

- int /*long*/ fontHandle = fontHandle ();

35372

+ long /*int*/ fontHandle = fontHandle ();

35373

OS.gtk_widget_realize (fontHandle);

35374

GdkColor color = new GdkColor ();

35375

OS.gtk_style_get_bg (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);

35376

@@ -2222,7 +2222,7 @@

35377

}

35378

35379

GdkColor getBaseColor () {

35380

- int /*long*/ fontHandle = fontHandle ();

35381

+ long /*int*/ fontHandle = fontHandle ();

35382

OS.gtk_widget_realize (fontHandle);

35383

GdkColor color = new GdkColor ();

35384

OS.gtk_style_get_base (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);

35385

@@ -2327,8 +2327,8 @@

35386

return font != null ? font : defaultFont ();

35387

}

35388

35389

-int /*long*/ getFontDescription () {

35390

- int /*long*/ fontHandle = fontHandle ();

35391

+long /*int*/ getFontDescription () {

35392

+ long /*int*/ fontHandle = fontHandle ();

35393

OS.gtk_widget_realize (fontHandle);

35394

return OS.gtk_style_get_font_desc (OS.gtk_widget_get_style (fontHandle));

35395

}

35396

@@ -2353,7 +2353,7 @@

35397

}

35398

35399

GdkColor getFgColor () {

35400

- int /*long*/ fontHandle = fontHandle ();

35401

+ long /*int*/ fontHandle = fontHandle ();

35402

OS.gtk_widget_realize (fontHandle);

35403

GdkColor color = new GdkColor ();

35404

OS.gtk_style_get_fg (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);

35405

@@ -2365,7 +2365,7 @@

35406

}

35407

35408

GdkColor getTextColor () {

35409

- int /*long*/ fontHandle = fontHandle ();

35410

+ long /*int*/ fontHandle = fontHandle ();

35411

OS.gtk_widget_realize (fontHandle);

35412

GdkColor color = new GdkColor ();

35413

OS.gtk_style_get_text (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);

35414

@@ -2417,7 +2417,7 @@

35415

public Monitor getMonitor () {

35416

checkWidget();

35417

Monitor monitor = null;

35418

- int /*long*/ screen = OS.gdk_screen_get_default ();

35419

+ long /*int*/ screen = OS.gdk_screen_get_default ();

35420

if (screen != 0) {

35421

int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, paintWindow ());

35422

GdkRectangle dest = new GdkRectangle ();

35423

@@ -2560,11 +2560,11 @@

35424

return (state & HIDDEN) == 0;

35425

}

35426

35427

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

35428

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

35429

return gtk_button_press_event (widget, event, true);

35430

}

35431

35432

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event, boolean sendMouseDown) {

35433

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event, boolean sendMouseDown) {

35434

GdkEventButton gdkEvent = new GdkEventButton ();

35435

OS.memmove (gdkEvent, event, GdkEventButton.sizeof);

35436

if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;

35437

@@ -2579,10 +2579,10 @@

35438

if (((shell.style & SWT.ON_TOP) != 0) && (((shell.style & SWT.NO_FOCUS) == 0) || ((style & SWT.NO_FOCUS) == 0))) {

35439

shell.forceActive();

35440

}

35441

- int /*long*/ result = 0;

35442

+ long /*int*/ result = 0;

35443

if (gdkEvent.type == OS.GDK_BUTTON_PRESS) {

35444

display.clickCount = 1;

35445

- int /*long*/ nextEvent = OS.gdk_event_peek ();

35446

+ long /*int*/ nextEvent = OS.gdk_event_peek ();

35447

if (nextEvent != 0) {

35448

int eventType = OS.GDK_EVENT_TYPE (nextEvent);

35449

if (eventType == OS.GDK_2BUTTON_PRESS) display.clickCount = 2;

35450

@@ -2629,7 +2629,7 @@

35451

return result;

35452

}

35453

35454

-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) {

35455

+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {

35456

GdkEventButton gdkEvent = new GdkEventButton ();

35457

OS.memmove (gdkEvent, event, GdkEventButton.sizeof);

35458

/*

35459

@@ -2648,7 +2648,7 @@

35460

return sendMouseEvent (SWT.MouseUp, button, display.clickCount, 0, false, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;

35461

}

35462

35463

-int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ text) {

35464

+long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ text) {

35465

if (text == 0) return 0;

35466

int length = OS.strlen (text);

35467

if (length == 0) return 0;

35468

@@ -2659,7 +2659,7 @@

35469

return 0;

35470

}

35471

35472

-int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {

35473

+long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {

35474

if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0)) {

35475

/*

35476

* Feature in GTK. Children of a shell will inherit and display the shell's

35477

@@ -2672,7 +2672,7 @@

35478

char [] chars = fixMnemonic (toolTipText, false);

35479

buffer = Converter.wcsToMbcs (null, chars, true);

35480

}

35481

- int /*long*/ toolHandle = getShell().handle;

35482

+ long /*int*/ toolHandle = getShell().handle;

35483

OS.gtk_widget_set_tooltip_text (toolHandle, buffer);

35484

}

35485

if (display.currentControl == this) return 0;

35486

@@ -2702,7 +2702,7 @@

35487

return false;

35488

}

35489

35490

-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {

35491

+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {

35492

GdkEvent event = new GdkEvent ();

35493

OS.memmove (event, gdkEvent, GdkEvent.sizeof);

35494

switch (event.type) {

35495

@@ -2744,7 +2744,7 @@

35496

}

35497

} else {

35498

display.ignoreFocus = false;

35499

- int /*long*/ grabHandle = OS.gtk_grab_get_current ();

35500

+ long /*int*/ grabHandle = OS.gtk_grab_get_current ();

35501

if (grabHandle != 0) {

35502

if (OS.G_OBJECT_TYPE (grabHandle) == OS.GTK_TYPE_MENU ()) {

35503

display.ignoreFocus = true;

35504

@@ -2760,7 +2760,7 @@

35505

return 0;

35506

}

35507

35508

-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {

35509

+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {

35510

if ((state & OBSCURED) != 0) return 0;

35511

if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0;

35512

GdkEventExpose gdkEvent = new GdkEventExpose ();

35513

@@ -2782,34 +2782,34 @@

35514

return 0;

35515

}

35516

35517

-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) {

35518

+long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) {

35519

/* Stop GTK traversal for every widget */

35520

return 1;

35521

}

35522

35523

-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {

35524

+long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {

35525

// widget could be disposed at this point

35526

if (handle != 0) {

35527

Control oldControl = display.imControl;

35528

if (oldControl != this) {

35529

if (oldControl != null && !oldControl.isDisposed ()) {

35530

- int /*long*/ oldIMHandle = oldControl.imHandle ();

35531

+ long /*int*/ oldIMHandle = oldControl.imHandle ();

35532

if (oldIMHandle != 0) OS.gtk_im_context_reset (oldIMHandle);

35533

}

35534

}

35535

if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) {

35536

- int /*long*/ imHandle = imHandle ();

35537

+ long /*int*/ imHandle = imHandle ();

35538

if (imHandle != 0) OS.gtk_im_context_focus_in (imHandle);

35539

}

35540

}

35541

return 0;

35542

}

35543

35544

-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {

35545

+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {

35546

// widget could be disposed at this point

35547

if (handle != 0) {

35548

if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) {

35549

- int /*long*/ imHandle = imHandle ();

35550

+ long /*int*/ imHandle = imHandle ();

35551

if (imHandle != 0) {

35552

OS.gtk_im_context_focus_out (imHandle);

35553

}

35554

@@ -2818,7 +2818,7 @@

35555

return 0;

35556

}

35557

35558

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {

35559

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {

35560

if (!hasFocus ()) return 0;

35561

GdkEventKey gdkEvent = new GdkEventKey ();

35562

OS.memmove (gdkEvent, event, GdkEventKey.sizeof);

35563

@@ -2837,16 +2837,16 @@

35564

return super.gtk_key_press_event (widget, event);

35565

}

35566

35567

-int /*long*/ gtk_key_release_event (int /*long*/ widget, int /*long*/ event) {

35568

+long /*int*/ gtk_key_release_event (long /*int*/ widget, long /*int*/ event) {

35569

if (!hasFocus ()) return 0;

35570

- int /*long*/ imHandle = imHandle ();

35571

+ long /*int*/ imHandle = imHandle ();

35572

if (imHandle != 0) {

35573

if (OS.gtk_im_context_filter_keypress (imHandle, event)) return 1;

35574

}

35575

return super.gtk_key_release_event (widget, event);

35576

}

35577

35578

-int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {

35579

+long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) {

35580

if (display.currentControl != this) return 0;

35581

display.removeMouseHoverTimeout (handle);

35582

int result = 0;

35583

@@ -2861,15 +2861,15 @@

35584

return result;

35585

}

35586

35587

-int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {

35588

+long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {

35589

int result = 0;

35590

- int /*long*/ eventPtr = OS.gtk_get_current_event ();

35591

+ long /*int*/ eventPtr = OS.gtk_get_current_event ();

35592

if (eventPtr != 0) {

35593

GdkEventKey keyEvent = new GdkEventKey ();

35594

OS.memmove (keyEvent, eventPtr, GdkEventKey.sizeof);

35595

if (keyEvent.type == OS.GDK_KEY_PRESS) {

35596

Control focusControl = display.getFocusControl ();

35597

- int /*long*/ focusHandle = focusControl != null ? focusControl.focusHandle () : 0;

35598

+ long /*int*/ focusHandle = focusControl != null ? focusControl.focusHandle () : 0;

35599

if (focusHandle != 0) {

35600

display.mnemonicControl = this;

35601

OS.gtk_widget_event (focusHandle, eventPtr);

35602

@@ -2882,7 +2882,7 @@

35603

return result;

35604

}

35605

35606

-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {

35607

+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {

35608

GdkEventMotion gdkEvent = new GdkEventMotion ();

35609

OS.memmove (gdkEvent, event, GdkEventMotion.sizeof);

35610

if (this == display.currentControl && (hooks (SWT.MouseHover) || filters (SWT.MouseHover))) {

35611

@@ -2892,7 +2892,7 @@

35612

int state = gdkEvent.state;

35613

if (gdkEvent.is_hint != 0) {

35614

int [] pointer_x = new int [1], pointer_y = new int [1], mask = new int [1];

35615

- int /*long*/ window = eventWindow ();

35616

+ long /*int*/ window = eventWindow ();

35617

OS.gdk_window_get_pointer (window, pointer_x, pointer_y, mask);

35618

x = pointer_x [0];

35619

y = pointer_y [0];

35620

@@ -2902,32 +2902,32 @@

35621

return result;

35622

}

35623

35624

-int /*long*/ gtk_popup_menu (int /*long*/ widget) {

35625

+long /*int*/ gtk_popup_menu (long /*int*/ widget) {

35626

if (!hasFocus()) return 0;

35627

int [] x = new int [1], y = new int [1];

35628

OS.gdk_window_get_pointer (0, x, y, null);

35629

return showMenu (x [0], y [0]) ? 1 : 0;

35630

}

35631

35632

-int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {

35633

+long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) {

35634

display.showIMWindow (this);

35635

return 0;

35636

}

35637

35638

-int /*long*/ gtk_realize (int /*long*/ widget) {

35639

- int /*long*/ imHandle = imHandle ();

35640

+long /*int*/ gtk_realize (long /*int*/ widget) {

35641

+ long /*int*/ imHandle = imHandle ();

35642

if (imHandle != 0) {

35643

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ());

35644

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ());

35645

OS.gtk_im_context_set_client_window (imHandle, window);

35646

}

35647

if (backgroundImage != null) {

35648

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ());

35649

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ());

35650

if (window != 0) OS.gdk_window_set_back_pixmap (window, backgroundImage.pixmap, false);

35651

}

35652

return 0;

35653

}

35654

35655

-int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ eventPtr) {

35656

+long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ eventPtr) {

35657

GdkEventScroll gdkEvent = new GdkEventScroll ();

35658

OS.memmove (gdkEvent, eventPtr, GdkEventScroll.sizeof);

35659

switch (gdkEvent.direction) {

35660

@@ -2943,29 +2943,29 @@

35661

return 0;

35662

}

35663

35664

-int /*long*/ gtk_show_help (int /*long*/ widget, int /*long*/ helpType) {

35665

+long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) {

35666

if (!hasFocus ()) return 0;

35667

return sendHelpEvent (helpType) ? 1 : 0;

35668

}

35669

35670

-int /*long*/ gtk_style_set (int /*long*/ widget, int /*long*/ previousStyle) {

35671

+long /*int*/ gtk_style_set (long /*int*/ widget, long /*int*/ previousStyle) {

35672

if (backgroundImage != null) {

35673

setBackgroundPixmap (backgroundImage.pixmap);

35674

}

35675

return 0;

35676

}

35677

35678

-int /*long*/ gtk_unrealize (int /*long*/ widget) {

35679

- int /*long*/ imHandle = imHandle ();

35680

+long /*int*/ gtk_unrealize (long /*int*/ widget) {

35681

+ long /*int*/ imHandle = imHandle ();

35682

if (imHandle != 0) OS.gtk_im_context_set_client_window (imHandle, 0);

35683

return 0;

35684

}

35685

35686

-int /*long*/ gtk_visibility_notify_event (int /*long*/ widget, int /*long*/ event) {

35687

+long /*int*/ gtk_visibility_notify_event (long /*int*/ widget, long /*int*/ event) {

35688

GdkEventVisibility gdkEvent = new GdkEventVisibility ();

35689

OS.memmove (gdkEvent, event, GdkEventVisibility.sizeof);

35690

- int /*long*/ paintWindow = paintWindow();

35691

- int /*long*/ window = gdkEvent.window;

35692

+ long /*int*/ paintWindow = paintWindow();

35693

+ long /*int*/ window = gdkEvent.window;

35694

if (window == paintWindow) {

35695

if (gdkEvent.state == OS.GDK_VISIBILITY_FULLY_OBSCURED) {

35696

state |= OBSCURED;

35697

@@ -2984,7 +2984,7 @@

35698

return 0;

35699

}

35700

35701

-void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {

35702

+void gtk_widget_size_request (long /*int*/ widget, GtkRequisition requisition) {

35703

OS.gtk_widget_size_request (widget, requisition);

35704

}

35705

35706

@@ -3001,11 +3001,11 @@

35707

* @param data the platform specific GC data

35708

* @return the platform specific GC handle

35709

*/

35710

-public int /*long*/ internal_new_GC (GCData data) {

35711

+public long /*int*/ internal_new_GC (GCData data) {

35712

checkWidget ();

35713

- int /*long*/ window = paintWindow ();

35714

+ long /*int*/ window = paintWindow ();

35715

if (window == 0) SWT.error (SWT.ERROR_NO_HANDLES);

35716

- int /*long*/ gdkGC = OS.gdk_gc_new (window);

35717

+ long /*int*/ gdkGC = OS.gdk_gc_new (window);

35718

if (gdkGC == 0) error (SWT.ERROR_NO_HANDLES);

35719

if (data != null) {

35720

int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;

35721

@@ -3027,7 +3027,7 @@

35722

return gdkGC;

35723

}

35724

35725

-int /*long*/ imHandle () {

35726

+long /*int*/ imHandle () {

35727

return 0;

35728

}

35729

35730

@@ -3044,7 +3044,7 @@

35731

* @param hDC the platform specific GC handle

35732

* @param data the platform specific GC data

35733

*/

35734

-public void internal_dispose_GC (int /*long*/ gdkGC, GCData data) {

35735

+public void internal_dispose_GC (long /*int*/ gdkGC, GCData data) {

35736

checkWidget ();

35737

OS.g_object_unref (gdkGC);

35738

}

35739

@@ -3184,7 +3184,7 @@

35740

void register () {

35741

super.register ();

35742

if (fixedHandle != 0) display.addWidget (fixedHandle, this);

35743

- int /*long*/ imHandle = imHandle ();

35744

+ long /*int*/ imHandle = imHandle ();

35745

if (imHandle != 0) display.addWidget (imHandle, this);

35746

}

35747

35748

@@ -3260,7 +3260,7 @@

35749

35750

void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boolean all, boolean trim) {

35751

if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) == 0) return;

35752

- int /*long*/ window = paintWindow ();

35753

+ long /*int*/ window = paintWindow ();

35754

GdkRectangle rect = new GdkRectangle ();

35755

if (redrawAll) {

35756

int [] w = new int [1], h = new int [1];

35757

@@ -3310,7 +3310,7 @@

35758

super.releaseWidget ();

35759

if (display.currentControl == this) display.currentControl = null;

35760

display.removeMouseHoverTimeout (handle);

35761

- int /*long*/ imHandle = imHandle ();

35762

+ long /*int*/ imHandle = imHandle ();

35763

if (imHandle != 0) {

35764

OS.gtk_im_context_reset (imHandle);

35765

OS.gtk_im_context_set_client_window (imHandle, 0);

35766

@@ -3376,7 +3376,7 @@

35767

}

35768

}

35769

35770

-boolean sendHelpEvent (int /*long*/ helpType) {

35771

+boolean sendHelpEvent (long /*int*/ helpType) {

35772

Control control = this;

35773

while (control != null) {

35774

if (control.hooks (SWT.Help)) {

35775

@@ -3407,7 +3407,7 @@

35776

event.x = (int)x;

35777

event.y = (int)y;

35778

} else {

35779

- int /*long*/ window = eventWindow ();

35780

+ long /*int*/ window = eventWindow ();

35781

int [] origin_x = new int [1], origin_y = new int [1];

35782

OS.gdk_window_get_origin (window, origin_x, origin_y);

35783

event.x = (int)x - origin_x [0];

35784

@@ -3461,7 +3461,7 @@

35785

}

35786

boolean set = false;

35787

if (gdkColor == null) {

35788

- int /*long*/ style = OS.gtk_widget_get_modifier_style (handle);

35789

+ long /*int*/ style = OS.gtk_widget_get_modifier_style (handle);

35790

set = (OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL) & OS.GTK_RC_BG) != 0;

35791

} else {

35792

GdkColor oldColor = getBackgroundColor ();

35793

@@ -3478,10 +3478,10 @@

35794

}

35795

}

35796

35797

-void setBackgroundColor (int /*long*/ handle, GdkColor color) {

35798

+void setBackgroundColor (long /*int*/ handle, GdkColor color) {

35799

int index = OS.GTK_STATE_NORMAL;

35800

- int /*long*/ style = OS.gtk_widget_get_modifier_style (handle);

35801

- int /*long*/ ptr = OS.gtk_rc_style_get_bg_pixmap_name (style, index);

35802

+ long /*int*/ style = OS.gtk_widget_get_modifier_style (handle);

35803

+ long /*int*/ ptr = OS.gtk_rc_style_get_bg_pixmap_name (style, index);

35804

if (ptr != 0) OS.g_free (ptr);

35805

String name = color == null ? "<parent>" : "<none>";

35806

byte[] buffer = Converter.wcsToMbcs (null, name, true);

35807

@@ -3535,8 +3535,8 @@

35808

redrawChildren ();

35809

}

35810

35811

-void setBackgroundPixmap (int /*long*/ pixmap) {

35812

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ());

35813

+void setBackgroundPixmap (long /*int*/ pixmap) {

35814

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ());

35815

if (window != 0) OS.gdk_window_set_back_pixmap (window, backgroundImage.pixmap, false);

35816

}

35817

35818

@@ -3590,14 +3590,14 @@

35819

setCursor (cursor != null ? cursor.handle : 0);

35820

}

35821

35822

-void setCursor (int /*long*/ cursor) {

35823

- int /*long*/ window = eventWindow ();

35824

+void setCursor (long /*int*/ cursor) {

35825

+ long /*int*/ window = eventWindow ();

35826

if (window != 0) {

35827

OS.gdk_window_set_cursor (window, cursor);

35828

if (!OS.GDK_WINDOWING_X11 ()) {

35829

OS.gdk_flush ();

35830

} else {

35831

- int /*long*/ xDisplay = OS.GDK_DISPLAY ();

35832

+ long /*int*/ xDisplay = OS.GDK_DISPLAY ();

35833

OS.XFlush (xDisplay);

35834

}

35835

}

35836

@@ -3665,9 +3665,9 @@

35837

}

35838

} else {

35839

OS.gtk_widget_realize (handle);

35840

- int /*long*/ parentHandle = parent.eventHandle ();

35841

- int /*long*/ window = parent.eventWindow ();

35842

- int /*long*/ topHandle = topHandle ();

35843

+ long /*int*/ parentHandle = parent.eventHandle ();

35844

+ long /*int*/ window = parent.eventWindow ();

35845

+ long /*int*/ topHandle = topHandle ();

35846

GdkWindowAttr attributes = new GdkWindowAttr ();

35847

attributes.x = OS.GTK_WIDGET_X (topHandle);

35848

attributes.y = OS.GTK_WIDGET_Y (topHandle);

35849

@@ -3682,9 +3682,9 @@

35850

if (!OS.GDK_WINDOWING_X11 ()) {

35851

OS.gdk_window_raise (enableWindow);

35852

} else {

35853

- int /*long*/ topWindow = OS.GTK_WIDGET_WINDOW (topHandle);

35854

- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (topWindow);

35855

- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (enableWindow);

35856

+ long /*int*/ topWindow = OS.GTK_WIDGET_WINDOW (topHandle);

35857

+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (topWindow);

35858

+ long /*int*/ xWindow = OS.gdk_x11_drawable_get_xid (enableWindow);

35859

int xScreen = OS.XDefaultScreen (xDisplay);

35860

int flags = OS.CWStackMode | OS.CWSibling;

35861

XWindowChanges changes = new XWindowChanges ();

35862

@@ -3737,7 +3737,7 @@

35863

checkWidget();

35864

if (((state & FONT) == 0) && font == null) return;

35865

this.font = font;

35866

- int /*long*/ fontDesc;

35867

+ long /*int*/ fontDesc;

35868

if (font == null) {

35869

fontDesc = defaultFont ().handle;

35870

} else {

35871

@@ -3752,7 +3752,7 @@

35872

setFontDescription (fontDesc);

35873

}

35874

35875

-void setFontDescription (int /*long*/ font) {

35876

+void setFontDescription (long /*int*/ font) {

35877

OS.gtk_widget_modify_font (handle, font);

35878

}

35879

35880

@@ -3783,7 +3783,7 @@

35881

}

35882

boolean set = false;

35883

if (gdkColor == null) {

35884

- int /*long*/ style = OS.gtk_widget_get_modifier_style (handle);

35885

+ long /*int*/ style = OS.gtk_widget_get_modifier_style (handle);

35886

set = (OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL) & OS.GTK_RC_FG) != 0;

35887

} else {

35888

GdkColor oldColor = getForegroundColor ();

35889

@@ -3811,7 +3811,7 @@

35890

* first sized. The fix is to set the value to (0, 0) as

35891

* expected by SWT.

35892

*/

35893

- int /*long*/ topHandle = topHandle ();

35894

+ long /*int*/ topHandle = topHandle ();

35895

if ((parent.style & SWT.MIRRORED) != 0) {

35896

OS.GTK_WIDGET_SET_X (topHandle, parent.getClientWidth ());

35897

} else {

35898

@@ -3893,7 +3893,7 @@

35899

if (this.parent == parent) return true;

35900

if (!isReparentable ()) return false;

35901

OS.gtk_widget_realize (parent.handle);

35902

- int /*long*/ topHandle = topHandle ();

35903

+ long /*int*/ topHandle = topHandle ();

35904

int x = OS.GTK_WIDGET_X (topHandle);

35905

int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);

35906

if ((this.parent.style & SWT.MIRRORED) != 0) {

35907

@@ -3912,7 +3912,7 @@

35908

newDecorations.fixAccelGroup ();

35909

oldDecorations.fixAccelGroup ();

35910

}

35911

- int /*long*/ newParent = parent.parentingHandle();

35912

+ long /*int*/ newParent = parent.parentingHandle();

35913

OS.gtk_widget_reparent (topHandle, newParent);

35914

OS.gtk_fixed_move (newParent, topHandle, x, y);

35915

this.parent = parent;

35916

@@ -3925,7 +3925,7 @@

35917

if (fixedHandle != 0) setBackgroundColor (fixedHandle, null);

35918

}

35919

35920

-void setParentWindow (int /*long*/ widget) {

35921

+void setParentWindow (long /*int*/ widget) {

35922

}

35923

35924

boolean setRadioSelection (boolean value) {

35925

@@ -3960,7 +3960,7 @@

35926

if (redraw) {

35927

if (--drawCount == 0) {

35928

if (redrawWindow != 0) {

35929

- int /*long*/ window = paintWindow ();

35930

+ long /*int*/ window = paintWindow ();

35931

/* Explicitly hiding the window avoids flicker on GTK+ >= 2.6 */

35932

OS.gdk_window_hide (redrawWindow);

35933

OS.gdk_window_destroy (redrawWindow);

35934

@@ -3971,7 +3971,7 @@

35935

} else {

35936

if (drawCount++ == 0) {

35937

if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) != 0) {

35938

- int /*long*/ window = paintWindow ();

35939

+ long /*int*/ window = paintWindow ();

35940

Rectangle rect = getBounds ();

35941

GdkWindowAttr attributes = new GdkWindowAttr ();

35942

attributes.width = rect.width;

35943

@@ -4066,7 +4066,7 @@

35944

public void setVisible (boolean visible) {

35945

checkWidget();

35946

if (((state & HIDDEN) == 0) == visible) return;

35947

- int /*long*/ topHandle = topHandle();

35948

+ long /*int*/ topHandle = topHandle();

35949

if (visible) {

35950

/*

35951

* It is possible (but unlikely), that application

35952

@@ -4147,11 +4147,11 @@

35953

}

35954

}

35955

35956

- int /*long*/ topHandle = topHandle ();

35957

- int /*long*/ siblingHandle = sibling != null ? sibling.topHandle () : 0;

35958

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topHandle);

35959

+ long /*int*/ topHandle = topHandle ();

35960

+ long /*int*/ siblingHandle = sibling != null ? sibling.topHandle () : 0;

35961

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topHandle);

35962

if (window != 0) {

35963

- int /*long*/ siblingWindow = 0;

35964

+ long /*int*/ siblingWindow = 0;

35965

if (sibling != null) {

35966

if (above && sibling.enableWindow != 0) {

35967

siblingWindow = enableWindow;

35968

@@ -4159,7 +4159,7 @@

35969

siblingWindow = OS.GTK_WIDGET_WINDOW (siblingHandle);

35970

}

35971

}

35972

- int /*long*/ redrawWindow = fixChildren ? parent.redrawWindow : 0;

35973

+ long /*int*/ redrawWindow = fixChildren ? parent.redrawWindow : 0;

35974

if (!OS.GDK_WINDOWING_X11 () || (siblingWindow == 0 && (!above || redrawWindow == 0))) {

35975

if (above) {

35976

OS.gdk_window_raise (window);

35977

@@ -4174,8 +4174,8 @@

35978

changes.sibling = OS.gdk_x11_drawable_get_xid (siblingWindow != 0 ? siblingWindow : redrawWindow);

35979

changes.stack_mode = above ? OS.Above : OS.Below;

35980

if (redrawWindow != 0 && siblingWindow == 0) changes.stack_mode = OS.Below;

35981

- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);

35982

- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window);

35983

+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);

35984

+ long /*int*/ xWindow = OS.gdk_x11_drawable_get_xid (window);

35985

int xScreen = OS.XDefaultScreen (xDisplay);

35986

int flags = OS.CWStackMode | OS.CWSibling;

35987

/*

35988

@@ -4242,10 +4242,10 @@

35989

35990

void setWidgetBackground () {

35991

if (fixedHandle != 0) {

35992

- int /*long*/ style = OS.gtk_widget_get_modifier_style (fixedHandle);

35993

+ long /*int*/ style = OS.gtk_widget_get_modifier_style (fixedHandle);

35994

modifyStyle (fixedHandle, style);

35995

}

35996

- int /*long*/ style = OS.gtk_widget_get_modifier_style (handle);

35997

+ long /*int*/ style = OS.gtk_widget_get_modifier_style (handle);

35998

modifyStyle (handle, style);

35999

}

36000

36001

@@ -4273,8 +4273,8 @@

36002

void showWidget () {

36003

// Comment this line to disable zero-sized widgets

36004

state |= ZERO_WIDTH | ZERO_HEIGHT;

36005

- int /*long*/ topHandle = topHandle ();

36006

- int /*long*/ parentHandle = parent.parentingHandle ();

36007

+ long /*int*/ topHandle = topHandle ();

36008

+ long /*int*/ parentHandle = parent.parentingHandle ();

36009

parent.setParentWindow (topHandle);

36010

OS.gtk_container_add (parentHandle, topHandle);

36011

if (handle != 0 && handle != topHandle) OS.gtk_widget_show (handle);

36012

@@ -4541,7 +4541,7 @@

36013

// checkWidget();

36014

if (!OS.GTK_WIDGET_VISIBLE (topHandle ())) return;

36015

if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) == 0) return;

36016

- int /*long*/ window = paintWindow ();

36017

+ long /*int*/ window = paintWindow ();

36018

if (flush) display.flushExposes (window, all);

36019

OS.gdk_window_process_updates (window, all);

36020

OS.gdk_flush ();

36021

@@ -4559,7 +4559,7 @@

36022

/* Do nothing */

36023

}

36024

36025

-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {

36026

+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {

36027

switch ((int)/*64*/user_data) {

36028

case EXPOSE_EVENT_INVERSE: {

36029

if ((OS.GTK_VERSION < OS.VERSION (2, 8, 0)) && ((state & OBSCURED) == 0)) {

36030

@@ -4567,10 +4567,10 @@

36031

if (control != null && control.backgroundImage != null) {

36032

GdkEventExpose gdkEvent = new GdkEventExpose ();

36033

OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);

36034

- int /*long*/ paintWindow = paintWindow();

36035

- int /*long*/ window = gdkEvent.window;

36036

+ long /*int*/ paintWindow = paintWindow();

36037

+ long /*int*/ window = gdkEvent.window;

36038

if (window != paintWindow) break;

36039

- int /*long*/ gdkGC = OS.gdk_gc_new (window);

36040

+ long /*int*/ gdkGC = OS.gdk_gc_new (window);

36041

OS.gdk_gc_set_clip_region (gdkGC, gdkEvent.region);

36042

int[] dest_x = new int[1], dest_y = new int[1];

36043

OS.gtk_widget_translate_coordinates (paintHandle (), control.paintHandle (), 0, 0, dest_x, dest_y);

36044

diff -urN x86/org/eclipse/swt/widgets/DateTime.java x86_64/org/eclipse/swt/widgets/DateTime.java

36045

--- x86/org/eclipse/swt/widgets/DateTime.java 2009-05-29 17:30:04.000000000 -0400

36046

+++ x86_64/org/eclipse/swt/widgets/DateTime.java 2009-09-17 08:48:24.000000000 -0400

36047

@@ -483,17 +483,17 @@

36048

}

36049

}

36050

36051

-int /*long*/ gtk_day_selected (int /*long*/ widget) {

36052

+long /*int*/ gtk_day_selected (long /*int*/ widget) {

36053

sendSelectionEvent ();

36054

return 0;

36055

}

36056

36057

-int /*long*/ gtk_day_selected_double_click (int /*long*/ widget) {

36058

+long /*int*/ gtk_day_selected_double_click (long /*int*/ widget) {

36059

postEvent(SWT.DefaultSelection);

36060

return 0;

36061

}

36062

36063

-int /*long*/ gtk_month_changed (int /*long*/ widget) {

36064

+long /*int*/ gtk_month_changed (long /*int*/ widget) {

36065

sendSelectionEvent ();

36066

return 0;

36067

}

36068

diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/widgets/Decorations.java

36069

--- x86/org/eclipse/swt/widgets/Decorations.java 2009-05-29 17:30:04.000000000 -0400

36070

+++ x86_64/org/eclipse/swt/widgets/Decorations.java 2009-09-17 08:48:24.000000000 -0400

36071

@@ -102,7 +102,7 @@

36072

Menu [] menus;

36073

Control savedFocus;

36074

Button defaultButton, saveDefault;

36075

- int /*long*/ accelGroup, vboxHandle;

36076

+ long /*int*/ accelGroup, vboxHandle;

36077

36078

Decorations () {

36079

/* Do nothing */

36080

@@ -171,17 +171,17 @@

36081

sort (bestImages);

36082

images = bestImages;

36083

}

36084

- int /*long*/ pixbufs = 0;

36085

+ long /*int*/ pixbufs = 0;

36086

if (images != null) {

36087

for (int i = 0; i < images.length; i++) {

36088

Image image = images [i];

36089

- int /*long*/ pixbuf = Display.createPixbuf (image);

36090

+ long /*int*/ pixbuf = Display.createPixbuf (image);

36091

pixbufs = OS.g_list_append (pixbufs, pixbuf);

36092

}

36093

}

36094

OS.gtk_window_set_icon_list (topHandle (), pixbufs);

36095

- int /*long*/ [] data = new int /*long*/ [1];

36096

- int /*long*/ temp = pixbufs;

36097

+ long /*int*/ [] data = new long /*int*/ [1];

36098

+ long /*int*/ temp = pixbufs;

36099

while (temp != 0) {

36100

OS.memmove (data, temp, OS.PTR_SIZEOF);

36101

OS.g_object_unref (data [0]);

36102

@@ -232,7 +232,7 @@

36103

accelGroup = OS.gtk_accel_group_new ();

36104

if (accelGroup == 0) SWT.error (SWT.ERROR_NO_HANDLES);

36105

//FIXME - what should we do for Decorations

36106

- int /*long*/ shellHandle = topHandle ();

36107

+ long /*int*/ shellHandle = topHandle ();

36108

OS.gtk_window_add_accel_group (shellHandle, accelGroup);

36109

}

36110

36111

@@ -243,7 +243,7 @@

36112

36113

void destroyAccelGroup () {

36114

if (accelGroup == 0) return;

36115

- int /*long*/ shellHandle = topHandle ();

36116

+ long /*int*/ shellHandle = topHandle ();

36117

OS.gtk_window_remove_accel_group (shellHandle, accelGroup);

36118

//TEMPORARY CODE

36119

// OS.g_object_unref (accelGroup);

36120

@@ -533,7 +533,7 @@

36121

*/

36122

public void setDefaultButton (Button button) {

36123

checkWidget();

36124

- int /*long*/ buttonHandle = 0;

36125

+ long /*int*/ buttonHandle = 0;

36126

if (button != null) {

36127

if (button.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);

36128

if (button.menuShell () != this) error (SWT.ERROR_INVALID_PARENT);

36129

@@ -745,7 +745,7 @@

36130

* key.

36131

*/

36132

if (!button.isVisible () || !button.isEnabled ()) return true;

36133

- int /*long*/ shellHandle = _getShell ().topHandle ();

36134

+ long /*int*/ shellHandle = _getShell ().topHandle ();

36135

return OS.gtk_window_activate_default (shellHandle);

36136

}

36137

36138

diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/swt/widgets/DirectoryDialog.java

36139

--- x86/org/eclipse/swt/widgets/DirectoryDialog.java 2009-05-29 17:30:04.000000000 -0400

36140

+++ x86_64/org/eclipse/swt/widgets/DirectoryDialog.java 2009-09-17 08:48:24.000000000 -0400

36141

@@ -125,16 +125,16 @@

36142

}

36143

String openChooserDialog () {

36144

byte [] titleBytes = Converter.wcsToMbcs (null, title, true);

36145

- int /*long*/ shellHandle = parent.topHandle ();

36146

+ long /*int*/ shellHandle = parent.topHandle ();

36147

Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();

36148

- int /*long*/ handle = 0;

36149

+ long /*int*/ handle = 0;

36150

if (display.getDismissalAlignment() == SWT.RIGHT) {

36151

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);

36152

} else {

36153

handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, OS.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, 0);

36154

}

36155

OS.gtk_window_set_modal (handle, true);

36156

- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);

36157

+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);

36158

if (pixbufs != 0) {

36159

OS.gtk_window_set_icon_list (handle, pixbufs);

36160

OS.g_list_free (pixbufs);

36161

@@ -152,7 +152,7 @@

36162

* when setting a file name that is not a true canonical path.

36163

* The fix is to use the canonical path.

36164

*/

36165

- int /*long*/ ptr = OS.realpath (buffer, null);

36166

+ long /*int*/ ptr = OS.realpath (buffer, null);

36167

if (ptr != 0) {

36168

OS.gtk_file_chooser_set_current_folder (handle, ptr);

36169

OS.g_free (ptr);

36170

@@ -160,9 +160,9 @@

36171

}

36172

if (message.length () > 0) {

36173

byte [] buffer = Converter.wcsToMbcs (null, message, true);

36174

- int /*long*/ box = OS.gtk_hbox_new (false, 0);

36175

+ long /*int*/ box = OS.gtk_hbox_new (false, 0);

36176

if (box == 0) error (SWT.ERROR_NO_HANDLES);

36177

- int /*long*/ label = OS.gtk_label_new (buffer);

36178

+ long /*int*/ label = OS.gtk_label_new (buffer);

36179

if (label == 0) error (SWT.ERROR_NO_HANDLES);

36180

OS.gtk_container_add (box, label);

36181

OS.gtk_widget_show (label);

36182

@@ -178,7 +178,7 @@

36183

display.setModalDialog (this);

36184

}

36185

int signalId = 0;

36186

- int /*long*/ hookId = 0;

36187

+ long /*int*/ hookId = 0;

36188

if ((style & SWT.RIGHT_TO_LEFT) != 0) {

36189

signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());

36190

hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);

36191

@@ -191,13 +191,13 @@

36192

display.setModalDialog (oldModal);

36193

}

36194

if (response == OS.GTK_RESPONSE_OK) {

36195

- int /*long*/ path = OS.gtk_file_chooser_get_filename (handle);

36196

+ long /*int*/ path = OS.gtk_file_chooser_get_filename (handle);

36197

if (path != 0) {

36198

- int /*long*/ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);

36199

+ long /*int*/ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);

36200

OS.g_free (path);

36201

if (utf8Ptr != 0) {

36202

- int /*long*/ [] items_written = new int /*long*/ [1];

36203

- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);

36204

+ long /*int*/ [] items_written = new long /*int*/ [1];

36205

+ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);

36206

OS.g_free (utf8Ptr);

36207

if (utf16Ptr != 0) {

36208

int clength = (int)/*64*/items_written [0];

36209

@@ -216,11 +216,11 @@

36210

}

36211

String openClassicDialog () {

36212

byte [] titleBytes = Converter.wcsToMbcs (null, title, true);

36213

- int /*long*/ handle = OS.gtk_file_selection_new (titleBytes);

36214

+ long /*int*/ handle = OS.gtk_file_selection_new (titleBytes);

36215

if (parent != null) {

36216

- int /*long*/ shellHandle = parent.topHandle ();

36217

+ long /*int*/ shellHandle = parent.topHandle ();

36218

OS.gtk_window_set_transient_for (handle, shellHandle);

36219

- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);

36220

+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);

36221

if (pixbufs != 0) {

36222

OS.gtk_window_set_icon_list (handle, pixbufs);

36223

OS.g_list_free (pixbufs);

36224

@@ -236,8 +236,8 @@

36225

int length = path.length ();

36226

char [] buffer = new char [length + 1];

36227

path.getChars (0, length, buffer, 0);

36228

- int /*long*/ utf8Ptr = OS.g_utf16_to_utf8 (buffer, -1, null, null, null);

36229

- int /*long*/ fileNamePtr = OS.g_filename_from_utf8 (utf8Ptr, -1, null, null, null);

36230

+ long /*int*/ utf8Ptr = OS.g_utf16_to_utf8 (buffer, -1, null, null, null);

36231

+ long /*int*/ fileNamePtr = OS.g_filename_from_utf8 (utf8Ptr, -1, null, null, null);

36232

OS.gtk_file_selection_set_filename (handle, fileNamePtr);

36233

OS.g_free (utf8Ptr);

36234

OS.g_free (fileNamePtr);

36235

@@ -245,12 +245,12 @@

36236

GtkFileSelection selection = new GtkFileSelection ();

36237

OS.memmove (selection, handle);

36238

OS.gtk_file_selection_hide_fileop_buttons (handle);

36239

- int /*long*/ fileListParent = OS.gtk_widget_get_parent (selection.file_list);

36240

+ long /*int*/ fileListParent = OS.gtk_widget_get_parent (selection.file_list);

36241

OS.gtk_widget_hide (selection.file_list);

36242

OS.gtk_widget_hide (fileListParent);

36243

if (message.length () > 0) {

36244

byte [] buffer = Converter.wcsToMbcs (null, message, true);

36245

- int /*long*/ labelHandle = OS.gtk_label_new (buffer);

36246

+ long /*int*/ labelHandle = OS.gtk_label_new (buffer);

36247

OS.gtk_label_set_line_wrap (labelHandle, true);

36248

OS.gtk_misc_set_alignment (labelHandle, 0.0f, 0.0f);

36249

OS.gtk_container_add (selection.main_vbox, labelHandle);

36250

@@ -266,7 +266,7 @@

36251

display.setModalDialog (this);

36252

}

36253

int signalId = 0;

36254

- int /*long*/ hookId = 0;

36255

+ long /*int*/ hookId = 0;

36256

if ((style & SWT.RIGHT_TO_LEFT) != 0) {

36257

signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());

36258

hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);

36259

@@ -279,11 +279,11 @@

36260

display.setModalDialog (oldModal);

36261

}

36262

if (response == OS.GTK_RESPONSE_OK) {

36263

- int /*long*/ fileNamePtr = OS.gtk_file_selection_get_filename (handle);

36264

- int /*long*/ utf8Ptr = OS.g_filename_to_utf8 (fileNamePtr, -1, null, null, null);

36265

+ long /*int*/ fileNamePtr = OS.gtk_file_selection_get_filename (handle);

36266

+ long /*int*/ utf8Ptr = OS.g_filename_to_utf8 (fileNamePtr, -1, null, null, null);

36267

if (utf8Ptr != 0) {

36268

- int /*long*/ [] items_written = new int /*long*/ [1];

36269

- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);

36270

+ long /*int*/ [] items_written = new long /*int*/ [1];

36271

+ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);

36272

if (utf16Ptr != 0) {

36273

int length = (int)/*64*/items_written [0];

36274

char [] buffer = new char [length];

36275

diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets/Display.java

36276

--- x86/org/eclipse/swt/widgets/Display.java 2009-05-29 17:20:00.000000000 -0400

36277

+++ x86_64/org/eclipse/swt/widgets/Display.java 2009-09-17 08:48:24.000000000 -0400

36278

@@ -98,29 +98,29 @@

36279

36280

/* Events Dispatching and Callback */

36281

int gdkEventCount;

36282

- int /*long*/ [] gdkEvents;

36283

+ long /*int*/ [] gdkEvents;

36284

Widget [] gdkEventWidgets;

36285

int [] dispatchEvents;

36286

Event [] eventQueue;

36287

- int /*long*/ fds;

36288

+ long /*int*/ fds;

36289

int allocated_nfds;

36290

boolean wake;

36291

int [] max_priority = new int [1], timeout = new int [1];

36292

Callback eventCallback, filterCallback;

36293

- int /*long*/ eventProc, filterProc, windowProc2, windowProc3, windowProc4, windowProc5;

36294

+ long /*int*/ eventProc, filterProc, windowProc2, windowProc3, windowProc4, windowProc5;

36295

Callback windowCallback2, windowCallback3, windowCallback4, windowCallback5;

36296

EventTable eventTable, filterTable;

36297

static String APP_NAME = "SWT"; //$NON-NLS-1$

36298

static final String DISPATCH_EVENT_KEY = "org.eclipse.swt.internal.gtk.dispatchEvent"; //$NON-NLS-1$

36299

static final String ADD_WIDGET_KEY = "org.eclipse.swt.internal.addWidget"; //$NON-NLS-1$

36300

- int /*long*/ [] closures;

36301

+ long /*int*/ [] closures;

36302

int [] signalIds;

36303

- int /*long*/ shellMapProcClosure;

36304

+ long /*int*/ shellMapProcClosure;

36305

36306

/* Widget Table */

36307

int [] indexTable;

36308

int freeSlot;

36309

- int /*long*/ lastHandle;

36310

+ long /*int*/ lastHandle;

36311

Widget lastWidget;

36312

Widget [] widgetTable;

36313

final static int GROW_SIZE = 1024;

36314

@@ -151,7 +151,7 @@

36315

36316

/* Input method resources */

36317

Control imControl;

36318

- int /*long*/ preeditWindow, preeditLabel;

36319

+ long /*int*/ preeditWindow, preeditLabel;

36320

36321

/* Sync/Async Widget Communication */

36322

Synchronizer synchronizer = new Synchronizer (this);

36323

@@ -167,40 +167,40 @@

36324

int [] timerIds;

36325

Runnable [] timerList;

36326

Callback timerCallback;

36327

- int /*long*/ timerProc;

36328

+ long /*int*/ timerProc;

36329

Callback windowTimerCallback;

36330

- int /*long*/ windowTimerProc;

36331

+ long /*int*/ windowTimerProc;

36332

36333

/* Caret */

36334

Caret currentCaret;

36335

Callback caretCallback;

36336

int caretId;

36337

- int /*long*/ caretProc;

36338

+ long /*int*/ caretProc;

36339

36340

/* Mnemonics */

36341

Control mnemonicControl;

36342

36343

/* Mouse hover */

36344

int mouseHoverId;

36345

- int /*long*/ mouseHoverHandle, mouseHoverProc;

36346

+ long /*int*/ mouseHoverHandle, mouseHoverProc;

36347

Callback mouseHoverCallback;

36348

36349

/* Menu position callback */

36350

- int /*long*/ menuPositionProc;

36351

+ long /*int*/ menuPositionProc;

36352

Callback menuPositionCallback;

36353

36354

/* Tooltip size allocate callback */

36355

- int /*long*/ sizeAllocateProc;

36356

+ long /*int*/ sizeAllocateProc;

36357

Callback sizeAllocateCallback;

36358

- int /*long*/ sizeRequestProc;

36359

+ long /*int*/ sizeRequestProc;

36360

Callback sizeRequestCallback;

36361

36362

/* Shell map callback */

36363

- int /*long*/ shellMapProc;

36364

+ long /*int*/ shellMapProc;

36365

Callback shellMapCallback;

36366

36367

/* Idle proc callback */

36368

- int /*long*/ idleProc;

36369

+ long /*int*/ idleProc;

36370

int idleHandle;

36371

Callback idleCallback;

36372

static final String ADD_IDLE_PROC_KEY = "org.eclipse.swt.internal.gtk.addIdleProc"; //$NON-NLS-1$

36373

@@ -211,29 +211,29 @@

36374

/* GtkTreeView callbacks */

36375

int[] treeSelection;

36376

int treeSelectionLength;

36377

- int /*long*/ treeSelectionProc;

36378

+ long /*int*/ treeSelectionProc;

36379

Callback treeSelectionCallback;

36380

- int /*long*/ cellDataProc;

36381

+ long /*int*/ cellDataProc;

36382

Callback cellDataCallback;

36383

36384

/* Set direction callback */

36385

- int /*long*/ setDirectionProc;

36386

+ long /*int*/ setDirectionProc;

36387

Callback setDirectionCallback;

36388

static final String GET_DIRECTION_PROC_KEY = "org.eclipse.swt.internal.gtk.getDirectionProc"; //$NON-NLS-1$

36389

36390

/* Set emissionProc callback */

36391

- int /*long*/ emissionProc;

36392

+ long /*int*/ emissionProc;

36393

Callback emissionProcCallback;

36394

static final String GET_EMISSION_PROC_KEY = "org.eclipse.swt.internal.gtk.getEmissionProc"; //$NON-NLS-1$

36395

36396

/* Get all children callback */

36397

- int /*long*/ allChildrenProc, allChildren;

36398

+ long /*int*/ allChildrenProc, allChildren;

36399

Callback allChildrenCallback;

36400

36401

/* Settings callbacks */

36402

- int /*long*/ styleSetProc;

36403

+ long /*int*/ styleSetProc;

36404

Callback styleSetCallback;

36405

- int /*long*/ shellHandle;

36406

+ long /*int*/ shellHandle;

36407

boolean settingsChanged, runSettings;

36408

36409

/* Entry focus behaviour */

36410

@@ -243,14 +243,14 @@

36411

Control currentControl;

36412

36413

/* Flush exposes */

36414

- int /*long*/ checkIfEventProc;

36415

+ long /*int*/ checkIfEventProc;

36416

Callback checkIfEventCallback;

36417

- int /*long*/ flushWindow;

36418

+ long /*int*/ flushWindow;

36419

boolean flushAll;

36420

GdkRectangle flushRect = new GdkRectangle ();

36421

XExposeEvent exposeEvent = new XExposeEvent ();

36422

XVisibilityEvent visibilityEvent = new XVisibilityEvent ();

36423

- int /*long*/ [] flushData = new int /*long*/ [1];

36424

+ long /*int*/ [] flushData = new long /*int*/ [1];

36425

36426

/* System Resources */

36427

Font systemFont;

36428

@@ -280,20 +280,20 @@

36429

int lastEventTime, lastUserEventTime;

36430

36431

/* Pango layout constructor */

36432

- int /*long*/ pangoLayoutNewProc, pangoLayoutNewDefaultProc;

36433

+ long /*int*/ pangoLayoutNewProc, pangoLayoutNewDefaultProc;

36434

Callback pangoLayoutNewCallback;

36435

36436

/* Fixed Subclass */

36437

- static int /*long*/ fixed_type;

36438

- static int /*long*/ fixed_info_ptr;

36439

+ static long /*int*/ fixed_type;

36440

+ static long /*int*/ fixed_info_ptr;

36441

static Callback fixedClassInitCallback, fixedMapCallback, fixedSizeAllocateCallback;

36442

- static int /*long*/ fixedClassInitProc, fixedMapProc, fixedSizeAllocateProc, oldFixedSizeAllocateProc;

36443

+ static long /*int*/ fixedClassInitProc, fixedMapProc, fixedSizeAllocateProc, oldFixedSizeAllocateProc;

36444

36445

/* Renderer Subclass */

36446

- static int /*long*/ text_renderer_type, pixbuf_renderer_type, toggle_renderer_type;

36447

- static int /*long*/ text_renderer_info_ptr, pixbuf_renderer_info_ptr, toggle_renderer_info_ptr;

36448

+ static long /*int*/ text_renderer_type, pixbuf_renderer_type, toggle_renderer_type;

36449

+ static long /*int*/ text_renderer_info_ptr, pixbuf_renderer_info_ptr, toggle_renderer_info_ptr;

36450

static Callback rendererClassInitCallback, rendererRenderCallback, rendererGetSizeCallback;

36451

- static int /*long*/ rendererClassInitProc, rendererRenderProc, rendererGetSizeProc;

36452

+ static long /*int*/ rendererClassInitProc, rendererRenderProc, rendererGetSizeProc;

36453

36454

/* Key Mappings */

36455

static final int [] [] KeyTable = {

36456

@@ -522,16 +522,16 @@

36457

filterTable.hook (eventType, listener);

36458

}

36459

36460

-void addGdkEvent (int /*long*/ event) {

36461

+void addGdkEvent (long /*int*/ event) {

36462

if (gdkEvents == null) {

36463

int length = GROW_SIZE;

36464

- gdkEvents = new int /*long*/ [length];

36465

+ gdkEvents = new long /*int*/ [length];

36466

gdkEventWidgets = new Widget [length];

36467

gdkEventCount = 0;

36468

}

36469

if (gdkEventCount == gdkEvents.length) {

36470

int length = gdkEventCount + GROW_SIZE;

36471

- int /*long*/ [] newEvents = new int /*long*/ [length];

36472

+ long /*int*/ [] newEvents = new long /*int*/ [length];

36473

System.arraycopy (gdkEvents, 0, newEvents, 0, gdkEventCount);

36474

gdkEvents = newEvents;

36475

Widget [] newWidgets = new Widget [length];

36476

@@ -539,7 +539,7 @@

36477

gdkEventWidgets = newWidgets;

36478

}

36479

Widget widget = null;

36480

- int /*long*/ handle = OS.gtk_get_event_widget (event);

36481

+ long /*int*/ handle = OS.gtk_get_event_widget (event);

36482

if (handle != 0) {

36483

do {

36484

widget = getWidget (handle);

36485

@@ -590,7 +590,7 @@

36486

eventTable.hook (eventType, listener);

36487

}

36488

36489

-int /*long*/ allChildrenProc (int /*long*/ widget, int /*long*/ recurse) {

36490

+long /*int*/ allChildrenProc (long /*int*/ widget, long /*int*/ recurse) {

36491

allChildren = OS.g_list_append (allChildren, widget);

36492

if (recurse != 0 && OS.GTK_IS_CONTAINER (widget)) {

36493

OS.gtk_container_forall (widget, allChildrenProc, recurse);

36494

@@ -598,7 +598,7 @@

36495

return 0;

36496

}

36497

36498

-void addMouseHoverTimeout (int /*long*/ handle) {

36499

+void addMouseHoverTimeout (long /*int*/ handle) {

36500

if (mouseHoverId != 0) OS.gtk_timeout_remove (mouseHoverId);

36501

mouseHoverId = OS.gtk_timeout_add (400, mouseHoverProc, handle);

36502

mouseHoverHandle = handle;

36503

@@ -623,7 +623,7 @@

36504

popups [index] = menu;

36505

}

36506

36507

-void addWidget (int /*long*/ handle, Widget widget) {

36508

+void addWidget (long /*int*/ handle, Widget widget) {

36509

if (handle == 0) return;

36510

if (freeSlot == -1) {

36511

int length = (freeSlot = indexTable.length) + GROW_SIZE;

36512

@@ -696,12 +696,12 @@

36513

if (!OS.GDK_WINDOWING_X11 ()) {

36514

OS.gdk_flush ();

36515

} else {

36516

- int /*long*/ xDisplay = OS.GDK_DISPLAY ();

36517

+ long /*int*/ xDisplay = OS.GDK_DISPLAY ();

36518

OS.XFlush (xDisplay);

36519

}

36520

}

36521

36522

-int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*long*/ tree_model, int /*long*/ iter, int /*long*/ data) {

36523

+long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) {

36524

Widget widget = getWidget (data);

36525

if (widget == null) return 0;

36526

return widget.cellDataProc (tree_column, cell, tree_model, iter, data);

36527

@@ -724,7 +724,7 @@

36528

}

36529

}

36530

36531

-int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*long*/ userData) {

36532

+long /*int*/ checkIfEventProc (long /*int*/ display, long /*int*/ xEvent, long /*int*/ userData) {

36533

int type = OS.X_EVENT_TYPE (xEvent);

36534

switch (type) {

36535

case OS.VisibilityNotify:

36536

@@ -734,11 +734,11 @@

36537

default:

36538

return 0;

36539

}

36540

- int /*long*/ window = OS.gdk_window_lookup (OS.X_EVENT_WINDOW (xEvent));

36541

+ long /*int*/ window = OS.gdk_window_lookup (OS.X_EVENT_WINDOW (xEvent));

36542

if (window == 0) return 0;

36543

if (flushWindow != 0) {

36544

if (flushAll) {

36545

- int /*long*/ tempWindow = window;

36546

+ long /*int*/ tempWindow = window;

36547

do {

36548

if (tempWindow == flushWindow) break;

36549

} while ((tempWindow = OS.gdk_window_get_parent (tempWindow)) != 0);

36550

@@ -763,7 +763,7 @@

36551

case OS.VisibilityNotify: {

36552

OS.memmove (visibilityEvent, xEvent, XVisibilityEvent.sizeof);

36553

OS.gdk_window_get_user_data (window, flushData);

36554

- int /*long*/ handle = flushData [0];

36555

+ long /*int*/ handle = flushData [0];

36556

Widget widget = handle != 0 ? getWidget (handle) : null;

36557

if (widget != null && widget instanceof Control) {

36558

Control control = (Control) widget;

36559

@@ -859,11 +859,11 @@

36560

OS.g_thread_init (0);

36561

}

36562

OS.gtk_set_locale();

36563

- if (!OS.gtk_init_check (new int /*long*/ [] {0}, null)) {

36564

+ if (!OS.gtk_init_check (new long /*int*/ [] {0}, null)) {

36565

SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]"); //$NON-NLS-1$

36566

}

36567

if (OS.GDK_WINDOWING_X11 ()) xDisplay = OS.GDK_DISPLAY ();

36568

- int /*long*/ ptr = OS.gtk_check_version (MAJOR, MINOR, MICRO);

36569

+ long /*int*/ ptr = OS.gtk_check_version (MAJOR, MINOR, MICRO);

36570

if (ptr != 0) {

36571

int length = OS.strlen (ptr);

36572

byte [] buffer = new byte [length];

36573

@@ -963,9 +963,9 @@

36574

}

36575

36576

Image createImage (String name) {

36577

- int /*long*/ style = OS.gtk_widget_get_default_style ();

36578

+ long /*int*/ style = OS.gtk_widget_get_default_style ();

36579

byte[] buffer = Converter.wcsToMbcs (null, name, true);

36580

- int /*long*/ pixbuf = OS.gtk_icon_set_render_icon (

36581

+ long /*int*/ pixbuf = OS.gtk_icon_set_render_icon (

36582

OS.gtk_icon_factory_lookup_default (buffer), style,

36583

OS.GTK_TEXT_DIR_NONE, OS.GTK_STATE_NORMAL, OS.GTK_ICON_SIZE_DIALOG, 0, 0);

36584

if (pixbuf == 0) return null;

36585

@@ -973,7 +973,7 @@

36586

int height = OS.gdk_pixbuf_get_height (pixbuf);

36587

int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);

36588

boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha (pixbuf);

36589

- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels (pixbuf);

36590

+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels (pixbuf);

36591

byte [] data = new byte [stride * height];

36592

OS.memmove (data, pixels, data.length);

36593

OS.g_object_unref (pixbuf);

36594

@@ -998,29 +998,29 @@

36595

return new Image (this, imageData);

36596

}

36597

36598

-static int /*long*/ createPixbuf(Image image) {

36599

+static long /*int*/ createPixbuf(Image image) {

36600

int [] w = new int [1], h = new int [1];

36601

OS.gdk_drawable_get_size (image.pixmap, w, h);

36602

- int /*long*/ colormap = OS.gdk_colormap_get_system ();

36603

- int /*long*/ pixbuf;

36604

+ long /*int*/ colormap = OS.gdk_colormap_get_system ();

36605

+ long /*int*/ pixbuf;

36606

boolean hasMask = image.mask != 0 && OS.gdk_drawable_get_depth (image.mask) == 1;

36607

if (hasMask) {

36608

pixbuf = OS.gdk_pixbuf_new (OS.GDK_COLORSPACE_RGB, true, 8, w [0], h [0]);

36609

if (pixbuf == 0) SWT.error (SWT.ERROR_NO_HANDLES);

36610

OS.gdk_pixbuf_get_from_drawable (pixbuf, image.pixmap, colormap, 0, 0, 0, 0, w [0], h [0]);

36611

- int /*long*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, w [0], h [0]);

36612

+ long /*int*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, w [0], h [0]);

36613

if (maskPixbuf == 0) SWT.error (SWT.ERROR_NO_HANDLES);

36614

OS.gdk_pixbuf_get_from_drawable(maskPixbuf, image.mask, 0, 0, 0, 0, 0, w [0], h [0]);

36615

int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);

36616

- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

36617

+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);

36618

byte[] line = new byte[stride];

36619

int maskStride = OS.gdk_pixbuf_get_rowstride(maskPixbuf);

36620

- int /*long*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);

36621

+ long /*int*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);

36622

byte[] maskLine = new byte[maskStride];

36623

for (int y=0; y<h[0]; y++) {

36624

- int /*long*/ offset = pixels + (y * stride);

36625

+ long /*int*/ offset = pixels + (y * stride);

36626

OS.memmove(line, offset, stride);

36627

- int /*long*/ maskOffset = maskPixels + (y * maskStride);

36628

+ long /*int*/ maskOffset = maskPixels + (y * maskStride);

36629

OS.memmove(maskLine, maskOffset, maskStride);

36630

for (int x=0; x<w[0]; x++) {

36631

if (maskLine[x * 3] == 0) {

36632

@@ -1039,10 +1039,10 @@

36633

if (hasAlpha) {

36634

byte [] alpha = data.alphaData;

36635

int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);

36636

- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels (pixbuf);

36637

+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels (pixbuf);

36638

byte [] line = new byte [stride];

36639

for (int y = 0; y < h [0]; y++) {

36640

- int /*long*/ offset = pixels + (y * stride);

36641

+ long /*int*/ offset = pixels + (y * stride);

36642

OS.memmove (line, offset, stride);

36643

for (int x = 0; x < w [0]; x++) {

36644

line [x*4+3] = alpha [y*w [0]+x];

36645

@@ -1081,7 +1081,7 @@

36646

void destroyDisplay () {

36647

}

36648

36649

-int /*long*/ emissionProc (int /*long*/ ihint, int /*long*/ n_param_values, int /*long*/ param_values, int /*long*/ data) {

36650

+long /*int*/ emissionProc (long /*int*/ ihint, long /*int*/ n_param_values, long /*int*/ param_values, long /*int*/ data) {

36651

if (OS.gtk_widget_get_toplevel (OS.g_value_peek_pointer(param_values)) == data) {

36652

OS.gtk_widget_set_direction (OS.g_value_peek_pointer(param_values), OS.GTK_TEXT_DIR_RTL);

36653

}

36654

@@ -1150,7 +1150,7 @@

36655

SWT.error (code);

36656

}

36657

36658

-int /*long*/ eventProc (int /*long*/ event, int /*long*/ data) {

36659

+long /*int*/ eventProc (long /*int*/ event, long /*int*/ data) {

36660

/*

36661

* Use gdk_event_get_time() rather than event.time or

36662

* gtk_get_current_event_time(). If the event does not

36663

@@ -1205,7 +1205,7 @@

36664

* <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>

36665

* </ul>

36666

*/

36667

-public Widget findWidget (int /*long*/ handle) {

36668

+public Widget findWidget (long /*int*/ handle) {

36669

checkDevice ();

36670

return getWidget (handle);

36671

}

36672

@@ -1232,7 +1232,7 @@

36673

*

36674

* @since 3.1

36675

*/

36676

-public Widget findWidget (int /*long*/ handle, int /*long*/ id) {

36677

+public Widget findWidget (long /*int*/ handle, long /*int*/ id) {

36678

checkDevice ();

36679

return null;

36680

}

36681

@@ -1254,12 +1254,12 @@

36682

*

36683

* @since 3.3

36684

*/

36685

-public Widget findWidget (Widget widget, int /*long*/ id) {

36686

+public Widget findWidget (Widget widget, long /*int*/ id) {

36687

checkDevice ();

36688

return null;

36689

}

36690

36691

-static int /*long*/ fixedClassInitProc (int /*long*/ g_class, int /*long*/ class_data) {

36692

+static long /*int*/ fixedClassInitProc (long /*int*/ g_class, long /*int*/ class_data) {

36693

GtkWidgetClass klass = new GtkWidgetClass ();

36694

OS.memmove (klass, g_class);

36695

klass.map = fixedMapProc;

36696

@@ -1269,21 +1269,21 @@

36697

return 0;

36698

}

36699

36700

-static int /*long*/ fixedMapProc (int /*long*/ handle) {

36701

+static long /*int*/ fixedMapProc (long /*int*/ handle) {

36702

Display display = getCurrent ();

36703

Widget widget = display.getWidget (handle);

36704

if (widget != null) return widget.fixedMapProc (handle);

36705

return 0;

36706

}

36707

36708

-static int /*long*/ fixedSizeAllocateProc (int /*long*/ handle, int /*long*/ allocation) {

36709

+static long /*int*/ fixedSizeAllocateProc (long /*int*/ handle, long /*int*/ allocation) {

36710

Display display = getCurrent ();

36711

Widget widget = display.getWidget (handle);

36712

if (widget != null) return widget.fixedSizeAllocateProc (handle, allocation);

36713

return OS.Call (oldFixedSizeAllocateProc, handle, allocation);

36714

}

36715

36716

-static int /*long*/ rendererClassInitProc (int /*long*/ g_class, int /*long*/ class_data) {

36717

+static long /*int*/ rendererClassInitProc (long /*int*/ g_class, long /*int*/ class_data) {

36718

GtkCellRendererClass klass = new GtkCellRendererClass ();

36719

OS.memmove (klass, g_class);

36720

klass.render = rendererRenderProc;

36721

@@ -1292,28 +1292,28 @@

36722

return 0;

36723

}

36724

36725

-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) {

36726

+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) {

36727

Display display = getCurrent ();

36728

Widget widget = display.getWidget (handle);

36729

if (widget != null) return widget.rendererGetSizeProc (cell, handle, cell_area, x_offset, y_offset, width, height);

36730

return 0;

36731

}

36732

36733

-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) {

36734

+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) {

36735

Display display = getCurrent ();

36736

Widget widget = display.getWidget (handle);

36737

if (widget != null) return widget.rendererRenderProc (cell, window, handle, background_area, cell_area, expose_area, flags);

36738

return 0;

36739

}

36740

36741

-void flushExposes (int /*long*/ window, boolean all) {

36742

+void flushExposes (long /*int*/ window, boolean all) {

36743

OS.gdk_flush ();

36744

OS.gdk_flush ();

36745

if (OS.GDK_WINDOWING_X11 ()) {

36746

this.flushWindow = window;

36747

this.flushAll = all;

36748

- int /*long*/ xDisplay = OS.GDK_DISPLAY ();

36749

- int /*long*/ xEvent = OS.g_malloc (XEvent.sizeof);

36750

+ long /*int*/ xDisplay = OS.GDK_DISPLAY ();

36751

+ long /*int*/ xEvent = OS.g_malloc (XEvent.sizeof);

36752

OS.XCheckIfEvent (xDisplay, xEvent, checkIfEventProc, 0);

36753

OS.g_free (xEvent);

36754

this.flushWindow = 0;

36755

@@ -1366,7 +1366,7 @@

36756

36757

int getCaretBlinkTime () {

36758

// checkDevice ();

36759

- int /*long*/ settings = OS.gtk_settings_get_default ();

36760

+ long /*int*/ settings = OS.gtk_settings_get_default ();

36761

if (settings == 0) return 500;

36762

int [] buffer = new int [1];

36763

OS.g_object_get (settings, OS.gtk_cursor_blink, buffer, 0);

36764

@@ -1396,9 +1396,9 @@

36765

public Control getCursorControl () {

36766

checkDevice();

36767

int[] x = new int[1], y = new int[1];

36768

- int /*long*/ handle = 0;

36769

- int /*long*/ [] user_data = new int /*long*/ [1];

36770

- int /*long*/ window = OS.gdk_window_at_pointer (x,y);

36771

+ long /*int*/ handle = 0;

36772

+ long /*int*/ [] user_data = new long /*int*/ [1];

36773

+ long /*int*/ window = OS.gdk_window_at_pointer (x,y);

36774

if (window != 0) {

36775

OS.gdk_window_get_user_data (window, user_data);

36776

handle = user_data [0];

36777

@@ -1411,8 +1411,8 @@

36778

if (!OS.GDK_WINDOWING_X11 ()) return null;

36779

OS.gdk_error_trap_push ();

36780

int[] unusedInt = new int[1];

36781

- int /*long*/[] unusedPtr = new int /*long*/[1], buffer = new int /*long*/[1];

36782

- int /*long*/ xWindow, xParent = OS.XDefaultRootWindow (xDisplay);

36783

+ long /*int*/[] unusedPtr = new long /*int*/[1], buffer = new long /*int*/[1];

36784

+ long /*int*/ xWindow, xParent = OS.XDefaultRootWindow (xDisplay);

36785

do {

36786

if (OS.XQueryPointer (xDisplay, xParent, unusedPtr, buffer, unusedInt, unusedInt, unusedInt, unusedInt, unusedInt) == 0) {

36787

handle = 0;

36788

@@ -1420,7 +1420,7 @@

36789

}

36790

if ((xWindow = buffer [0]) != 0) {

36791

xParent = xWindow;

36792

- int /*long*/ gdkWindow = OS.gdk_window_lookup (xWindow);

36793

+ long /*int*/ gdkWindow = OS.gdk_window_lookup (xWindow);

36794

if (gdkWindow != 0) {

36795

OS.gdk_window_get_user_data (gdkWindow, user_data);

36796

if (user_data[0] != 0) handle = user_data[0];

36797

@@ -1440,15 +1440,15 @@

36798

return null;

36799

}

36800

36801

-static GtkBorder getEntryInnerBorder (int /*long*/ handle) {

36802

+static GtkBorder getEntryInnerBorder (long /*int*/ handle) {

36803

GtkBorder gtkBorder = new GtkBorder();

36804

if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {

36805

- int /*long*/ border = OS.gtk_entry_get_inner_border (handle);

36806

+ long /*int*/ border = OS.gtk_entry_get_inner_border (handle);

36807

if (border != 0) {

36808

OS.memmove (gtkBorder, border, GtkBorder.sizeof);

36809

return gtkBorder;

36810

}

36811

- int /*long*/ [] borderPtr = new int /*long*/ [1];

36812

+ long /*int*/ [] borderPtr = new long /*int*/ [1];

36813

OS.gtk_widget_style_get (handle, OS.inner_border, borderPtr,0);

36814

if (borderPtr[0] != 0) {

36815

OS.memmove (gtkBorder, borderPtr[0], GtkBorder.sizeof);

36816

@@ -1473,7 +1473,7 @@

36817

return filterTable.hooks (eventType);

36818

}

36819

36820

-int /*long*/ filterProc (int /*long*/ xEvent, int /*long*/ gdkEvent, int /*long*/ data) {

36821

+long /*int*/ filterProc (long /*int*/ xEvent, long /*int*/ gdkEvent, long /*int*/ data) {

36822

if (data == 0) {

36823

/*

36824

* Feature in GTK. When button 4, 5, 6, or 7 is released, GTK

36825

@@ -1630,19 +1630,19 @@

36826

return new Point (dpi, dpi);

36827

}

36828

36829

-int /*long*/ gtk_fixed_get_type () {

36830

+long /*int*/ gtk_fixed_get_type () {

36831

return fixed_type;

36832

}

36833

36834

-int /*long*/ gtk_cell_renderer_text_get_type () {

36835

+long /*int*/ gtk_cell_renderer_text_get_type () {

36836

return text_renderer_type;

36837

}

36838

36839

-int /*long*/ gtk_cell_renderer_pixbuf_get_type () {

36840

+long /*int*/ gtk_cell_renderer_pixbuf_get_type () {

36841

return pixbuf_renderer_type;

36842

}

36843

36844

-int /*long*/ gtk_cell_renderer_toggle_get_type () {

36845

+long /*int*/ gtk_cell_renderer_toggle_get_type () {

36846

return toggle_renderer_type;

36847

}

36848

36849

@@ -1687,7 +1687,7 @@

36850

checkDevice ();

36851

int [] buffer = new int [1];

36852

if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {

36853

- int /*long*/ settings = OS.gtk_settings_get_default ();

36854

+ long /*int*/ settings = OS.gtk_settings_get_default ();

36855

OS.g_object_get (settings, OS.gtk_alternative_button_order, buffer, 0);

36856

}

36857

return buffer [0] == 1 ? SWT.LEFT : SWT.RIGHT;

36858

@@ -1707,7 +1707,7 @@

36859

*/

36860

public int getDoubleClickTime () {

36861

checkDevice ();

36862

- int /*long*/ settings = OS.gtk_settings_get_default ();

36863

+ long /*int*/ settings = OS.gtk_settings_get_default ();

36864

int [] buffer = new int [1];

36865

OS.g_object_get (settings, OS.gtk_double_click_time, buffer, 0);

36866

return buffer [0];

36867

@@ -1732,8 +1732,8 @@

36868

return focusControl;

36869

}

36870

if (activeShell == null) return null;

36871

- int /*long*/ shellHandle = activeShell.shellHandle;

36872

- int /*long*/ handle = OS.gtk_window_get_focus (shellHandle);

36873

+ long /*int*/ shellHandle = activeShell.shellHandle;

36874

+ long /*int*/ handle = OS.gtk_window_get_focus (shellHandle);

36875

if (handle == 0) return null;

36876

do {

36877

Widget widget = getWidget (handle);

36878

@@ -1830,12 +1830,12 @@

36879

*/

36880

Rectangle getWorkArea() {

36881

byte[] name = Converter.wcsToMbcs (null, "_NET_WORKAREA", true); //$NON-NLS-1$

36882

- int /*long*/ atom = OS.gdk_atom_intern (name, true);

36883

+ long /*int*/ atom = OS.gdk_atom_intern (name, true);

36884

if (atom == OS.GDK_NONE) return null;

36885

- int /*long*/[] actualType = new int /*long*/[1];

36886

+ long /*int*/[] actualType = new long /*int*/[1];

36887

int[] actualFormat = new int[1];

36888

int[] actualLength = new int[1];

36889

- int /*long*/[] data = new int /*long*/[1];

36890

+ long /*int*/[] data = new long /*int*/[1];

36891

if (!OS.gdk_property_get (OS.GDK_ROOT_PARENT (), atom, OS.GDK_NONE, 0, 16, 0, actualType, actualFormat, actualLength, data)) {

36892

return null;

36893

}

36894

@@ -1866,7 +1866,7 @@

36895

checkDevice ();

36896

Monitor [] monitors = null;

36897

Rectangle workArea = getWorkArea();

36898

- int /*long*/ screen = OS.gdk_screen_get_default ();

36899

+ long /*int*/ screen = OS.gdk_screen_get_default ();

36900

if (screen != 0) {

36901

int monitorCount = OS.gdk_screen_get_n_monitors (screen);

36902

if (monitorCount > 0) {

36903

@@ -2168,12 +2168,12 @@

36904

GdkColor gdkColor;

36905

36906

/* Get Tooltip resources */

36907

- int /*long*/ tooltipShellHandle = OS.gtk_window_new (OS.GTK_WINDOW_POPUP);

36908

+ long /*int*/ tooltipShellHandle = OS.gtk_window_new (OS.GTK_WINDOW_POPUP);

36909

if (tooltipShellHandle == 0) SWT.error (SWT.ERROR_NO_HANDLES);

36910

byte[] gtk_tooltips = Converter.wcsToMbcs (null, "gtk-tooltips", true); //$NON-NLS-1$

36911

OS.gtk_widget_set_name (tooltipShellHandle, gtk_tooltips);

36912

OS.gtk_widget_realize (tooltipShellHandle);

36913

- int /*long*/ tooltipStyle = OS.gtk_widget_get_style (tooltipShellHandle);

36914

+ long /*int*/ tooltipStyle = OS.gtk_widget_get_style (tooltipShellHandle);

36915

gdkColor = new GdkColor();

36916

OS.gtk_style_get_fg (tooltipStyle, OS.GTK_STATE_NORMAL, gdkColor);

36917

COLOR_INFO_FOREGROUND = gdkColor;

36918

@@ -2183,7 +2183,7 @@

36919

OS.gtk_widget_destroy (tooltipShellHandle);

36920

36921

/* Get Shell resources */

36922

- int /*long*/ style = OS.gtk_widget_get_style (shellHandle);

36923

+ long /*int*/ style = OS.gtk_widget_get_style (shellHandle);

36924

gdkColor = new GdkColor();

36925

OS.gtk_style_get_black (style, gdkColor);

36926

COLOR_WIDGET_DARK_SHADOW = gdkColor;

36927

@@ -2264,8 +2264,8 @@

36928

public Font getSystemFont () {

36929

checkDevice ();

36930

if (systemFont != null) return systemFont;

36931

- int /*long*/ style = OS.gtk_widget_get_style (shellHandle);

36932

- int /*long*/ defaultFont = OS.pango_font_description_copy (OS.gtk_style_get_font_desc (style));

36933

+ long /*int*/ style = OS.gtk_widget_get_style (shellHandle);

36934

+ long /*int*/ defaultFont = OS.pango_font_description_copy (OS.gtk_style_get_font_desc (style));

36935

return systemFont = Font.gtk_new (this, defaultFont);

36936

}

36937

36938

@@ -2303,10 +2303,10 @@

36939

}

36940

}

36941

36942

-Widget getWidget (int /*long*/ handle) {

36943

+Widget getWidget (long /*int*/ handle) {

36944

if (handle == 0) return null;

36945

if (lastWidget != null && lastHandle == handle) return lastWidget;

36946

- int /*long*/ index = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1;

36947

+ long /*int*/ index = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1;

36948

if (0 <= index && index < widgetTable.length) {

36949

lastHandle = handle;

36950

return lastWidget = widgetTable [(int)/*64*/index];

36951

@@ -2314,7 +2314,7 @@

36952

return null;

36953

}

36954

36955

-int /*long*/ idleProc (int /*long*/ data) {

36956

+long /*int*/ idleProc (long /*int*/ data) {

36957

boolean result = runAsyncMessages (false);

36958

if (!result) {

36959

synchronized (idleLock) {

36960

@@ -2344,7 +2344,7 @@

36961

}

36962

36963

void initializeCallbacks () {

36964

- closures = new int /*long*/ [Widget.LAST_SIGNAL];

36965

+ closures = new long /*int*/ [Widget.LAST_SIGNAL];

36966

signalIds = new int [Widget.LAST_SIGNAL];

36967

36968

/* Cache signals for GtkWidget */

36969

@@ -2540,8 +2540,8 @@

36970

pangoLayoutNewCallback = new Callback (this, "pangoLayoutNewProc", 3); //$NON-NLS-1$

36971

pangoLayoutNewProc = pangoLayoutNewCallback.getAddress ();

36972

if (pangoLayoutNewProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);

36973

- int /*long*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();

36974

- int /*long*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);

36975

+ long /*int*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();

36976

+ long /*int*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);

36977

pangoLayoutNewDefaultProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (pangoLayoutClass);

36978

OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewProc);

36979

OS.g_type_class_unref (pangoLayoutClass);

36980

@@ -2563,10 +2563,10 @@

36981

* fix is to for the initializaion by creating

36982

* a temporary GtkEntry.

36983

*/

36984

- int /*long*/ entry = OS.gtk_entry_new ();

36985

+ long /*int*/ entry = OS.gtk_entry_new ();

36986

OS.gtk_widget_destroy (entry);

36987

int [] buffer2 = new int [1];

36988

- int /*long*/ settings = OS.gtk_settings_get_default ();

36989

+ long /*int*/ settings = OS.gtk_settings_get_default ();

36990

OS.g_object_get (settings, OS.gtk_entry_select_on_focus, buffer2, 0);

36991

entrySelectOnFocus = buffer2 [0] != 0;

36992

}

36993

@@ -2582,9 +2582,9 @@

36994

/* Get the window manager name */

36995

windowManager = ""; //$NON-NLS-1$

36996

if (OS.GTK_VERSION >= OS.VERSION (2, 2, 0)) {

36997

- int /*long*/ screen = OS.gdk_screen_get_default ();

36998

+ long /*int*/ screen = OS.gdk_screen_get_default ();

36999

if (screen != 0) {

37000

- int /*long*/ ptr2 = OS.gdk_x11_screen_get_window_manager_name (screen);

37001

+ long /*int*/ ptr2 = OS.gdk_x11_screen_get_window_manager_name (screen);

37002

if (ptr2 != 0) {

37003

int length = OS.strlen (ptr2);

37004

if (length > 0) {

37005

@@ -2610,7 +2610,7 @@

37006

* @param hDC the platform specific GC handle

37007

* @param data the platform specific GC data

37008

*/

37009

-public void internal_dispose_GC (int /*long*/ gdkGC, GCData data) {

37010

+public void internal_dispose_GC (long /*int*/ gdkGC, GCData data) {

37011

OS.g_object_unref (gdkGC);

37012

}

37013

37014

@@ -2634,10 +2634,10 @@

37015

* <li>ERROR_NO_HANDLES if a handle could not be obtained for gc creation</li>

37016

* </ul>

37017

*/

37018

-public int /*long*/ internal_new_GC (GCData data) {

37019

+public long /*int*/ internal_new_GC (GCData data) {

37020

if (isDisposed()) SWT.error(SWT.ERROR_DEVICE_DISPOSED);

37021

- int /*long*/ root = OS.GDK_ROOT_PARENT ();

37022

- int /*long*/ gdkGC = OS.gdk_gc_new (root);

37023

+ long /*int*/ root = OS.GDK_ROOT_PARENT ();

37024

+ long /*int*/ gdkGC = OS.gdk_gc_new (root);

37025

if (gdkGC == 0) SWT.error (SWT.ERROR_NO_HANDLES);

37026

OS.gdk_gc_set_subwindow (gdkGC, OS.GDK_INCLUDE_INFERIORS);

37027

if (data != null) {

37028

@@ -2743,7 +2743,7 @@

37029

Point point = new Point (x, y);

37030

if (from == to) return point;

37031

if (from != null) {

37032

- int /*long*/ window = from.eventWindow ();

37033

+ long /*int*/ window = from.eventWindow ();

37034

int [] origin_x = new int [1], origin_y = new int [1];

37035

OS.gdk_window_get_origin (window, origin_x, origin_y);

37036

if ((from.style & SWT.MIRRORED) != 0) point.x = from.getClientWidth () - point.x;

37037

@@ -2751,7 +2751,7 @@

37038

point.y += origin_y [0];

37039

}

37040

if (to != null) {

37041

- int /*long*/ window = to.eventWindow ();

37042

+ long /*int*/ window = to.eventWindow ();

37043

int [] origin_x = new int [1], origin_y = new int [1];

37044

OS.gdk_window_get_origin (window, origin_x, origin_y);

37045

point.x -= origin_x [0];

37046

@@ -2820,7 +2820,7 @@

37047

return result [0];

37048

}

37049

37050

-int /*long*/ menuPositionProc (int /*long*/ menu, int /*long*/ x, int /*long*/ y, int /*long*/ push_in, int /*long*/ user_data) {

37051

+long /*int*/ menuPositionProc (long /*int*/ menu, long /*int*/ x, long /*int*/ y, long /*int*/ push_in, long /*int*/ user_data) {

37052

Widget widget = getWidget (menu);

37053

if (widget == null) return 0;

37054

return widget.menuPositionProc (menu, x, y, push_in, user_data);

37055

@@ -2872,7 +2872,7 @@

37056

if (from == to) return rect;

37057

boolean fromRTL = false, toRTL = false;

37058

if (from != null) {

37059

- int /*long*/ window = from.eventWindow ();

37060

+ long /*int*/ window = from.eventWindow ();

37061

int [] origin_x = new int [1], origin_y = new int [1];

37062

OS.gdk_window_get_origin (window, origin_x, origin_y);

37063

if (fromRTL = (from.style & SWT.MIRRORED) != 0) rect.x = from.getClientWidth() - rect.x;

37064

@@ -2880,7 +2880,7 @@

37065

rect.y += origin_y [0];

37066

}

37067

if (to != null) {

37068

- int /*long*/ window = to.eventWindow ();

37069

+ long /*int*/ window = to.eventWindow ();

37070

int [] origin_x = new int [1], origin_y = new int [1];

37071

OS.gdk_window_get_origin (window, origin_x, origin_y);

37072

rect.x -= origin_x [0];

37073

@@ -2891,14 +2891,14 @@

37074

return rect;

37075

}

37076

37077

-int /*long*/ mouseHoverProc (int /*long*/ handle) {

37078

+long /*int*/ mouseHoverProc (long /*int*/ handle) {

37079

Widget widget = getWidget (handle);

37080

if (widget == null) return 0;

37081

return widget.hoverProc (handle);

37082

}

37083

37084

-int /*long*/ pangoLayoutNewProc (int /*long*/ type, int /*long*/ n_construct_properties, int /*long*/ construct_properties) {

37085

- int /*long*/ layout = OS.Call (pangoLayoutNewDefaultProc, type, (int)/*64*/n_construct_properties, construct_properties);

37086

+long /*int*/ pangoLayoutNewProc (long /*int*/ type, long /*int*/ n_construct_properties, long /*int*/ construct_properties) {

37087

+ long /*int*/ layout = OS.Call (pangoLayoutNewDefaultProc, type, (int)/*64*/n_construct_properties, construct_properties);

37088

OS.pango_layout_set_auto_dir (layout, false);

37089

return layout;

37090

}

37091

@@ -2977,13 +2977,13 @@

37092

if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);

37093

if (event == null) error (SWT.ERROR_NULL_ARGUMENT);

37094

if (!OS.GDK_WINDOWING_X11()) return false;

37095

- int /*long*/ xDisplay = OS.GDK_DISPLAY ();

37096

+ long /*int*/ xDisplay = OS.GDK_DISPLAY ();

37097

int type = event.type;

37098

switch (type) {

37099

case SWT.KeyDown:

37100

case SWT.KeyUp: {

37101

int keyCode = 0;

37102

- int /*long*/ keysym = untranslateKey (event.keyCode);

37103

+ long /*int*/ keysym = untranslateKey (event.keyCode);

37104

if (keysym != 0) keyCode = OS.XKeysymToKeycode (xDisplay, keysym);

37105

if (keyCode == 0) {

37106

char key = event.character;

37107

@@ -3065,7 +3065,7 @@

37108

void putGdkEvents () {

37109

if (gdkEventCount != 0) {

37110

for (int i = 0; i < gdkEventCount; i++) {

37111

- int /*long*/ event = gdkEvents [i];

37112

+ long /*int*/ event = gdkEvents [i];

37113

Widget widget = gdkEventWidgets [i];

37114

if (widget == null || !widget.isDisposed ()) {

37115

OS.gdk_event_put (event);

37116

@@ -3318,8 +3318,8 @@

37117

37118

/* Dispose subclass */

37119

if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {

37120

- int /*long*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();

37121

- int /*long*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);

37122

+ long /*int*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();

37123

+ long /*int*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);

37124

OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewDefaultProc);

37125

OS.g_type_class_unref (pangoLayoutClass);

37126

pangoLayoutNewCallback.dispose ();

37127

@@ -3381,9 +3381,9 @@

37128

if (filterTable.size () == 0) filterTable = null;

37129

}

37130

37131

-int /*long*/ removeGdkEvent () {

37132

+long /*int*/ removeGdkEvent () {

37133

if (gdkEventCount == 0) return 0;

37134

- int /*long*/ event = gdkEvents [0];

37135

+ long /*int*/ event = gdkEvents [0];

37136

--gdkEventCount;

37137

System.arraycopy (gdkEvents, 1, gdkEvents, 0, gdkEventCount);

37138

System.arraycopy (gdkEventWidgets, 1, gdkEventWidgets, 0, gdkEventCount);

37139

@@ -3432,7 +3432,7 @@

37140

eventTable.unhook (eventType, listener);

37141

}

37142

37143

-void removeMouseHoverTimeout (int /*long*/ handle) {

37144

+void removeMouseHoverTimeout (long /*int*/ handle) {

37145

if (handle != mouseHoverHandle) return;

37146

if (mouseHoverId != 0) OS.gtk_timeout_remove (mouseHoverId);

37147

mouseHoverId = 0;

37148

@@ -3449,7 +3449,7 @@

37149

}

37150

}

37151

37152

-Widget removeWidget (int /*long*/ handle) {

37153

+Widget removeWidget (long /*int*/ handle) {

37154

if (handle == 0) return null;

37155

lastWidget = null;

37156

Widget widget = null;

37157

@@ -3571,8 +3571,8 @@

37158

public void setCursorLocation (int x, int y) {

37159

checkDevice ();

37160

if (OS.GDK_WINDOWING_X11 ()) {

37161

- int /*long*/ xDisplay = OS.GDK_DISPLAY ();

37162

- int /*long*/ xWindow = OS.XDefaultRootWindow (xDisplay);

37163

+ long /*int*/ xDisplay = OS.GDK_DISPLAY ();

37164

+ long /*int*/ xWindow = OS.XDefaultRootWindow (xDisplay);

37165

OS.XWarpPointer (xDisplay, OS.None, xWindow, 0, 0, 0, 0, x, y);

37166

}

37167

}

37168

@@ -3640,7 +3640,7 @@

37169

}

37170

if (key.equals (ADD_WIDGET_KEY)) {

37171

Object [] data = (Object []) value;

37172

- int /*long*/ handle = ((LONG) data [0]).value;

37173

+ long /*int*/ handle = ((LONG) data [0]).value;

37174

Widget widget = (Widget) data [1];

37175

if (widget != null) {

37176

addWidget (handle, widget);

37177

@@ -3729,10 +3729,10 @@

37178

this.data = data;

37179

}

37180

37181

-int /*long*/ setDirectionProc (int /*long*/ widget, int /*long*/ direction) {

37182

+long /*int*/ setDirectionProc (long /*int*/ widget, long /*int*/ direction) {

37183

OS.gtk_widget_set_direction (widget, (int)/*64*/ direction);

37184

if (OS.GTK_IS_MENU_ITEM (widget)) {

37185

- int /*long*/ submenu = OS.gtk_menu_item_get_submenu (widget);

37186

+ long /*int*/ submenu = OS.gtk_menu_item_get_submenu (widget);

37187

if (submenu != 0) {

37188

OS.gtk_widget_set_direction (submenu, (int)/*64*/ direction);

37189

OS.gtk_container_forall (submenu, setDirectionProc, direction);

37190

@@ -3807,9 +3807,9 @@

37191

OS.gtk_container_add (preeditWindow, preeditLabel);

37192

OS.gtk_widget_show (preeditLabel);

37193

}

37194

- int /*long*/ [] preeditString = new int /*long*/ [1];

37195

- int /*long*/ [] pangoAttrs = new int /*long*/ [1];

37196

- int /*long*/ imHandle = control.imHandle ();

37197

+ long /*int*/ [] preeditString = new long /*int*/ [1];

37198

+ long /*int*/ [] pangoAttrs = new long /*int*/ [1];

37199

+ long /*int*/ imHandle = control.imHandle ();

37200

OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, null);

37201

if (preeditString [0] != 0 && OS.strlen (preeditString [0]) > 0) {

37202

Control widget = control.findBackgroundControl ();

37203

@@ -3863,7 +3863,7 @@

37204

fds = OS.g_malloc (OS.GPollFD_sizeof () * allocated_nfds);

37205

}

37206

max_priority [0] = timeout [0] = 0;

37207

- int /*long*/ context = OS.g_main_context_default ();

37208

+ long /*int*/ context = OS.g_main_context_default ();

37209

boolean result = false;

37210

do {

37211

if (OS.g_main_context_acquire (context)) {

37212

@@ -3874,7 +3874,7 @@

37213

allocated_nfds = nfds;

37214

fds = OS.g_malloc (OS.GPollFD_sizeof() * allocated_nfds);

37215

}

37216

- int /*long*/ poll = OS.g_main_context_get_poll_func (context);

37217

+ long /*int*/ poll = OS.g_main_context_get_poll_func (context);

37218

if (poll != 0) {

37219

if (nfds > 0 || timeout [0] != 0) {

37220

/*

37221

@@ -3968,7 +3968,7 @@

37222

}

37223

}

37224

37225

-int /*long*/ timerProc (int /*long*/ i) {

37226

+long /*int*/ timerProc (long /*int*/ i) {

37227

if (timerList == null) return 0;

37228

int index = (int)/*64*/i;

37229

if (0 <= index && index < timerList.length) {

37230

@@ -3980,7 +3980,7 @@

37231

return 0;

37232

}

37233

37234

-int /*long*/ caretProc (int /*long*/ clientData) {

37235

+long /*int*/ caretProc (long /*int*/ clientData) {

37236

caretId = 0;

37237

if (currentCaret == null) {

37238

return 0;

37239

@@ -3995,19 +3995,19 @@

37240

return 0;

37241

}

37242

37243

-int /*long*/ sizeAllocateProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {

37244

+long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {

37245

Widget widget = getWidget (user_data);

37246

if (widget == null) return 0;

37247

return widget.sizeAllocateProc (handle, arg0, user_data);

37248

}

37249

37250

-int /*long*/ sizeRequestProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {

37251

+long /*int*/ sizeRequestProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {

37252

Widget widget = getWidget (user_data);

37253

if (widget == null) return 0;

37254

return widget.sizeRequestProc (handle, arg0, user_data);

37255

}

37256

37257

-int /*long*/ treeSelectionProc (int /*long*/ model, int /*long*/ path, int /*long*/ iter, int /*long*/ data) {

37258

+long /*int*/ treeSelectionProc (long /*int*/ model, long /*int*/ path, long /*int*/ iter, long /*int*/ data) {

37259

Widget widget = getWidget (data);

37260

if (widget == null) return 0;

37261

return widget.treeSelectionProc (model, path, iter, treeSelection, treeSelectionLength++);

37262

@@ -4065,13 +4065,13 @@

37263

caretId = OS.gtk_timeout_add (blinkRate, caretProc, 0);

37264

}

37265

37266

-int /*long*/ shellMapProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {

37267

+long /*int*/ shellMapProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {

37268

Widget widget = getWidget (handle);

37269

if (widget == null) return 0;

37270

return widget.shellMapProc (handle, arg0, user_data);

37271

}

37272

37273

-int /*long*/ styleSetProc (int /*long*/ gobject, int /*long*/ arg1, int /*long*/ user_data) {

37274

+long /*int*/ styleSetProc (long /*int*/ gobject, long /*int*/ arg1, long /*int*/ user_data) {

37275

settingsChanged = true;

37276

return 0;

37277

}

37278

@@ -4179,31 +4179,31 @@

37279

return 0;

37280

}

37281

37282

-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {

37283

+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) {

37284

Widget widget = getWidget (handle);

37285

if (widget == null) return 0;

37286

return widget.windowProc (handle, user_data);

37287

}

37288

37289

-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {

37290

+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {

37291

Widget widget = getWidget (handle);

37292

if (widget == null) return 0;

37293

return widget.windowProc (handle, arg0, user_data);

37294

}

37295

37296

-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) {

37297

+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) {

37298

Widget widget = getWidget (handle);

37299

if (widget == null) return 0;

37300

return widget.windowProc (handle, arg0, arg1, user_data);

37301

}

37302

37303

-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) {

37304

+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) {

37305

Widget widget = getWidget (handle);

37306

if (widget == null) return 0;

37307

return widget.windowProc (handle, arg0, arg1, arg2, user_data);

37308

}

37309

37310

-int /*long*/ windowTimerProc (int /*long*/ handle) {

37311

+long /*int*/ windowTimerProc (long /*int*/ handle) {

37312

Widget widget = getWidget (handle);

37313

if (widget == null) return 0;

37314

return widget.timerProc (handle);

37315

diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widgets/ExpandBar.java

37316

--- x86/org/eclipse/swt/widgets/ExpandBar.java 2009-05-29 17:30:04.000000000 -0400

37317

+++ x86_64/org/eclipse/swt/widgets/ExpandBar.java 2009-09-17 08:48:24.000000000 -0400

37318

@@ -160,14 +160,14 @@

37319

OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, OS.GTK_POLICY_AUTOMATIC);

37320

OS.gtk_container_add (fixedHandle, scrolledHandle);

37321

OS.gtk_scrolled_window_add_with_viewport (scrolledHandle, handle);

37322

- int /*long*/ viewport = OS.gtk_bin_get_child (scrolledHandle);

37323

+ long /*int*/ viewport = OS.gtk_bin_get_child (scrolledHandle);

37324

OS.gtk_viewport_set_shadow_type (viewport, OS.GTK_SHADOW_NONE);

37325

} else {

37326

OS.gtk_container_add (fixedHandle, handle);

37327

}

37328

OS.gtk_container_set_border_width (handle, 0);

37329

} else {

37330

- int /*long*/ topHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);

37331

+ long /*int*/ topHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);

37332

if (topHandle == 0) error (SWT.ERROR_NO_HANDLES);

37333

OS.gtk_fixed_set_has_window (topHandle, true);

37334

if ((style & SWT.V_SCROLL) != 0) {

37335

@@ -241,11 +241,11 @@

37336

layoutItems (index, true);

37337

}

37338

37339

-int /*long*/ eventHandle () {

37340

+long /*int*/ eventHandle () {

37341

return OS.GTK_VERSION >= OS.VERSION (2, 4, 0) ? fixedHandle : handle;

37342

}

37343

37344

-boolean forceFocus (int /*long*/ focusHandle) {

37345

+boolean forceFocus (long /*int*/ focusHandle) {

37346

if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {

37347

if (lastFocus != null && lastFocus.setFocus ()) return true;

37348

for (int i = 0; i < itemCount; i++) {

37349

@@ -366,7 +366,7 @@

37350

return spacing;

37351

}

37352

37353

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

37354

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

37355

if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {

37356

GdkEventButton gdkEvent = new GdkEventButton ();

37357

OS.memmove (gdkEvent, event, GdkEventButton.sizeof);

37358

@@ -387,7 +387,7 @@

37359

return super.gtk_button_press_event (widget, event);

37360

}

37361

37362

-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) {

37363

+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {

37364

if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {

37365

if (lastFocus != null) {

37366

GdkEventButton gdkEvent = new GdkEventButton ();

37367

@@ -407,7 +407,7 @@

37368

return super.gtk_button_release_event (widget, event);

37369

}

37370

37371

-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {

37372

+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {

37373

if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {

37374

GdkEventExpose gdkEvent = new GdkEventExpose ();

37375

OS.memmove(gdkEvent, eventPtr, GdkEventExpose.sizeof);

37376

@@ -425,24 +425,24 @@

37377

return super.gtk_expose_event (widget, eventPtr);

37378

}

37379

37380

-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {

37381

+long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {

37382

if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {

37383

if (lastFocus != null) lastFocus.redraw ();

37384

}

37385

return super.gtk_focus_in_event(widget, event);

37386

}

37387

37388

-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {

37389

+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {

37390

if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {

37391

if (lastFocus != null) lastFocus.redraw ();

37392

}

37393

return super.gtk_focus_out_event (widget, event);

37394

}

37395

37396

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {

37397

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {

37398

if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {

37399

if (!hasFocus ()) return 0;

37400

- int /*long*/ result = super.gtk_key_press_event (widget, event);

37401

+ long /*int*/ result = super.gtk_key_press_event (widget, event);

37402

if (result != 0) return result;

37403

int index = 0;

37404

while (index < itemCount) {

37405

@@ -556,13 +556,13 @@

37406

}

37407

}

37408

37409

-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {

37410

- int /*long*/ result = super.gtk_size_allocate (widget, allocation);

37411

+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {

37412

+ long /*int*/ result = super.gtk_size_allocate (widget, allocation);

37413

layoutItems (0, false);

37414

return result;

37415

}

37416

37417

-int /*long*/ parentingHandle () {

37418

+long /*int*/ parentingHandle () {

37419

return OS.GTK_VERSION >= OS.VERSION (2, 4, 0) ? fixedHandle : handle;

37420

}

37421

37422

@@ -621,7 +621,7 @@

37423

return result;

37424

}

37425

37426

-void setFontDescription (int /*long*/ font) {

37427

+void setFontDescription (long /*int*/ font) {

37428

super.setFontDescription (font);

37429

if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {

37430

for (int i = 0; i < itemCount; i++) {

37431

@@ -647,7 +647,7 @@

37432

ExpandItem item = items [itemCount - 1];

37433

int maxHeight = item.y + getBandHeight () + spacing;

37434

if (item.expanded) maxHeight += item.height;

37435

- int /*long*/ adjustmentHandle = OS.gtk_scrolled_window_get_vadjustment (scrolledHandle);

37436

+ long /*int*/ adjustmentHandle = OS.gtk_scrolled_window_get_vadjustment (scrolledHandle);

37437

GtkAdjustment adjustment = new GtkAdjustment ();

37438

OS.memmove (adjustment, adjustmentHandle);

37439

yCurrentScroll = (int)adjustment.value;

37440

@@ -667,7 +667,7 @@

37441

OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, policy);

37442

int width = OS.GTK_WIDGET_WIDTH (fixedHandle) - spacing * 2;

37443

if (policy == OS.GTK_POLICY_ALWAYS) {

37444

- int /*long*/ vHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR (scrolledHandle);

37445

+ long /*int*/ vHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR (scrolledHandle);

37446

GtkRequisition requisition = new GtkRequisition ();

37447

OS.gtk_widget_size_request (vHandle, requisition);

37448

width -= requisition.width;

37449

diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/widgets/ExpandItem.java

37450

--- x86/org/eclipse/swt/widgets/ExpandItem.java 2009-05-29 17:30:04.000000000 -0400

37451

+++ x86_64/org/eclipse/swt/widgets/ExpandItem.java 2009-09-17 08:48:24.000000000 -0400

37452

@@ -39,7 +39,7 @@

37453

ExpandBar parent;

37454

Control control;

37455

ImageList imageList;

37456

- int /*long*/ clientHandle, boxHandle, labelHandle, imageHandle;

37457

+ long /*int*/ clientHandle, boxHandle, labelHandle, imageHandle;

37458

boolean expanded;

37459

int x, y, width, height;

37460

int imageHeight, imageWidth;

37461

@@ -316,7 +316,7 @@

37462

return width;

37463

}

37464

37465

-int /*long*/ gtk_activate (int /*long*/ widget) {

37466

+long /*int*/ gtk_activate (long /*int*/ widget) {

37467

Event event = new Event ();

37468

event.item = this;

37469

int type = OS.gtk_expander_get_expanded (handle) ? SWT.Collapse : SWT.Expand;

37470

@@ -324,23 +324,23 @@

37471

return 0;

37472

}

37473

37474

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

37475

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

37476

setFocus ();

37477

return 0;

37478

}

37479

37480

-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {

37481

+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {

37482

OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_CAN_FOCUS);

37483

parent.lastFocus = this;

37484

return 0;

37485

}

37486

37487

-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {

37488

+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {

37489

parent.layoutItems (0, false);

37490

return 0;

37491

}

37492

37493

-int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {

37494

+long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {

37495

parent.gtk_enter_notify_event(widget, event);

37496

return 0;

37497

}

37498

@@ -518,7 +518,7 @@

37499

return result;

37500

}

37501

37502

-void setFontDescription (int /*long*/ font) {

37503

+void setFontDescription (long /*int*/ font) {

37504

OS.gtk_widget_modify_font (handle, font);

37505

if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);

37506

if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);

37507

@@ -563,7 +563,7 @@

37508

if (image.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);

37509

imageList = new ImageList ();

37510

int imageIndex = imageList.add (image);

37511

- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);

37512

+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);

37513

OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);

37514

if (text.length () == 0) OS.gtk_widget_hide (labelHandle);

37515

OS.gtk_widget_show (imageHandle);

37516

@@ -618,7 +618,7 @@

37517

}

37518

}

37519

37520

-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {

37521

+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) {

37522

switch ((int)/*64*/user_data) {

37523

case ACTIVATE_INVERSE: {

37524

expanded = OS.gtk_expander_get_expanded (handle);

37525

diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widgets/FileDialog.java

37526

--- x86/org/eclipse/swt/widgets/FileDialog.java 2009-05-29 17:30:04.000000000 -0400

37527

+++ x86_64/org/eclipse/swt/widgets/FileDialog.java 2009-09-17 08:48:24.000000000 -0400

37528

@@ -46,7 +46,7 @@

37529

int filterIndex = -1;

37530

boolean overwrite = false;

37531

boolean uriMode;

37532

- int /*long*/ handle;

37533

+ long /*int*/ handle;

37534

static final char SEPARATOR = System.getProperty ("file.separator").charAt (0);

37535

static final char EXTENSION_SEPARATOR = ';';

37536

37537

@@ -102,7 +102,7 @@

37538

/* MULTI is only valid if the native dialog's action is Open */

37539

fullPath = null;

37540

if ((style & (SWT.SAVE | SWT.MULTI)) == SWT.MULTI) {

37541

- int /*long*/ list = 0;

37542

+ long /*int*/ list = 0;

37543

if (uriMode) {

37544

list = OS.gtk_file_chooser_get_uris (handle);

37545

} else {

37546

@@ -110,11 +110,11 @@

37547

}

37548

int listLength = OS.g_slist_length (list);

37549

fileNames = new String [listLength];

37550

- int /*long*/ current = list;

37551

+ long /*int*/ current = list;

37552

int writePos = 0;

37553

for (int i = 0; i < listLength; i++) {

37554

- int /*long*/ name = OS.g_slist_data (current);

37555

- int /*long*/ utf8Ptr = 0;

37556

+ long /*int*/ name = OS.g_slist_data (current);

37557

+ long /*int*/ utf8Ptr = 0;

37558

if (uriMode) {

37559

utf8Ptr = name;

37560

} else {

37561

@@ -122,8 +122,8 @@

37562

OS.g_free (name);

37563

}

37564

if (utf8Ptr != 0) {

37565

- int /*long*/ [] items_written = new int /*long*/ [1];

37566

- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);

37567

+ long /*int*/ [] items_written = new long /*int*/ [1];

37568

+ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);

37569

OS.g_free (utf8Ptr);

37570

if (utf16Ptr != 0) {

37571

int clength = (int)/*64*/items_written [0];

37572

@@ -143,19 +143,19 @@

37573

}

37574

OS.g_slist_free (list);

37575

} else {

37576

- int /*long*/ utf8Ptr = 0;

37577

+ long /*int*/ utf8Ptr = 0;

37578

if (uriMode) {

37579

utf8Ptr = OS.gtk_file_chooser_get_uri (handle);

37580

} else {

37581

- int /*long*/ path = OS.gtk_file_chooser_get_filename (handle);

37582

+ long /*int*/ path = OS.gtk_file_chooser_get_filename (handle);

37583

if (path != 0) {

37584

utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);

37585

OS.g_free (path);

37586

}

37587

}

37588

if (utf8Ptr != 0) {

37589

- int /*long*/ [] items_written = new int /*long*/ [1];

37590

- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);

37591

+ long /*int*/ [] items_written = new long /*int*/ [1];

37592

+ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);

37593

OS.g_free (utf8Ptr);

37594

if (utf16Ptr != 0) {

37595

int clength = (int)/*64*/items_written [0];

37596

@@ -169,9 +169,9 @@

37597

}

37598

}

37599

filterIndex = -1;

37600

- int /*long*/ filter = OS.gtk_file_chooser_get_filter (handle);

37601

+ long /*int*/ filter = OS.gtk_file_chooser_get_filter (handle);

37602

if (filter != 0) {

37603

- int /*long*/ filterNamePtr = OS.gtk_file_filter_get_name (filter);

37604

+ long /*int*/ filterNamePtr = OS.gtk_file_filter_get_name (filter);

37605

if (filterNamePtr != 0) {

37606

int length = OS.strlen (filterNamePtr);

37607

byte[] buffer = new byte [length];

37608

@@ -204,23 +204,23 @@

37609

filterIndex = -1;

37610

GtkFileSelection selection = new GtkFileSelection ();

37611

OS.memmove (selection, handle);

37612

- int /*long*/ entry = selection.selection_entry;

37613

- int /*long*/ entryText = OS.gtk_entry_get_text (entry);

37614

+ long /*int*/ entry = selection.selection_entry;

37615

+ long /*int*/ entryText = OS.gtk_entry_get_text (entry);

37616

int entryLength = OS.strlen (entryText);

37617

if (entryLength == 0) {

37618

- int /*long*/ fileList = selection.file_list;

37619

- int /*long*/ listSelection = OS.gtk_tree_view_get_selection (fileList);

37620

- int /*long*/[] model = new int /*long*/[1];

37621

- int /*long*/ selectedList = OS.gtk_tree_selection_get_selected_rows (listSelection, model);

37622

+ long /*int*/ fileList = selection.file_list;

37623

+ long /*int*/ listSelection = OS.gtk_tree_view_get_selection (fileList);

37624

+ long /*int*/[] model = new long /*int*/[1];

37625

+ long /*int*/ selectedList = OS.gtk_tree_selection_get_selected_rows (listSelection, model);

37626

if (selectedList == 0) return null;

37627

int listLength = OS.g_list_length (selectedList);

37628

if (listLength == 0) {

37629

OS.g_list_free (selectedList);

37630

return null;

37631

}

37632

- int /*long*/ path = OS.g_list_nth_data (selectedList, 0);

37633

- int /*long*/ [] ptr = new int /*long*/[1];

37634

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

37635

+ long /*int*/ path = OS.g_list_nth_data (selectedList, 0);

37636

+ long /*int*/ [] ptr = new long /*int*/[1];

37637

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

37638

if (OS.gtk_tree_model_get_iter (model [0], iter, path)) {

37639

OS.gtk_tree_model_get (model [0], iter, 0, ptr, -1);

37640

}

37641

@@ -237,10 +237,10 @@

37642

OS.gtk_entry_set_text (entry, buffer);

37643

}

37644

37645

- int /*long*/ fileNamePtr = OS.gtk_file_selection_get_filename (handle);

37646

- int /*long*/ utf8Ptr = OS.g_filename_to_utf8 (fileNamePtr, -1, null, null, null);

37647

- int /*long*/ [] items_written = new int /*long*/ [1];

37648

- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);

37649

+ long /*int*/ fileNamePtr = OS.gtk_file_selection_get_filename (handle);

37650

+ long /*int*/ utf8Ptr = OS.g_filename_to_utf8 (fileNamePtr, -1, null, null, null);

37651

+ long /*int*/ [] items_written = new long /*int*/ [1];

37652

+ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);

37653

entryLength = (int)/*64*/items_written [0];

37654

char [] buffer = new char [entryLength];

37655

OS.memmove (buffer, utf16Ptr, entryLength * 2);

37656

@@ -258,9 +258,9 @@

37657

if ((style & SWT.MULTI) == 0) {

37658

fileNames = new String[] {fileName};

37659

} else {

37660

- int /*long*/ namesPtr = OS.gtk_file_selection_get_selections (handle);

37661

- int /*long*/ namesPtr1 = namesPtr;

37662

- int /*long*/ [] namePtr = new int /*long*/ [1];

37663

+ long /*int*/ namesPtr = OS.gtk_file_selection_get_selections (handle);

37664

+ long /*int*/ namesPtr1 = namesPtr;

37665

+ long /*int*/ [] namePtr = new long /*int*/ [1];

37666

OS.memmove (namePtr, namesPtr1, OS.PTR_SIZEOF);

37667

int length = 0;

37668

while (namePtr[0] != 0) {

37669

@@ -269,11 +269,11 @@

37670

OS.memmove(namePtr, namesPtr1, OS.PTR_SIZEOF);

37671

}

37672

fileNames = new String [length];

37673

- namePtr = new int /*long*/ [length];

37674

+ namePtr = new long /*int*/ [length];

37675

OS.memmove (namePtr, namesPtr, length * OS.PTR_SIZEOF);

37676

for (int i = 0; i < length; i++) {

37677

utf8Ptr = OS.g_filename_to_utf8 (namePtr [i], -1, null, null, null);

37678

- items_written = new int /*long*/ [1];

37679

+ items_written = new long /*int*/ [1];

37680

utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);

37681

buffer = new char [(int)/*64*/items_written [0]];

37682

OS.memmove (buffer, utf16Ptr, items_written [0] * 2);

37683

@@ -391,7 +391,7 @@

37684

int action = (style & SWT.SAVE) != 0 ?

37685

OS.GTK_FILE_CHOOSER_ACTION_SAVE :

37686

OS.GTK_FILE_CHOOSER_ACTION_OPEN;

37687

- int /*long*/ shellHandle = parent.topHandle ();

37688

+ long /*int*/ shellHandle = parent.topHandle ();

37689

Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();

37690

if (display.getDismissalAlignment() == SWT.RIGHT) {

37691

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);

37692

@@ -399,7 +399,7 @@

37693

handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, 0);

37694

}

37695

OS.gtk_window_set_modal (handle, true);

37696

- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);

37697

+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);

37698

if (pixbufs != 0) {

37699

OS.gtk_window_set_icon_list (handle, pixbufs);

37700

OS.g_list_free (pixbufs);

37701

@@ -416,7 +416,7 @@

37702

display.setModalDialog (this);

37703

}

37704

int signalId = 0;

37705

- int /*long*/ hookId = 0;

37706

+ long /*int*/ hookId = 0;

37707

if ((style & SWT.RIGHT_TO_LEFT) != 0) {

37708

signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());

37709

hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);

37710

@@ -439,9 +439,9 @@

37711

byte [] titleBytes = Converter.wcsToMbcs (null, title, true);

37712

handle = OS.gtk_file_selection_new (titleBytes);

37713

if (parent != null) {

37714

- int /*long*/ shellHandle = parent.topHandle ();

37715

+ long /*int*/ shellHandle = parent.topHandle ();

37716

OS.gtk_window_set_transient_for (handle, shellHandle);

37717

- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);

37718

+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);

37719

if (pixbufs != 0) {

37720

OS.gtk_window_set_icon_list (handle, pixbufs);

37721

OS.g_list_free (pixbufs);

37722

@@ -458,7 +458,7 @@

37723

display.setModalDialog (this);

37724

}

37725

int signalId = 0;

37726

- int /*long*/ hookId = 0;

37727

+ long /*int*/ hookId = 0;

37728

if ((style & SWT.RIGHT_TO_LEFT) != 0) {

37729

signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());

37730

hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);

37731

@@ -498,7 +498,7 @@

37732

* when setting a file name that is not a true canonical path.

37733

* The fix is to use the canonical path.

37734

*/

37735

- int /*long*/ ptr = OS.realpath (buffer, null);

37736

+ long /*int*/ ptr = OS.realpath (buffer, null);

37737

OS.gtk_file_chooser_set_current_folder (handle, ptr);

37738

OS.g_free (ptr);

37739

}

37740

@@ -529,7 +529,7 @@

37741

* when setting a file name that is not a true canonical path.

37742

* The fix is to use the canonical path.

37743

*/

37744

- int /*long*/ ptr = OS.realpath (buffer, null);

37745

+ long /*int*/ ptr = OS.realpath (buffer, null);

37746

if (ptr != 0) {

37747

OS.gtk_file_chooser_set_filename (handle, ptr);

37748

OS.g_free (ptr);

37749

@@ -547,10 +547,10 @@

37750

/* Set the extension filters */

37751

if (filterNames == null) filterNames = new String [0];

37752

if (filterExtensions == null) filterExtensions = new String [0];

37753

- int /*long*/ initialFilter = 0;

37754

+ long /*int*/ initialFilter = 0;

37755

for (int i = 0; i < filterExtensions.length; i++) {

37756

if (filterExtensions [i] != null) {

37757

- int /*long*/ filter = OS.gtk_file_filter_new ();

37758

+ long /*int*/ filter = OS.gtk_file_filter_new ();

37759

if (filterNames.length > i && filterNames [i] != null) {

37760

byte [] name = Converter.wcsToMbcs (null, filterNames [i], true);

37761

OS.gtk_file_filter_set_name (filter, name);

37762

@@ -606,8 +606,8 @@

37763

int length = fullPath.length ();

37764

char [] buffer = new char [length + 1];

37765

fullPath.getChars (0, length, buffer, 0);

37766

- int /*long*/ utf8Ptr = OS.g_utf16_to_utf8 (buffer, -1, null, null, null);

37767

- int /*long*/ fileNamePtr = OS.g_filename_from_utf8 (utf8Ptr, -1, null, null, null);

37768

+ long /*int*/ utf8Ptr = OS.g_utf16_to_utf8 (buffer, -1, null, null, null);

37769

+ long /*int*/ fileNamePtr = OS.g_filename_from_utf8 (utf8Ptr, -1, null, null, null);

37770

OS.gtk_file_selection_set_filename (handle, fileNamePtr);

37771

OS.g_free (utf8Ptr);

37772

OS.g_free (fileNamePtr);

37773

diff -urN x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/widgets/FontDialog.java

37774

--- x86/org/eclipse/swt/widgets/FontDialog.java 2009-05-29 17:30:04.000000000 -0400

37775

+++ x86_64/org/eclipse/swt/widgets/FontDialog.java 2009-09-17 08:48:24.000000000 -0400

37776

@@ -134,15 +134,15 @@

37777

* </ul>

37778

*/

37779

public FontData open () {

37780

- int /*long*/ handle;

37781

+ long /*int*/ handle;

37782

byte [] titleBytes;

37783

titleBytes = Converter.wcsToMbcs (null, title, true);

37784

Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();

37785

handle = OS.gtk_font_selection_dialog_new (titleBytes);

37786

if (parent!=null) {

37787

- int /*long*/ shellHandle = parent.topHandle ();

37788

+ long /*int*/ shellHandle = parent.topHandle ();

37789

OS.gtk_window_set_transient_for(handle, shellHandle);

37790

- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);

37791

+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);

37792

if (pixbufs != 0) {

37793

OS.gtk_window_set_icon_list (handle, pixbufs);

37794

OS.g_list_free (pixbufs);

37795

@@ -151,7 +151,7 @@

37796

OS.gtk_window_set_modal (handle, true);

37797

if (fontData != null) {

37798

Font font = new Font (display, fontData);

37799

- int /*long*/ fontName = OS.pango_font_description_to_string (font.handle);

37800

+ long /*int*/ fontName = OS.pango_font_description_to_string (font.handle);

37801

int length = OS.strlen (fontName);

37802

byte [] buffer = new byte [length + 1];

37803

OS.memmove (buffer, fontName, length);

37804

@@ -166,7 +166,7 @@

37805

display.setModalDialog (this);

37806

}

37807

int signalId = 0;

37808

- int /*long*/ hookId = 0;

37809

+ long /*int*/ hookId = 0;

37810

if ((style & SWT.RIGHT_TO_LEFT) != 0) {

37811

signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());

37812

hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);

37813

@@ -180,12 +180,12 @@

37814

}

37815

boolean success = response == OS.GTK_RESPONSE_OK;

37816

if (success) {

37817

- int /*long*/ fontName = OS.gtk_font_selection_dialog_get_font_name (handle);

37818

+ long /*int*/ fontName = OS.gtk_font_selection_dialog_get_font_name (handle);

37819

int length = OS.strlen (fontName);

37820

byte [] buffer = new byte [length + 1];

37821

OS.memmove (buffer, fontName, length);

37822

OS.g_free (fontName);

37823

- int /*long*/ fontDesc = OS.pango_font_description_from_string (buffer);

37824

+ long /*int*/ fontDesc = OS.pango_font_description_from_string (buffer);

37825

Font font = Font.gtk_new (display, fontDesc);

37826

fontData = font.getFontData () [0];

37827

OS.pango_font_description_free (fontDesc);

37828

diff -urN x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/Group.java

37829

--- x86/org/eclipse/swt/widgets/Group.java 2009-05-29 17:30:04.000000000 -0400

37830

+++ x86_64/org/eclipse/swt/widgets/Group.java 2009-09-17 08:48:24.000000000 -0400

37831

@@ -41,7 +41,7 @@

37832

* @noextend This class is not intended to be subclassed by clients.

37833

*/

37834

public class Group extends Composite {

37835

- int /*long*/ clientHandle, labelHandle;

37836

+ long /*int*/ clientHandle, labelHandle;

37837

String text = "";

37838

37839

/**

37840

@@ -96,7 +96,7 @@

37841

if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);

37842

}

37843

37844

-int /*long*/ clientHandle () {

37845

+long /*int*/ clientHandle () {

37846

return clientHandle;

37847

}

37848

37849

@@ -157,7 +157,7 @@

37850

OS.gtk_widget_set_sensitive (labelHandle, enabled);

37851

}

37852

37853

-int /*long*/ eventHandle () {

37854

+long /*int*/ eventHandle () {

37855

return fixedHandle;

37856

}

37857

37858

@@ -201,7 +201,7 @@

37859

return mnemonicMatch (labelHandle, key);

37860

}

37861

37862

-int /*long*/ parentingHandle() {

37863

+long /*int*/ parentingHandle() {

37864

return fixedHandle;

37865

}

37866

37867

@@ -227,7 +227,7 @@

37868

setBackgroundColor(fixedHandle, color);

37869

}

37870

37871

-void setFontDescription (int /*long*/ font) {

37872

+void setFontDescription (long /*int*/ font) {

37873

super.setFontDescription (font);

37874

OS.gtk_widget_modify_font (labelHandle, font);

37875

}

37876

diff -urN x86/org/eclipse/swt/widgets/ImageList.java x86_64/org/eclipse/swt/widgets/ImageList.java

37877

--- x86/org/eclipse/swt/widgets/ImageList.java 2005-06-23 10:51:56.000000000 -0400

37878

+++ x86_64/org/eclipse/swt/widgets/ImageList.java 2009-09-17 08:48:24.000000000 -0400

37879

@@ -15,13 +15,13 @@

37880

import org.eclipse.swt.graphics.*;

37881

37882

class ImageList {

37883

- int /*long*/ [] pixbufs;

37884

+ long /*int*/ [] pixbufs;

37885

int width = -1, height = -1;

37886

Image [] images;

37887

37888

public ImageList() {

37889

images = new Image [4];

37890

- pixbufs = new int /*long*/ [4];

37891

+ pixbufs = new long /*int*/ [4];

37892

}

37893

37894

public int add (Image image) {

37895

@@ -41,7 +41,7 @@

37896

Image [] newImages = new Image [images.length + 4];

37897

System.arraycopy (images, 0, newImages, 0, images.length);

37898

images = newImages;

37899

- int /*long*/ [] newPixbufs = new int /*long*/ [pixbufs.length + 4];

37900

+ long /*int*/ [] newPixbufs = new long /*int*/ [pixbufs.length + 4];

37901

System.arraycopy (pixbufs, 0, newPixbufs, 0, pixbufs.length);

37902

pixbufs = newPixbufs;

37903

}

37904

@@ -62,7 +62,7 @@

37905

return images [index];

37906

}

37907

37908

-int /*long*/ getPixbuf (int index) {

37909

+long /*int*/ getPixbuf (int index) {

37910

return pixbufs [index];

37911

}

37912

37913

@@ -74,7 +74,7 @@

37914

return -1;

37915

}

37916

37917

-int indexOf (int /*long*/ pixbuf) {

37918

+int indexOf (long /*int*/ pixbuf) {

37919

if (pixbuf == 0) return -1;

37920

for (int index=0; index<images.length; index++) {

37921

if (pixbuf == pixbufs [index]) return index;

37922

@@ -112,17 +112,17 @@

37923

void set (int index, Image image) {

37924

int [] w = new int [1], h = new int [1];

37925

OS.gdk_drawable_get_size (image.pixmap, w, h);

37926

- int /*long*/ pixbuf = Display.createPixbuf (image);

37927

+ long /*int*/ pixbuf = Display.createPixbuf (image);

37928

if (width == -1 || height == -1) {

37929

width = w [0];

37930

height = h [0];

37931

}

37932

if (w [0] != width || h [0] != height) {

37933

- int /*long*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, width, height, OS.GDK_INTERP_BILINEAR);

37934

+ long /*int*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, width, height, OS.GDK_INTERP_BILINEAR);

37935

OS.g_object_unref (pixbuf);

37936

pixbuf = scaledPixbuf;

37937

}

37938

- int /*long*/ oldPixbuf = pixbufs [index];

37939

+ long /*int*/ oldPixbuf = pixbufs [index];

37940

if (oldPixbuf != 0) {

37941

if (images [index] == image) {

37942

OS.gdk_pixbuf_copy_area (pixbuf, 0, 0, width, height, oldPixbuf, 0, 0);

37943

diff -urN x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IME.java

37944

--- x86/org/eclipse/swt/widgets/IME.java 2009-05-29 17:30:04.000000000 -0400

37945

+++ x86_64/org/eclipse/swt/widgets/IME.java 2009-09-17 08:48:24.000000000 -0400

37946

@@ -242,14 +242,14 @@

37947

return false;

37948

}

37949

37950

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

37951

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

37952

if (!isInlineEnabled ()) return 0;

37953

- int /*long*/ imHandle = imHandle ();

37954

+ long /*int*/ imHandle = imHandle ();

37955

if (imHandle != 0) OS.gtk_im_context_reset (imHandle);

37956

return 0;

37957

}

37958

37959

-int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ textPtr) {

37960

+long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ textPtr) {

37961

if (!isInlineEnabled ()) return 0;

37962

boolean doit = true;

37963

ranges = null;

37964

@@ -278,14 +278,14 @@

37965

return doit ? 0 : 1;

37966

}

37967

37968

-int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {

37969

+long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) {

37970

if (!isInlineEnabled ()) return 0;

37971

ranges = null;

37972

styles = null;

37973

commitCount = 0;

37974

- int /*long*/ imHandle = imHandle ();

37975

- int /*long*/ [] preeditString = new int /*long*/ [1];

37976

- int /*long*/ [] pangoAttrs = new int /*long*/ [1];

37977

+ long /*int*/ imHandle = imHandle ();

37978

+ long /*int*/ [] preeditString = new long /*int*/ [1];

37979

+ long /*int*/ [] pangoAttrs = new long /*int*/ [1];

37980

int [] cursorPos = new int [1];

37981

OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, cursorPos);

37982

caretOffset = cursorPos [0];

37983

@@ -297,7 +297,7 @@

37984

chars = Converter.mbcsToWcs (null, buffer);

37985

if (pangoAttrs [0] != 0) {

37986

int count = 0;

37987

- int /*long*/ iterator = OS.pango_attr_list_get_iterator (pangoAttrs [0]);

37988

+ long /*int*/ iterator = OS.pango_attr_list_get_iterator (pangoAttrs [0]);

37989

while (OS.pango_attr_iterator_next (iterator)) count++;

37990

OS.pango_attr_iterator_destroy (iterator);

37991

ranges = new int [count * 2];

37992

@@ -312,7 +312,7 @@

37993

ranges [i * 2] = (int)/*64*/OS.g_utf8_pointer_to_offset (preeditString [0], preeditString [0] + start [0]);

37994

ranges [i * 2 + 1] = (int)/*64*/OS.g_utf8_pointer_to_offset (preeditString [0], preeditString [0] + end [0]) - 1;

37995

styles [i] = new TextStyle (null, null, null);

37996

- int /*long*/ attr = OS.pango_attr_iterator_get (iterator, OS.PANGO_ATTR_FOREGROUND);

37997

+ long /*int*/ attr = OS.pango_attr_iterator_get (iterator, OS.PANGO_ATTR_FOREGROUND);

37998

if (attr != 0) {

37999

OS.memmove (attrColor, attr, PangoAttrColor.sizeof);

38000

GdkColor color = new GdkColor ();

38001

@@ -395,7 +395,7 @@

38002

return 1;

38003

}

38004

38005

-int /*long*/ imHandle () {

38006

+long /*int*/ imHandle () {

38007

return parent.imHandle ();

38008

}

38009

38010

diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/Label.java

38011

--- x86/org/eclipse/swt/widgets/Label.java 2009-05-29 17:30:04.000000000 -0400

38012

+++ x86_64/org/eclipse/swt/widgets/Label.java 2009-09-17 08:48:24.000000000 -0400

38013

@@ -50,7 +50,7 @@

38014

* @noextend This class is not intended to be subclassed by clients.

38015

*/

38016

public class Label extends Control {

38017

- int /*long*/ frameHandle, labelHandle, imageHandle;

38018

+ long /*int*/ frameHandle, labelHandle, imageHandle;

38019

ImageList imageList;

38020

Image image;

38021

String text;

38022

@@ -108,8 +108,8 @@

38023

void addRelation (Control control) {

38024

if (!control.isDescribedByLabel ()) return;

38025

if (labelHandle == 0) return;

38026

- int /*long*/ accessible = OS.gtk_widget_get_accessible (labelHandle);

38027

- int /*long*/ controlAccessible = OS.gtk_widget_get_accessible (control.handle);

38028

+ long /*int*/ accessible = OS.gtk_widget_get_accessible (labelHandle);

38029

+ long /*int*/ controlAccessible = OS.gtk_widget_get_accessible (control.handle);

38030

if (accessible != 0 && controlAccessible != 0) {

38031

OS.atk_object_add_relationship (controlAccessible, OS.ATK_RELATION_LABELLED_BY, accessible);

38032

}

38033

@@ -135,7 +135,7 @@

38034

boolean fixWrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && (OS.GTK_WIDGET_FLAGS (labelHandle) & OS.GTK_VISIBLE) != 0;

38035

if (fixWrap || frameHandle != 0) forceResize ();

38036

if (fixWrap) {

38037

- int /*long*/ labelLayout = OS.gtk_label_get_layout (labelHandle);

38038

+ long /*int*/ labelLayout = OS.gtk_label_get_layout (labelHandle);

38039

int pangoWidth = OS.pango_layout_get_width (labelLayout);

38040

if (wHint != SWT.DEFAULT) {

38041

OS.pango_layout_set_width (labelLayout, wHint * OS.PANGO_SCALE);

38042

@@ -179,11 +179,11 @@

38043

* muliple lines of text.

38044

*/

38045

if (hHint == SWT.DEFAULT && labelHandle != 0) {

38046

- int /*long*/ layout = OS.gtk_label_get_layout (labelHandle);

38047

- int /*long*/ context = OS.pango_layout_get_context (layout);

38048

- int /*long*/ lang = OS.pango_context_get_language (context);

38049

- int /*long*/ font = getFontDescription ();

38050

- int /*long*/ metrics = OS.pango_context_get_metrics (context, font, lang);

38051

+ long /*int*/ layout = OS.gtk_label_get_layout (labelHandle);

38052

+ long /*int*/ context = OS.pango_layout_get_context (layout);

38053

+ long /*int*/ lang = OS.pango_context_get_language (context);

38054

+ long /*int*/ font = getFontDescription ();

38055

+ long /*int*/ metrics = OS.pango_context_get_metrics (context, font, lang);

38056

int ascent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_ascent (metrics));

38057

int descent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_descent (metrics));

38058

OS.pango_font_metrics_unref (metrics);

38059

@@ -192,7 +192,7 @@

38060

OS.g_object_get (labelHandle, OS.ypad, buffer, 0);

38061

fontHeight += 2 * buffer [0];

38062

if (frameHandle != 0) {

38063

- int /*long*/ style = OS.gtk_widget_get_style (frameHandle);

38064

+ long /*int*/ style = OS.gtk_widget_get_style (frameHandle);

38065

fontHeight += 2 * OS.gtk_style_get_ythickness (style);

38066

fontHeight += 2 * OS.gtk_container_get_border_width (frameHandle);

38067

}

38068

@@ -254,7 +254,7 @@

38069

if (imageHandle != 0) display.removeWidget (imageHandle);

38070

}

38071

38072

-int /*long*/ eventHandle () {

38073

+long /*int*/ eventHandle () {

38074

return fixedHandle;

38075

}

38076

38077

@@ -487,7 +487,7 @@

38078

return result;

38079

}

38080

38081

-void setFontDescription (int /*long*/ font) {

38082

+void setFontDescription (long /*int*/ font) {

38083

super.setFontDescription (font);

38084

if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);

38085

if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);

38086

@@ -531,7 +531,7 @@

38087

if (image != null) {

38088

imageList = new ImageList ();

38089

int imageIndex = imageList.add (image);

38090

- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);

38091

+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);

38092

OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);

38093

OS.gtk_widget_hide (labelHandle);

38094

OS.gtk_widget_show (imageHandle);

38095

diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/Link.java

38096

--- x86/org/eclipse/swt/widgets/Link.java 2009-05-29 17:30:04.000000000 -0400

38097

+++ x86_64/org/eclipse/swt/widgets/Link.java 2009-09-17 08:48:24.000000000 -0400

38098

@@ -282,8 +282,8 @@

38099

return text;

38100

}

38101

38102

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

38103

- int /*long*/ result = super.gtk_button_press_event (widget, event);

38104

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

38105

+ long /*int*/ result = super.gtk_button_press_event (widget, event);

38106

if (result != 0) return result;

38107

GdkEventButton gdkEvent = new GdkEventButton ();

38108

OS.memmove (gdkEvent, event, GdkEventButton.sizeof);

38109

@@ -321,8 +321,8 @@

38110

return result;

38111

}

38112

38113

-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) {

38114

- int /*long*/ result = super.gtk_button_release_event (widget, event);

38115

+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {

38116

+ long /*int*/ result = super.gtk_button_release_event (widget, event);

38117

if (result != 0) return result;

38118

if (focusIndex == -1) return result;

38119

GdkEventButton gdkEvent = new GdkEventButton ();

38120

@@ -345,8 +345,8 @@

38121

return result;

38122

}

38123

38124

-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {

38125

- int /*long*/ result = super.gtk_event_after (widget, gdkEvent);

38126

+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {

38127

+ long /*int*/ result = super.gtk_event_after (widget, gdkEvent);

38128

GdkEvent event = new GdkEvent ();

38129

OS.memmove (event, gdkEvent, GdkEvent.sizeof);

38130

switch (event.type) {

38131

@@ -357,7 +357,7 @@

38132

return result;

38133

}

38134

38135

-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {

38136

+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {

38137

if ((state & OBSCURED) != 0) return 0;

38138

GdkEventExpose gdkEvent = new GdkEventExpose ();

38139

OS.memmove (gdkEvent, eventPtr, GdkEventExpose.sizeof);

38140

@@ -398,8 +398,8 @@

38141

return 0;

38142

}

38143

38144

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {

38145

- int /*long*/ result = super.gtk_key_press_event (widget, eventPtr);

38146

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) {

38147

+ long /*int*/ result = super.gtk_key_press_event (widget, eventPtr);

38148

if (result != 0) return result;

38149

if (focusIndex == -1) return result;

38150

GdkEventKey gdkEvent = new GdkEventKey ();

38151

@@ -428,8 +428,8 @@

38152

return result;

38153

}

38154

38155

-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {

38156

- int /*long*/ result = super.gtk_motion_notify_event (widget, event);

38157

+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {

38158

+ long /*int*/ result = super.gtk_motion_notify_event (widget, event);

38159

if (result != 0) return result;

38160

GdkEventMotion gdkEvent = new GdkEventMotion ();

38161

OS.memmove (gdkEvent, event, GdkEventMotion.sizeof);

38162

@@ -662,7 +662,7 @@

38163

return result;

38164

}

38165

38166

-void setFontDescription (int /*long*/ font) {

38167

+void setFontDescription (long /*int*/ font) {

38168

super.setFontDescription (font);

38169

layout.setFont (Font.gtk_new (display, font));

38170

}

38171

diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/List.java

38172

--- x86/org/eclipse/swt/widgets/List.java 2009-05-29 17:30:04.000000000 -0400

38173

+++ x86_64/org/eclipse/swt/widgets/List.java 2009-09-17 08:48:24.000000000 -0400

38174

@@ -40,7 +40,7 @@

38175

* @noextend This class is not intended to be subclassed by clients.

38176

*/

38177

public class List extends Scrollable {

38178

- int /*long*/ modelHandle;

38179

+ long /*int*/ modelHandle;

38180

38181

static final int TEXT_COLUMN = 0;

38182

38183

@@ -96,7 +96,7 @@

38184

checkWidget();

38185

if (string == null) error (SWT.ERROR_NULL_ARGUMENT);

38186

byte [] buffer = Converter.wcsToMbcs (null, string, true);

38187

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38188

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38189

if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);

38190

OS.gtk_list_store_append (modelHandle, iter);

38191

OS.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);

38192

@@ -134,7 +134,7 @@

38193

error (SWT.ERROR_INVALID_RANGE);

38194

}

38195

byte [] buffer = Converter.wcsToMbcs (null, string, true);

38196

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38197

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38198

if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);

38199

/*

38200

* Feature in GTK. It is much faster to append to a list store

38201

@@ -196,14 +196,14 @@

38202

* Columns:

38203

* 0 - text

38204

*/

38205

- int /*long*/ [] types = new int /*long*/ [] {OS.G_TYPE_STRING ()};

38206

+ long /*int*/ [] types = new long /*int*/ [] {OS.G_TYPE_STRING ()};

38207

modelHandle = OS.gtk_list_store_newv (types.length, types);

38208

if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);

38209

handle = OS.gtk_tree_view_new_with_model (modelHandle);

38210

if (handle == 0) error (SWT.ERROR_NO_HANDLES);

38211

- int /*long*/ textRenderer = OS.gtk_cell_renderer_text_new ();

38212

+ long /*int*/ textRenderer = OS.gtk_cell_renderer_text_new ();

38213

if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);

38214

- int /*long*/ columnHandle = OS.gtk_tree_view_column_new ();

38215

+ long /*int*/ columnHandle = OS.gtk_tree_view_column_new ();

38216

if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);

38217

OS.gtk_tree_view_column_pack_start (columnHandle, textRenderer, true);

38218

OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.text, TEXT_COLUMN);

38219

@@ -212,7 +212,7 @@

38220

OS.gtk_container_add (scrolledHandle, handle);

38221

38222

int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;

38223

- int /*long*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);

38224

+ long /*int*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);

38225

OS.gtk_tree_selection_set_mode (selectionHandle, mode);

38226

OS.gtk_tree_view_set_headers_visible (handle, false);

38227

int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;

38228

@@ -276,8 +276,8 @@

38229

public void deselect (int index) {

38230

checkWidget();

38231

if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;

38232

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38233

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38234

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38235

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38236

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38237

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

38238

OS.gtk_tree_selection_unselect_iter (selection, iter);

38239

@@ -307,8 +307,8 @@

38240

if (start >= count && end >= count) return;

38241

start = Math.min (count - 1, Math.max (0, start));

38242

end = Math.min (count - 1, Math.max (0, end));

38243

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38244

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38245

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38246

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38247

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38248

for (int index=start; index<=end; index++) {

38249

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

38250

@@ -338,9 +338,9 @@

38251

public void deselect (int [] indices) {

38252

checkWidget();

38253

if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);

38254

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38255

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38256

int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);

38257

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38258

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38259

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38260

for (int i=0; i<indices.length; i++) {

38261

int index = indices [i];

38262

@@ -362,7 +362,7 @@

38263

*/

38264

public void deselectAll () {

38265

checkWidget();

38266

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38267

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38268

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38269

OS.gtk_tree_selection_unselect_all (selection);

38270

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38271

@@ -371,10 +371,10 @@

38272

boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {

38273

boolean selected = false;

38274

if (filter) {

38275

- int /*long*/ [] path = new int /*long*/ [1];

38276

+ long /*int*/ [] path = new long /*int*/ [1];

38277

if (OS.gtk_tree_view_get_path_at_pos (handle, x, y, path, null, null, null)) {

38278

if (path [0] != 0) {

38279

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38280

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38281

if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;

38282

OS.gtk_tree_path_free (path [0]);

38283

}

38284

@@ -387,7 +387,7 @@

38285

return dragDetect;

38286

}

38287

38288

-int /*long*/ eventWindow () {

38289

+long /*int*/ eventWindow () {

38290

return paintWindow ();

38291

}

38292

38293

@@ -408,10 +408,10 @@

38294

*/

38295

public int getFocusIndex () {

38296

checkWidget();

38297

- int /*long*/ [] path = new int /*long*/ [1];

38298

+ long /*int*/ [] path = new long /*int*/ [1];

38299

OS.gtk_tree_view_get_cursor (handle, path, null);

38300

if (path [0] == 0) return -1;

38301

- int /*long*/ indices = OS.gtk_tree_path_get_indices (path [0]);

38302

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path [0]);

38303

int [] index = new int []{-1};

38304

if (indices != 0) OS.memmove (index, indices, 4);

38305

OS.gtk_tree_path_free (path [0]);

38306

@@ -442,8 +442,8 @@

38307

if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) {

38308

error (SWT.ERROR_INVALID_RANGE);

38309

}

38310

- int /*long*/ [] ptr = new int /*long*/ [1];

38311

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38312

+ long /*int*/ [] ptr = new long /*int*/ [1];

38313

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38314

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

38315

OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);

38316

OS.g_free (iter);

38317

@@ -484,13 +484,13 @@

38318

public int getItemHeight () {

38319

checkWidget();

38320

int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);

38321

- int /*long*/ column = OS.gtk_tree_view_get_column (handle, 0);

38322

+ long /*int*/ column = OS.gtk_tree_view_get_column (handle, 0);

38323

if (itemCount == 0) {

38324

int [] w = new int [1], h = new int [1];

38325

OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);

38326

return h [0];

38327

} else {

38328

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38329

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38330

OS.gtk_tree_model_get_iter_first (modelHandle, iter);

38331

OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);

38332

int [] w = new int [1], h = new int [1];

38333

@@ -519,9 +519,9 @@

38334

public String [] getItems () {

38335

checkWidget();

38336

int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);

38337

- int /*long*/ [] ptr = new int /*long*/ [1];

38338

+ long /*int*/ [] ptr = new long /*int*/ [1];

38339

String [] result = new String [count];

38340

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38341

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38342

for (int index=0; index<count; index++) {

38343

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

38344

OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);

38345

@@ -575,7 +575,7 @@

38346

*/

38347

public int getSelectionCount () {

38348

checkWidget();

38349

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38350

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38351

if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {

38352

display.treeSelectionLength = 0;

38353

display.treeSelection = null;

38354

@@ -598,7 +598,7 @@

38355

*/

38356

public int getSelectionIndex () {

38357

checkWidget();

38358

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38359

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38360

if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {

38361

int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);

38362

display.treeSelectionLength = 0;

38363

@@ -612,14 +612,14 @@

38364

* in versions smaller than 2.2.4 if the model is NULL. The fix is

38365

* to give a valid pointer instead.

38366

*/

38367

- int /*long*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new int /*long*/ [1] : null;

38368

- int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

38369

+ long /*int*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new long /*int*/ [1] : null;

38370

+ long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

38371

if (list != 0) {

38372

int count = OS.g_list_length (list);

38373

int [] index = new int [1];

38374

for (int i=0; i<count; i++) {

38375

- int /*long*/ data = OS.g_list_nth_data (list, i);

38376

- int /*long*/ indices = OS.gtk_tree_path_get_indices (data);

38377

+ long /*int*/ data = OS.g_list_nth_data (list, i);

38378

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (data);

38379

if (indices != 0) {

38380

OS.memmove (index, indices, 4);

38381

break;

38382

@@ -649,7 +649,7 @@

38383

*/

38384

public int [] getSelectionIndices () {

38385

checkWidget();

38386

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38387

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38388

if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {

38389

int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);

38390

display.treeSelectionLength = 0;

38391

@@ -665,15 +665,15 @@

38392

* in versions smaller than 2.2.4 if the model is NULL. The fix is

38393

* to give a valid pointer instead.

38394

*/

38395

- int /*long*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new int /*long*/ [1] : null;

38396

- int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

38397

+ long /*int*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new long /*int*/ [1] : null;

38398

+ long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

38399

if (list != 0) {

38400

int count = OS.g_list_length (list);

38401

int [] treeSelection = new int [count];

38402

int length = 0;

38403

for (int i=0; i<count; i++) {

38404

- int /*long*/ data = OS.g_list_nth_data (list, i);

38405

- int /*long*/ indices = OS.gtk_tree_path_get_indices (data);

38406

+ long /*int*/ data = OS.g_list_nth_data (list, i);

38407

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (data);

38408

if (indices != 0) {

38409

int [] index = new int [1];

38410

OS.memmove (index, indices, 4);

38411

@@ -703,24 +703,24 @@

38412

*/

38413

public int getTopIndex () {

38414

checkWidget();

38415

- int /*long*/ [] path = new int /*long*/ [1];

38416

+ long /*int*/ [] path = new long /*int*/ [1];

38417

OS.gtk_widget_realize (handle);

38418

if (!OS.gtk_tree_view_get_path_at_pos (handle, 1, 1, path, null, null, null)) return 0;

38419

if (path [0] == 0) return 0;

38420

- int /*long*/ indices = OS.gtk_tree_path_get_indices (path[0]);

38421

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path[0]);

38422

int[] index = new int [1];

38423

if (indices != 0) OS.memmove (index, indices, 4);

38424

OS.gtk_tree_path_free (path [0]);

38425

return index [0];

38426

}

38427

38428

-int /*long*/ gtk_changed (int /*long*/ widget) {

38429

+long /*int*/ gtk_changed (long /*int*/ widget) {

38430

postEvent (SWT.Selection);

38431

return 0;

38432

}

38433

38434

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

38435

- int /*long*/ result = super.gtk_button_press_event (widget, event);

38436

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

38437

+ long /*int*/ result = super.gtk_button_press_event (widget, event);

38438

if (result != 0) return result;

38439

/*

38440

* Feature in GTK. In a multi-select list view, when multiple items are already

38441

@@ -734,10 +734,10 @@

38442

OS.memmove (gdkEvent, event, GdkEventButton.sizeof);

38443

int button = gdkEvent.button;

38444

if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {

38445

- int /*long*/ [] path = new int /*long*/ [1];

38446

+ long /*int*/ [] path = new long /*int*/ [1];

38447

if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {

38448

if (path [0] != 0) {

38449

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38450

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38451

if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;

38452

OS.gtk_tree_path_free (path [0]);

38453

}

38454

@@ -752,10 +752,10 @@

38455

* widget from automatically selecting the first item.

38456

*/

38457

if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {

38458

- int /*long*/ [] path = new int /*long*/ [1];

38459

+ long /*int*/ [] path = new long /*int*/ [1];

38460

if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {

38461

if (path [0] != 0) {

38462

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38463

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38464

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38465

OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);

38466

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38467

@@ -775,8 +775,8 @@

38468

return result;

38469

}

38470

38471

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {

38472

- int /*long*/ result = super.gtk_key_press_event (widget, event);

38473

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {

38474

+ long /*int*/ result = super.gtk_key_press_event (widget, event);

38475

if (result != 0) return result;

38476

if (OS.GTK_VERSION < OS.VERSION (2, 2 ,0)) {

38477

/*

38478

@@ -798,8 +798,8 @@

38479

return result;

38480

}

38481

38482

-int /*long*/ gtk_popup_menu (int /*long*/ widget) {

38483

- int /*long*/ result = super.gtk_popup_menu (widget);

38484

+long /*int*/ gtk_popup_menu (long /*int*/ widget) {

38485

+ long /*int*/ result = super.gtk_popup_menu (widget);

38486

/*

38487

* Bug in GTK. The context menu for the typeahead in GtkTreeViewer

38488

* opens in the bottom right corner of the screen when Shift+F10

38489

@@ -812,14 +812,14 @@

38490

return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;

38491

}

38492

38493

-int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long*/ column) {

38494

+long /*int*/ gtk_row_activated (long /*int*/ tree, long /*int*/ path, long /*int*/ column) {

38495

postEvent (SWT.DefaultSelection);

38496

return 0;

38497

}

38498

38499

void hookEvents () {

38500

super.hookEvents();

38501

- int /*long*/ selection = OS.gtk_tree_view_get_selection(handle);

38502

+ long /*int*/ selection = OS.gtk_tree_view_get_selection(handle);

38503

OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false);

38504

OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false);

38505

}

38506

@@ -892,15 +892,15 @@

38507

*/

38508

public boolean isSelected (int index) {

38509

checkWidget();

38510

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38511

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38512

byte [] buffer = Converter.wcsToMbcs (null, Integer.toString (index), true);

38513

- int /*long*/ path = OS.gtk_tree_path_new_from_string (buffer);

38514

+ long /*int*/ path = OS.gtk_tree_path_new_from_string (buffer);

38515

boolean answer = OS.gtk_tree_selection_path_is_selected (selection, path);

38516

OS.gtk_tree_path_free (path);

38517

return answer;

38518

}

38519

38520

-int /*long*/ paintWindow () {

38521

+long /*int*/ paintWindow () {

38522

OS.gtk_widget_realize (handle);

38523

return OS.gtk_tree_view_get_bin_window (handle);

38524

}

38525

@@ -935,9 +935,9 @@

38526

if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) {

38527

error (SWT.ERROR_INVALID_RANGE);

38528

}

38529

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38530

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38531

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

38532

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38533

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38534

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38535

OS.gtk_list_store_remove (modelHandle, iter);

38536

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38537

@@ -967,8 +967,8 @@

38538

if (!(0 <= start && start <= end && end < count)) {

38539

error (SWT.ERROR_INVALID_RANGE);

38540

}

38541

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38542

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38543

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38544

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38545

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38546

for (int index=end; index>=start; index--) {

38547

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

38548

@@ -1029,8 +1029,8 @@

38549

if (!(0 <= start && start <= end && end < count)) {

38550

error (SWT.ERROR_INVALID_RANGE);

38551

}

38552

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38553

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38554

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38555

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38556

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38557

int last = -1;

38558

for (int i=0; i<newIndices.length; i++) {

38559

@@ -1055,7 +1055,7 @@

38560

*/

38561

public void removeAll () {

38562

checkWidget();

38563

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38564

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38565

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38566

OS.gtk_list_store_clear (modelHandle);

38567

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38568

@@ -1101,13 +1101,13 @@

38569

public void select (int index) {

38570

checkWidget();

38571

if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;

38572

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38573

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38574

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38575

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38576

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38577

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

38578

OS.gtk_tree_selection_select_iter (selection, iter);

38579

if ((style & SWT.SINGLE) != 0) {

38580

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

38581

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

38582

OS.gtk_tree_view_set_cursor (handle, path, 0, false);

38583

OS.gtk_tree_path_free (path);

38584

}

38585

@@ -1144,14 +1144,14 @@

38586

if (count == 0 || start >= count) return;

38587

start = Math.max (0, start);

38588

end = Math.min (end, count - 1);

38589

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38590

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38591

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38592

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38593

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38594

for (int index=start; index<=end; index++) {

38595

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

38596

OS.gtk_tree_selection_select_iter (selection, iter);

38597

if ((style & SWT.SINGLE) != 0) {

38598

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

38599

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

38600

OS.gtk_tree_view_set_cursor (handle, path, 0, false);

38601

OS.gtk_tree_path_free (path);

38602

}

38603

@@ -1187,9 +1187,9 @@

38604

if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);

38605

int length = indices.length;

38606

if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;

38607

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38608

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38609

int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);

38610

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38611

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38612

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38613

for (int i=0; i<length; i++) {

38614

int index = indices [i];

38615

@@ -1197,7 +1197,7 @@

38616

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

38617

OS.gtk_tree_selection_select_iter (selection, iter);

38618

if ((style & SWT.SINGLE) != 0) {

38619

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

38620

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

38621

OS.gtk_tree_view_set_cursor (handle, path, 0, false);

38622

OS.gtk_tree_path_free (path);

38623

}

38624

@@ -1219,7 +1219,7 @@

38625

public void selectAll () {

38626

checkWidget();

38627

if ((style & SWT.SINGLE) != 0) return;

38628

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38629

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38630

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38631

OS.gtk_tree_selection_select_all (selection);

38632

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38633

@@ -1233,10 +1233,10 @@

38634

*/

38635

int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);

38636

if (!(0 <= index && index < count)) return;

38637

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38638

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38639

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

38640

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

38641

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38642

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

38643

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38644

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38645

OS.gtk_tree_view_set_cursor (handle, path, 0, false);

38646

/*

38647

@@ -1303,7 +1303,7 @@

38648

if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) {

38649

error (SWT.ERROR_INVALID_RANGE);

38650

}

38651

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38652

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38653

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

38654

byte [] buffer = Converter.wcsToMbcs (null, string, true);

38655

OS.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);

38656

@@ -1330,11 +1330,11 @@

38657

for (int i=0; i<items.length; i++) {

38658

if (items [i] == null) error (SWT.ERROR_INVALID_ARGUMENT);

38659

}

38660

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

38661

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

38662

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38663

OS.gtk_list_store_clear (modelHandle);

38664

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

38665

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38666

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38667

if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);

38668

for (int i=0; i<items.length; i++) {

38669

String string = items [i];

38670

@@ -1504,9 +1504,9 @@

38671

public void setTopIndex (int index) {

38672

checkWidget();

38673

if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;

38674

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38675

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38676

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

38677

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

38678

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

38679

OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0, 0);

38680

if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {

38681

/*

38682

@@ -1543,9 +1543,9 @@

38683

checkWidget();

38684

int index = getSelectionIndex ();

38685

if (index == -1) return;

38686

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38687

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

38688

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

38689

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

38690

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

38691

/*

38692

* This code intentionally commented.

38693

* Bug in GTK. According to the documentation, gtk_tree_view_scroll_to_cell

38694

@@ -1579,9 +1579,9 @@

38695

OS.g_free (iter);

38696

}

38697

38698

-int /*long*/ treeSelectionProc (int /*long*/ model, int /*long*/ path, int /*long*/ iter, int[] selection, int length) {

38699

+long /*int*/ treeSelectionProc (long /*int*/ model, long /*int*/ path, long /*int*/ iter, int[] selection, int length) {

38700

if (selection != null) {

38701

- int /*long*/ indices = OS.gtk_tree_path_get_indices (path);

38702

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path);

38703

if (indices != 0) {

38704

int [] index = new int [1];

38705

OS.memmove (index, indices, 4);

38706

diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widgets/MenuItem.java

38707

--- x86/org/eclipse/swt/widgets/MenuItem.java 2009-05-29 17:30:04.000000000 -0400

38708

+++ x86_64/org/eclipse/swt/widgets/MenuItem.java 2009-09-17 08:48:24.000000000 -0400

38709

@@ -38,7 +38,7 @@

38710

*/

38711

public class MenuItem extends Item {

38712

Menu parent, menu;

38713

- int /*long*/ groupHandle;

38714

+ long /*int*/ groupHandle;

38715

int accelerator;

38716

38717

/**

38718

@@ -127,11 +127,11 @@

38719

createWidget (index);

38720

}

38721

38722

-void addAccelerator (int /*long*/ accelGroup) {

38723

+void addAccelerator (long /*int*/ accelGroup) {

38724

updateAccelerator (accelGroup, true);

38725

}

38726

38727

-void addAccelerators (int /*long*/ accelGroup) {

38728

+void addAccelerators (long /*int*/ accelGroup) {

38729

addAccelerator (accelGroup);

38730

if (menu != null) menu.addAccelerators (accelGroup);

38731

}

38732

@@ -252,7 +252,7 @@

38733

if (groupHandle == 0) error (SWT.ERROR_NO_HANDLES);

38734

OS.g_object_ref (groupHandle);

38735

OS.gtk_object_sink (groupHandle);

38736

- int /*long*/ group = OS.gtk_radio_menu_item_get_group (groupHandle);

38737

+ long /*int*/ group = OS.gtk_radio_menu_item_get_group (groupHandle);

38738

handle = OS.gtk_radio_menu_item_new_with_label (group, buffer);

38739

break;

38740

case SWT.CHECK:

38741

@@ -265,10 +265,10 @@

38742

}

38743

if (handle == 0) error (SWT.ERROR_NO_HANDLES);

38744

if ((style & SWT.SEPARATOR) == 0) {

38745

- int /*long*/ label = OS.gtk_bin_get_child (handle);

38746

+ long /*int*/ label = OS.gtk_bin_get_child (handle);

38747

OS.gtk_accel_label_set_accel_widget (label, 0);

38748

}

38749

- int /*long*/ parentHandle = parent.handle;

38750

+ long /*int*/ parentHandle = parent.handle;

38751

boolean enabled = OS.GTK_WIDGET_SENSITIVE (parentHandle);

38752

if (!enabled) OS.GTK_WIDGET_SET_FLAGS (parentHandle, OS.GTK_SENSITIVE);

38753

OS.gtk_menu_shell_insert (parentHandle, handle, index);

38754

@@ -300,7 +300,7 @@

38755

return accelerator;

38756

}

38757

38758

-int /*long*/ getAccelGroup () {

38759

+long /*int*/ getAccelGroup () {

38760

Menu menu = parent;

38761

while (menu != null && menu.cascade != null) {

38762

menu = menu.cascade.parent;

38763

@@ -401,7 +401,7 @@

38764

return OS.gtk_check_menu_item_get_active(handle);

38765

}

38766

38767

-int /*long*/ gtk_activate (int /*long*/ widget) {

38768

+long /*int*/ gtk_activate (long /*int*/ widget) {

38769

if ((style & SWT.CASCADE) != 0 && menu != null) return 0;

38770

/*

38771

* Bug in GTK. When an ancestor menu is disabled and

38772

@@ -412,7 +412,7 @@

38773

*/

38774

if (!isEnabled ()) return 0;

38775

Event event = new Event ();

38776

- int /*long*/ ptr = OS.gtk_get_current_event ();

38777

+ long /*int*/ ptr = OS.gtk_get_current_event ();

38778

if (ptr != 0) {

38779

GdkEvent gdkEvent = new GdkEvent ();

38780

OS.memmove (gdkEvent, ptr, GdkEvent.sizeof);

38781

@@ -439,13 +439,13 @@

38782

return 0;

38783

}

38784

38785

-int /*long*/ gtk_select (int /*long*/ item) {

38786

+long /*int*/ gtk_select (long /*int*/ item) {

38787

parent.selectedItem = this;

38788

sendEvent (SWT.Arm);

38789

return 0;

38790

}

38791

38792

-int /*long*/ gtk_show_help (int /*long*/ widget, int /*long*/ helpType) {

38793

+long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) {

38794

boolean handled = hooks (SWT.Help);

38795

if (handled) {

38796

postEvent (SWT.Help);

38797

@@ -504,7 +504,7 @@

38798

38799

void releaseWidget () {

38800

super.releaseWidget ();

38801

- int /*long*/ accelGroup = getAccelGroup ();

38802

+ long /*int*/ accelGroup = getAccelGroup ();

38803

if (accelGroup != 0) removeAccelerator (accelGroup);

38804

if (groupHandle != 0) OS.g_object_unref (groupHandle);

38805

groupHandle = 0;

38806

@@ -512,11 +512,11 @@

38807

parent = null;

38808

}

38809

38810

-void removeAccelerator (int /*long*/ accelGroup) {

38811

+void removeAccelerator (long /*int*/ accelGroup) {

38812

updateAccelerator (accelGroup, false);

38813

}

38814

38815

-void removeAccelerators (int /*long*/ accelGroup) {

38816

+void removeAccelerators (long /*int*/ accelGroup) {

38817

removeAccelerator (accelGroup);

38818

if (menu != null) menu.removeAccelerators (accelGroup);

38819

}

38820

@@ -622,7 +622,7 @@

38821

public void setAccelerator (int accelerator) {

38822

checkWidget();

38823

if (this.accelerator == accelerator) return;

38824

- int /*long*/ accelGroup = getAccelGroup ();

38825

+ long /*int*/ accelGroup = getAccelGroup ();

38826

if (accelGroup != 0) removeAccelerator (accelGroup);

38827

this.accelerator = accelerator;

38828

if (accelGroup != 0) addAccelerator (accelGroup);

38829

@@ -644,7 +644,7 @@

38830

public void setEnabled (boolean enabled) {

38831

checkWidget();

38832

if (OS.GTK_WIDGET_SENSITIVE (handle) == enabled) return;

38833

- int /*long*/ accelGroup = getAccelGroup ();

38834

+ long /*int*/ accelGroup = getAccelGroup ();

38835

if (accelGroup != 0) removeAccelerator (accelGroup);

38836

OS.gtk_widget_set_sensitive (handle, enabled);

38837

if (accelGroup != 0) addAccelerator (accelGroup);

38838

@@ -681,8 +681,8 @@

38839

} else {

38840

imageList.put (imageIndex, image);

38841

}

38842

- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);

38843

- int /*long*/ imageHandle = OS.gtk_image_new_from_pixbuf (pixbuf);

38844

+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);

38845

+ long /*int*/ imageHandle = OS.gtk_image_new_from_pixbuf (pixbuf);

38846

OS.gtk_image_menu_item_set_image (handle, imageHandle);

38847

OS.gtk_widget_show (imageHandle);

38848

} else {

38849

@@ -734,7 +734,7 @@

38850

/* Assign the new menu */

38851

Menu oldMenu = this.menu;

38852

if (oldMenu == menu) return;

38853

- int /*long*/ accelGroup = getAccelGroup ();

38854

+ long /*int*/ accelGroup = getAccelGroup ();

38855

if (accelGroup != 0) removeAccelerators (accelGroup);

38856

if (oldMenu != null) {

38857

oldMenu.cascade = null;

38858

@@ -844,17 +844,17 @@

38859

}

38860

char [] chars = fixMnemonic (string);

38861

byte [] buffer = Converter.wcsToMbcs (null, chars, true);

38862

- int /*long*/ label = OS.gtk_bin_get_child (handle);

38863

+ long /*int*/ label = OS.gtk_bin_get_child (handle);

38864

OS.gtk_label_set_text_with_mnemonic (label, buffer);

38865

buffer = Converter.wcsToMbcs (null, accelString, true);

38866

- int /*long*/ ptr = OS.g_malloc (buffer.length);

38867

+ long /*int*/ ptr = OS.g_malloc (buffer.length);

38868

OS.memmove (ptr, buffer, buffer.length);

38869

- int /*long*/ oldPtr = OS.GTK_ACCEL_LABEL_GET_ACCEL_STRING (label);

38870

+ long /*int*/ oldPtr = OS.GTK_ACCEL_LABEL_GET_ACCEL_STRING (label);

38871

OS.GTK_ACCEL_LABEL_SET_ACCEL_STRING (label, ptr);

38872

if (oldPtr != 0) OS.g_free (oldPtr);

38873

}

38874

38875

-void updateAccelerator (int /*long*/ accelGroup, boolean add) {

38876

+void updateAccelerator (long /*int*/ accelGroup, boolean add) {

38877

if (accelerator == 0 || !getEnabled ()) return;

38878

if ((accelerator & SWT.COMMAND) != 0) return;

38879

int mask = 0;

38880

diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Menu.java

38881

--- x86/org/eclipse/swt/widgets/Menu.java 2009-05-29 17:30:04.000000000 -0400

38882

+++ x86_64/org/eclipse/swt/widgets/Menu.java 2009-09-17 08:48:24.000000000 -0400

38883

@@ -44,7 +44,7 @@

38884

boolean hasLocation;

38885

MenuItem cascade, selectedItem;

38886

Decorations parent;

38887

- int /*long*/ imItem, imSeparator, imHandle;

38888

+ long /*int*/ imItem, imSeparator, imHandle;

38889

ImageList imageList;

38890

38891

/**

38892

@@ -209,7 +209,7 @@

38893

OS.gtk_menu_shell_set_take_focus (handle, false);

38894

}

38895

}

38896

- int /*long*/ address = hasLocation ? display.menuPositionProc: 0;

38897

+ long /*int*/ address = hasLocation ? display.menuPositionProc: 0;

38898

/*

38899

* Bug in GTK. The timestamp passed into gtk_menu_popup is used

38900

* to perform an X pointer grab. It cannot be zero, else the grab

38901

@@ -225,7 +225,7 @@

38902

}

38903

}

38904

38905

-void addAccelerators (int /*long*/ accelGroup) {

38906

+void addAccelerators (long /*int*/ accelGroup) {

38907

MenuItem [] items = getItems ();

38908

for (int i = 0; i < items.length; i++) {

38909

MenuItem item = items[i];

38910

@@ -291,7 +291,7 @@

38911

if ((style & SWT.BAR) != 0) {

38912

handle = OS.gtk_menu_bar_new ();

38913

if (handle == 0) error (SWT.ERROR_NO_HANDLES);

38914

- int /*long*/ vboxHandle = parent.vboxHandle;

38915

+ long /*int*/ vboxHandle = parent.vboxHandle;

38916

OS.gtk_container_add (vboxHandle, handle);

38917

OS.gtk_box_set_child_packing (vboxHandle, handle, false, true, 0, OS.GTK_PACK_START);

38918

} else {

38919

@@ -300,7 +300,7 @@

38920

}

38921

}

38922

38923

-void createIMMenu (int /*long*/ imHandle) {

38924

+void createIMMenu (long /*int*/ imHandle) {

38925

if (this.imHandle == imHandle) return;

38926

this.imHandle = imHandle;

38927

if (imHandle == 0) {

38928

@@ -325,7 +325,7 @@

38929

OS.gtk_widget_show (imItem);

38930

OS.gtk_menu_shell_insert (handle, imItem, -1);

38931

}

38932

- int /*long*/ imSubmenu = OS.gtk_menu_new ();

38933

+ long /*int*/ imSubmenu = OS.gtk_menu_new ();

38934

OS.gtk_im_multicontext_append_menuitems (imHandle, imSubmenu);

38935

OS.gtk_menu_item_set_submenu (imItem, imSubmenu);

38936

}

38937

@@ -351,7 +351,7 @@

38938

if (!OS.GTK_WIDGET_MAPPED (handle)) {

38939

return new Rectangle (0, 0, 0, 0);

38940

}

38941

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle);

38942

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle);

38943

int [] origin_x = new int [1], origin_y = new int [1];

38944

OS.gdk_window_get_origin (window, origin_x, origin_y);

38945

int x = origin_x [0] + OS.GTK_WIDGET_X (handle);

38946

@@ -415,13 +415,13 @@

38947

*/

38948

public MenuItem getItem (int index) {

38949

checkWidget();

38950

- int /*long*/ list = OS.gtk_container_get_children (handle);

38951

+ long /*int*/ list = OS.gtk_container_get_children (handle);

38952

if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);

38953

int count = OS.g_list_length (list);

38954

if (imSeparator != 0) count--;

38955

if (imItem != 0) count--;

38956

if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE);

38957

- int /*long*/ data = OS.g_list_nth_data (list, index);

38958

+ long /*int*/ data = OS.g_list_nth_data (list, index);

38959

OS.g_list_free (list);

38960

if (data == 0) error (SWT.ERROR_CANNOT_GET_ITEM);

38961

return (MenuItem) display.getWidget (data);

38962

@@ -439,7 +439,7 @@

38963

*/

38964

public int getItemCount () {

38965

checkWidget();

38966

- int /*long*/ list = OS.gtk_container_get_children (handle);

38967

+ long /*int*/ list = OS.gtk_container_get_children (handle);

38968

if (list == 0) return 0;

38969

int count = OS.g_list_length (list);

38970

OS.g_list_free (list);

38971

@@ -466,7 +466,7 @@

38972

*/

38973

public MenuItem [] getItems () {

38974

checkWidget();

38975

- int /*long*/ list = OS.gtk_container_get_children (handle);

38976

+ long /*int*/ list = OS.gtk_container_get_children (handle);

38977

if (list == 0) return new MenuItem [0];

38978

int count = OS.g_list_length (list);

38979

if (imSeparator != 0) count--;

38980

@@ -474,7 +474,7 @@

38981

MenuItem [] items = new MenuItem [count];

38982

int index = 0;

38983

for (int i=0; i<count; i++) {

38984

- int /*long*/ data = OS.g_list_nth_data (list, i);

38985

+ long /*int*/ data = OS.g_list_nth_data (list, i);

38986

MenuItem item = (MenuItem) display.getWidget (data);

38987

if (item != null) items [index++] = item;

38988

}

38989

@@ -600,7 +600,7 @@

38990

return OS.GTK_WIDGET_MAPPED (handle);

38991

}

38992

38993

-int /*long*/ gtk_hide (int /*long*/ widget) {

38994

+long /*int*/ gtk_hide (long /*int*/ widget) {

38995

if ((style & SWT.POP_UP) != 0) {

38996

if (display.activeShell != null) display.activeShell = getShell ();

38997

}

38998

@@ -619,7 +619,7 @@

38999

return 0;

39000

}

39001

39002

-int /*long*/ gtk_show (int /*long*/ widget) {

39003

+long /*int*/ gtk_show (long /*int*/ widget) {

39004

if ((style & SWT.POP_UP) != 0) {

39005

if (display.activeShell != null) display.activeShell = getShell ();

39006

return 0;

39007

@@ -629,7 +629,7 @@

39008

}

39009

39010

39011

-int /*long*/ gtk_show_help (int /*long*/ widget, int /*long*/ helpType) {

39012

+long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) {

39013

if (sendHelpEvent (helpType)) {

39014

OS.gtk_menu_shell_deactivate (handle);

39015

return 1;

39016

@@ -714,7 +714,7 @@

39017

return getVisible ();

39018

}

39019

39020

-int /*long*/ menuPositionProc (int /*long*/ menu, int /*long*/ x, int /*long*/ y, int /*long*/ push_in, int /*long*/ user_data) {

39021

+long /*int*/ menuPositionProc (long /*int*/ menu, long /*int*/ x, long /*int*/ y, long /*int*/ push_in, long /*int*/ user_data) {

39022

/*

39023

* Feature in GTK. The menu position function sets the position of the

39024

* top-left pixel of the menu. If the menu would be off-screen, GTK will

39025

@@ -802,7 +802,7 @@

39026

eventTable.unhook (SWT.Show, listener);

39027

}

39028

39029

-void removeAccelerators (int /*long*/ accelGroup) {

39030

+void removeAccelerators (long /*int*/ accelGroup) {

39031

MenuItem [] items = getItems ();

39032

for (int i = 0; i < items.length; i++) {

39033

MenuItem item = items[i];

39034

@@ -834,7 +834,7 @@

39035

eventTable.unhook (SWT.Help, listener);

39036

}

39037

39038

-boolean sendHelpEvent (int /*long*/ helpType) {

39039

+boolean sendHelpEvent (long /*int*/ helpType) {

39040

if (selectedItem != null && !selectedItem.isDisposed()) {

39041

if (selectedItem.hooks (SWT.Help)) {

39042

selectedItem.postEvent (SWT.Help);

39043

diff -urN x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/widgets/MessageBox.java

39044

--- x86/org/eclipse/swt/widgets/MessageBox.java 2009-05-29 17:30:04.000000000 -0400

39045

+++ x86_64/org/eclipse/swt/widgets/MessageBox.java 2009-09-17 08:48:24.000000000 -0400

39046

@@ -42,7 +42,7 @@

39047

public class MessageBox extends Dialog {

39048

39049

String message = "";

39050

- int /*long*/ handle;

39051

+ long /*int*/ handle;

39052

/**

39053

* Constructs a new instance of this class given only its parent.

39054

*

39055

@@ -141,7 +141,7 @@

39056

* </ul>

39057

*/

39058

public int open () {

39059

- int /*long*/ parentHandle = (parent != null) ? parent.topHandle() : 0;

39060

+ long /*int*/ parentHandle = (parent != null) ? parent.topHandle() : 0;

39061

int dialogFlags = OS.GTK_DIALOG_DESTROY_WITH_PARENT;

39062

if ((style & (SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL)) != 0) {

39063

dialogFlags |= OS.GTK_DIALOG_MODAL;

39064

@@ -155,7 +155,7 @@

39065

handle = OS.gtk_message_dialog_new(parentHandle, dialogFlags, messageType, 0, buffer);

39066

if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);

39067

if (parentHandle != 0) {

39068

- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (parentHandle);

39069

+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (parentHandle);

39070

if (pixbufs != 0) {

39071

OS.gtk_window_set_icon_list (handle, pixbufs);

39072

OS.g_list_free (pixbufs);

39073

@@ -172,7 +172,7 @@

39074

display.setModalDialog (this);

39075

}

39076

int signalId = 0;

39077

- int /*long*/ hookId = 0;

39078

+ long /*int*/ hookId = 0;

39079

if ((style & SWT.RIGHT_TO_LEFT) != 0) {

39080

signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());

39081

hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);

39082

diff -urN x86/org/eclipse/swt/widgets/Monitor.java x86_64/org/eclipse/swt/widgets/Monitor.java

39083

--- x86/org/eclipse/swt/widgets/Monitor.java 2008-06-05 13:32:00.000000000 -0400

39084

+++ x86_64/org/eclipse/swt/widgets/Monitor.java 2009-09-17 08:48:24.000000000 -0400

39085

@@ -22,7 +22,7 @@

39086

* @since 3.0

39087

*/

39088

public final class Monitor {

39089

- int /*long*/ handle;

39090

+ long /*int*/ handle;

39091

int x, y, width, height;

39092

int clientX, clientY, clientWidth, clientHeight;

39093

39094

diff -urN x86/org/eclipse/swt/widgets/ProgressBar.java x86_64/org/eclipse/swt/widgets/ProgressBar.java

39095

--- x86/org/eclipse/swt/widgets/ProgressBar.java 2009-05-29 17:30:04.000000000 -0400

39096

+++ x86_64/org/eclipse/swt/widgets/ProgressBar.java 2009-09-17 08:48:24.000000000 -0400

39097

@@ -162,8 +162,8 @@

39098

return SWT.NORMAL;

39099

}

39100

39101

-int /*long*/ gtk_realize (int /*long*/ widget) {

39102

- int /*long*/ result = super.gtk_realize (widget);

39103

+long /*int*/ gtk_realize (long /*int*/ widget) {

39104

+ long /*int*/ result = super.gtk_realize (widget);

39105

if (result != 0) return result;

39106

/*

39107

* Bug in GTK. When a progress bar has been unrealized after being

39108

@@ -272,7 +272,7 @@

39109

//NOT IMPLEMENTED

39110

}

39111

39112

-int /*long*/ timerProc (int /*long*/ widget) {

39113

+long /*int*/ timerProc (long /*int*/ widget) {

39114

if (isVisible ()) OS.gtk_progress_bar_pulse (handle);

39115

return 1;

39116

}

39117

@@ -295,7 +295,7 @@

39118

* but unexpected. The fix is to force all

39119

* outstanding redraws to be delivered.

39120

*/

39121

- int /*long*/ window = paintWindow ();

39122

+ long /*int*/ window = paintWindow ();

39123

OS.gdk_window_process_updates (window, false);

39124

OS.gdk_flush ();

39125

}

39126

diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sash.java

39127

--- x86/org/eclipse/swt/widgets/Sash.java 2009-05-29 17:30:04.000000000 -0400

39128

+++ x86_64/org/eclipse/swt/widgets/Sash.java 2009-09-17 08:48:24.000000000 -0400

39129

@@ -41,7 +41,7 @@

39130

public class Sash extends Control {

39131

boolean dragging;

39132

int startX, startY, lastX, lastY;

39133

- int /*long*/ defaultCursor;

39134

+ long /*int*/ defaultCursor;

39135

39136

private final static int INCREMENT = 1;

39137

private final static int PAGE_INCREMENT = 9;

39138

@@ -145,12 +145,12 @@

39139

39140

void drawBand (int x, int y, int width, int height) {

39141

if ((style & SWT.SMOOTH) != 0) return;

39142

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (parent.paintHandle());

39143

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (parent.paintHandle());

39144

if (window == 0) return;

39145

byte [] bits = {-86, 85, -86, 85, -86, 85, -86, 85};

39146

- int /*long*/ stipplePixmap = OS.gdk_bitmap_create_from_data (window, bits, 8, 8);

39147

- int /*long*/ gc = OS.gdk_gc_new (window);

39148

- int /*long*/ colormap = OS.gdk_colormap_get_system();

39149

+ long /*int*/ stipplePixmap = OS.gdk_bitmap_create_from_data (window, bits, 8, 8);

39150

+ long /*int*/ gc = OS.gdk_gc_new (window);

39151

+ long /*int*/ colormap = OS.gdk_colormap_get_system();

39152

GdkColor color = new GdkColor ();

39153

OS.gdk_color_white (colormap, color);

39154

OS.gdk_gc_set_foreground (gc, color);

39155

@@ -163,8 +163,8 @@

39156

OS.g_object_unref (gc);

39157

}

39158

39159

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) {

39160

- int /*long*/ result = super.gtk_button_press_event (widget, eventPtr);

39161

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) {

39162

+ long /*int*/ result = super.gtk_button_press_event (widget, eventPtr);

39163

if (result != 0) return result;

39164

GdkEventButton gdkEvent = new GdkEventButton ();

39165

OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);

39166

@@ -172,7 +172,7 @@

39167

if (button != 1) return 0;

39168

if (gdkEvent.type == OS.GDK_2BUTTON_PRESS) return 0;

39169

if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;

39170

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (widget);

39171

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (widget);

39172

int [] origin_x = new int [1], origin_y = new int [1];

39173

OS.gdk_window_get_origin (window, origin_x, origin_y);

39174

startX = (int) (gdkEvent.x_root - origin_x [0]);

39175

@@ -210,8 +210,8 @@

39176

return result;

39177

}

39178

39179

-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ eventPtr) {

39180

- int /*long*/ result = super.gtk_button_release_event (widget, eventPtr);

39181

+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ eventPtr) {

39182

+ long /*int*/ result = super.gtk_button_release_event (widget, eventPtr);

39183

if (result != 0) return result;

39184

GdkEventButton gdkEvent = new GdkEventButton ();

39185

OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);

39186

@@ -240,8 +240,8 @@

39187

return result;

39188

}

39189

39190

-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {

39191

- int /*long*/ result = super.gtk_focus_in_event (widget, event);

39192

+long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {

39193

+ long /*int*/ result = super.gtk_focus_in_event (widget, event);

39194

if (result != 0) return result;

39195

// widget could be disposed at this point

39196

if (handle != 0) {

39197

@@ -251,8 +251,8 @@

39198

return 0;

39199

}

39200

39201

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {

39202

- int /*long*/ result = super.gtk_key_press_event (widget, eventPtr);

39203

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) {

39204

+ long /*int*/ result = super.gtk_key_press_event (widget, eventPtr);

39205

if (result != 0) return result;

39206

GdkEventKey gdkEvent = new GdkEventKey ();

39207

OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);

39208

@@ -287,9 +287,9 @@

39209

if (newX == lastX && newY == lastY) return result;

39210

39211

/* Ensure that the pointer image does not change */

39212

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle);

39213

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle);

39214

int grabMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_RELEASE_MASK;

39215

- int /*long*/ gdkCursor = cursor != null ? cursor.handle : defaultCursor;

39216

+ long /*int*/ gdkCursor = cursor != null ? cursor.handle : defaultCursor;

39217

int ptrGrabResult = OS.gdk_pointer_grab (window, false, grabMask, window, gdkCursor, OS.GDK_CURRENT_TIME);

39218

39219

/* The event must be sent because its doit flag is used. */

39220

@@ -326,8 +326,8 @@

39221

return result;

39222

}

39223

39224

-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ eventPtr) {

39225

- int /*long*/ result = super.gtk_motion_notify_event (widget, eventPtr);

39226

+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ eventPtr) {

39227

+ long /*int*/ result = super.gtk_motion_notify_event (widget, eventPtr);

39228

if (result != 0) return result;

39229

if (!dragging) return 0;

39230

GdkEventMotion gdkEvent = new GdkEventMotion ();

39231

@@ -389,7 +389,7 @@

39232

return result;

39233

}

39234

39235

-int /*long*/ gtk_realize (int /*long*/ widget) {

39236

+long /*int*/ gtk_realize (long /*int*/ widget) {

39237

setCursor (cursor != null ? cursor.handle : 0);

39238

return super.gtk_realize (widget);

39239

}

39240

@@ -430,7 +430,7 @@

39241

eventTable.unhook (SWT.DefaultSelection,listener);

39242

}

39243

39244

-void setCursor (int /*long*/ cursor) {

39245

+void setCursor (long /*int*/ cursor) {

39246

super.setCursor (cursor != 0 ? cursor : defaultCursor);

39247

}

39248

39249

diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/Scale.java

39250

--- x86/org/eclipse/swt/widgets/Scale.java 2009-05-29 17:30:04.000000000 -0400

39251

+++ x86_64/org/eclipse/swt/widgets/Scale.java 2009-09-17 08:48:24.000000000 -0400

39252

@@ -127,7 +127,7 @@

39253

fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);

39254

if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);

39255

OS.gtk_fixed_set_has_window (fixedHandle, true);

39256

- int /*long*/ hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0);

39257

+ long /*int*/ hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0);

39258

if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES);

39259

if ((style & SWT.HORIZONTAL) != 0) {

39260

handle = OS.gtk_hscale_new (hAdjustment);

39261

@@ -159,7 +159,7 @@

39262

*/

39263

public int getIncrement () {

39264

checkWidget ();

39265

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39266

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39267

GtkAdjustment adjustment = new GtkAdjustment ();

39268

OS.memmove (adjustment, hAdjustment);

39269

return (int) adjustment.step_increment;

39270

@@ -177,7 +177,7 @@

39271

*/

39272

public int getMaximum () {

39273

checkWidget ();

39274

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39275

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39276

GtkAdjustment adjustment = new GtkAdjustment ();

39277

OS.memmove (adjustment, hAdjustment);

39278

return (int) adjustment.upper;

39279

@@ -195,7 +195,7 @@

39280

*/

39281

public int getMinimum () {

39282

checkWidget ();

39283

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39284

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39285

GtkAdjustment adjustment = new GtkAdjustment ();

39286

OS.memmove (adjustment, hAdjustment);

39287

return (int) adjustment.lower;

39288

@@ -215,7 +215,7 @@

39289

*/

39290

public int getPageIncrement () {

39291

checkWidget ();

39292

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39293

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39294

GtkAdjustment adjustment = new GtkAdjustment ();

39295

OS.memmove (adjustment, hAdjustment);

39296

return (int) adjustment.page_increment;

39297

@@ -233,13 +233,13 @@

39298

*/

39299

public int getSelection () {

39300

checkWidget ();

39301

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39302

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39303

GtkAdjustment adjustment = new GtkAdjustment ();

39304

OS.memmove (adjustment, hAdjustment);

39305

return (int) adjustment.value;

39306

}

39307

39308

-int /*long*/ gtk_value_changed (int /*long*/ adjustment) {

39309

+long /*int*/ gtk_value_changed (long /*int*/ adjustment) {

39310

postEvent (SWT.Selection);

39311

return 0;

39312

}

39313

diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/widgets/Scrollable.java

39314

--- x86/org/eclipse/swt/widgets/Scrollable.java 2009-05-29 17:30:04.000000000 -0400

39315

+++ x86_64/org/eclipse/swt/widgets/Scrollable.java 2009-09-17 08:48:24.000000000 -0400

39316

@@ -33,7 +33,7 @@

39317

* @noextend This class is not intended to be subclassed by clients.

39318

*/

39319

public abstract class Scrollable extends Control {

39320

- int /*long*/ scrolledHandle;

39321

+ long /*int*/ scrolledHandle;

39322

ScrollBar horizontalBar, verticalBar;

39323

39324

/**

39325

@@ -74,7 +74,7 @@

39326

super (parent, style);

39327

}

39328

39329

-int /*long*/ clientHandle () {

39330

+long /*int*/ clientHandle () {

39331

return handle;

39332

}

39333

39334

@@ -116,7 +116,7 @@

39335

trimWidth += vScrollBarWidth ();

39336

if (scrolledHandle != 0) {

39337

if (OS.gtk_scrolled_window_get_shadow_type (scrolledHandle) != OS.GTK_SHADOW_NONE) {

39338

- int /*long*/ style = OS.gtk_widget_get_style (scrolledHandle);

39339

+ long /*int*/ style = OS.gtk_widget_get_style (scrolledHandle);

39340

int xthickness = OS.gtk_style_get_xthickness (style);

39341

int ythickness = OS.gtk_style_get_ythickness (style);

39342

trimX -= xthickness;

39343

@@ -195,7 +195,7 @@

39344

public Rectangle getClientArea () {

39345

checkWidget ();

39346

forceResize ();

39347

- int /*long*/ clientHandle = clientHandle ();

39348

+ long /*int*/ clientHandle = clientHandle ();

39349

int x = OS.GTK_WIDGET_X (clientHandle);

39350

int y = OS.GTK_WIDGET_Y (clientHandle);

39351

int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);

39352

@@ -233,8 +233,8 @@

39353

return verticalBar;

39354

}

39355

39356

-int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ eventPtr) {

39357

- int /*long*/ result = super.gtk_scroll_event (widget, eventPtr);

39358

+long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ eventPtr) {

39359

+ long /*int*/ result = super.gtk_scroll_event (widget, eventPtr);

39360

39361

/*

39362

* Feature in GTK. Scrolled windows do not scroll if the scrollbars

39363

@@ -268,7 +268,7 @@

39364

39365

int hScrollBarWidth() {

39366

if (horizontalBar==null) return 0;

39367

- int /*long*/ hBarHandle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR(scrolledHandle);

39368

+ long /*int*/ hBarHandle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR(scrolledHandle);

39369

if (hBarHandle==0) return 0;

39370

GtkRequisition requisition = new GtkRequisition();

39371

OS.gtk_widget_size_request(hBarHandle, requisition);

39372

@@ -312,9 +312,9 @@

39373

super.redrawWidget (x, y, width, height, redrawAll, all, trim);

39374

if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) == 0) return;

39375

if (!trim) return;

39376

- int /*long*/ topHandle = topHandle (), paintHandle = paintHandle ();

39377

+ long /*int*/ topHandle = topHandle (), paintHandle = paintHandle ();

39378

if (topHandle == paintHandle) return;

39379

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topHandle);

39380

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topHandle);

39381

GdkRectangle rect = new GdkRectangle ();

39382

if (redrawAll) {

39383

rect.width = OS.GTK_WIDGET_WIDTH (topHandle);

39384

@@ -362,7 +362,7 @@

39385

if (scrolledHandle != 0) OS.gtk_widget_show (scrolledHandle);

39386

}

39387

39388

-int /*long*/ topHandle () {

39389

+long /*int*/ topHandle () {

39390

if (fixedHandle != 0) return fixedHandle;

39391

if (scrolledHandle != 0) return scrolledHandle;

39392

return super.topHandle ();

39393

@@ -374,7 +374,7 @@

39394

39395

int vScrollBarWidth() {

39396

if (verticalBar == null) return 0;

39397

- int /*long*/ vBarHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR(scrolledHandle);

39398

+ long /*int*/ vBarHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR(scrolledHandle);

39399

if (vBarHandle == 0) return 0;

39400

GtkRequisition requisition = new GtkRequisition();

39401

OS.gtk_widget_size_request (vBarHandle, requisition);

39402

diff -urN x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widgets/ScrollBar.java

39403

--- x86/org/eclipse/swt/widgets/ScrollBar.java 2009-05-29 17:30:04.000000000 -0400

39404

+++ x86_64/org/eclipse/swt/widgets/ScrollBar.java 2009-09-17 08:48:24.000000000 -0400

39405

@@ -84,7 +84,7 @@

39406

*/

39407

public class ScrollBar extends Widget {

39408

Scrollable parent;

39409

- int /*long*/ adjustmentHandle;

39410

+ long /*int*/ adjustmentHandle;

39411

int detail;

39412

boolean dragSent;

39413

39414

@@ -344,7 +344,7 @@

39415

*/

39416

public boolean getVisible () {

39417

checkWidget ();

39418

- int /*long*/ scrolledHandle = parent.scrolledHandle;

39419

+ long /*int*/ scrolledHandle = parent.scrolledHandle;

39420

int [] hsp = new int [1], vsp = new int [1];

39421

OS.gtk_scrolled_window_get_policy (scrolledHandle, hsp, vsp);

39422

if ((style & SWT.HORIZONTAL) != 0) {

39423

@@ -354,20 +354,20 @@

39424

}

39425

}

39426

39427

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) {

39428

- int /*long*/ result = super.gtk_button_press_event (widget, eventPtr);

39429

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) {

39430

+ long /*int*/ result = super.gtk_button_press_event (widget, eventPtr);

39431

if (result != 0) return result;

39432

detail = OS.GTK_SCROLL_NONE;

39433

dragSent = false;

39434

return result;

39435

}

39436

39437

-int /*long*/ gtk_change_value (int /*long*/ widget, int /*long*/ scroll, int /*long*/ value1, int /*long*/ value2) {

39438

+long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*int*/ value1, long /*int*/ value2) {

39439

detail = (int)/*64*/scroll;

39440

return 0;

39441

}

39442

39443

-int /*long*/ gtk_value_changed (int /*long*/ adjustment) {

39444

+long /*int*/ gtk_value_changed (long /*int*/ adjustment) {

39445

Event event = new Event ();

39446

dragSent = detail == OS.GTK_SCROLL_JUMP;

39447

switch (detail) {

39448

@@ -395,7 +395,7 @@

39449

return 0;

39450

}

39451

39452

-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {

39453

+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {

39454

GdkEvent gtkEvent = new GdkEvent ();

39455

OS.memmove (gtkEvent, gdkEvent, GdkEvent.sizeof);

39456

switch (gtkEvent.type) {

39457

diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/Shell.java

39458

--- x86/org/eclipse/swt/widgets/Shell.java 2009-05-29 17:30:04.000000000 -0400

39459

+++ x86_64/org/eclipse/swt/widgets/Shell.java 2009-09-17 08:48:24.000000000 -0400

39460

@@ -117,7 +117,7 @@

39461

* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>

39462

*/

39463

public class Shell extends Decorations {

39464

- int /*long*/ shellHandle, tooltipsHandle, tooltipWindow, group, modalGroup;

39465

+ long /*int*/ shellHandle, tooltipsHandle, tooltipWindow, group, modalGroup;

39466

boolean mapped, moved, resized, opened, fullScreen, showWithParent, modified, center;

39467

int oldX, oldY, oldWidth, oldHeight;

39468

int minWidth, minHeight;

39469

@@ -252,7 +252,7 @@

39470

this (display, null, style, 0, false);

39471

}

39472

39473

-Shell (Display display, Shell parent, int style, int /*long*/ handle, boolean embedded) {

39474

+Shell (Display display, Shell parent, int style, long /*int*/ handle, boolean embedded) {

39475

super ();

39476

checkSubclass ();

39477

if (display == null) display = Display.getCurrent ();

39478

@@ -356,7 +356,7 @@

39479

this (parent != null ? parent.display : null, parent, style, 0, false);

39480

}

39481

39482

-public static Shell gtk_new (Display display, int /*long*/ handle) {

39483

+public static Shell gtk_new (Display display, long /*int*/ handle) {

39484

return new Shell (display, null, SWT.NO_TRIM, handle, true);

39485

}

39486

39487

@@ -377,7 +377,7 @@

39488

*

39489

* @since 3.3

39490

*/

39491

-public static Shell internal_new (Display display, int /*long*/ handle) {

39492

+public static Shell internal_new (Display display, long /*int*/ handle) {

39493

return new Shell (display, null, SWT.NO_TRIM, handle, false);

39494

}

39495

39496

@@ -448,7 +448,7 @@

39497

if (display.ignoreTrim) return;

39498

int width = OS.GTK_WIDGET_WIDTH (shellHandle);

39499

int height = OS.GTK_WIDGET_HEIGHT (shellHandle);

39500

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle);

39501

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (shellHandle);

39502

GdkRectangle rect = new GdkRectangle ();

39503

OS.gdk_window_get_frame_extents (window, rect);

39504

int trimWidth = Math.max (0, rect.width - width);

39505

@@ -503,7 +503,7 @@

39506

if (!force) {

39507

if (activeShell == null) return;

39508

if (!display.activePending) {

39509

- int /*long*/ focusHandle = OS.gtk_window_get_focus (activeShell.shellHandle);

39510

+ long /*int*/ focusHandle = OS.gtk_window_get_focus (activeShell.shellHandle);

39511

if (focusHandle != 0 && !OS.GTK_WIDGET_HAS_FOCUS (focusHandle)) return;

39512

}

39513

}

39514

@@ -531,10 +531,10 @@

39515

* window. The fix is to use XSetInputFocus() to force

39516

* the focus.

39517

*/

39518

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle);

39519

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (shellHandle);

39520

if ((xFocus || (style & SWT.ON_TOP) != 0) && OS.GDK_WINDOWING_X11 ()) {

39521

- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);

39522

- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window);

39523

+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);

39524

+ long /*int*/ xWindow = OS.gdk_x11_drawable_get_xid (window);

39525

OS.gdk_error_trap_push ();

39526

/* Use CurrentTime instead of the last event time to ensure that the shell becomes active */

39527

OS.XSetInputFocus (xDisplay, xWindow, OS.RevertToParent, OS.CurrentTime);

39528

@@ -584,7 +584,7 @@

39529

if (!opened) resized = false;

39530

}

39531

39532

-int /*long*/ childStyle () {

39533

+long /*int*/ childStyle () {

39534

return 0;

39535

}

39536

39537

@@ -682,7 +682,7 @@

39538

} else {

39539

vboxHandle = OS.gtk_bin_get_child (shellHandle);

39540

if (vboxHandle == 0) error (SWT.ERROR_NO_HANDLES);

39541

- int /*long*/ children = OS.gtk_container_get_children (vboxHandle);

39542

+ long /*int*/ children = OS.gtk_container_get_children (vboxHandle);

39543

if (OS.g_list_length (children) > 0) {

39544

scrolledHandle = OS.g_list_data (children);

39545

}

39546

@@ -702,7 +702,7 @@

39547

OS.gtk_widget_realize (shellHandle);

39548

}

39549

39550

-int /*long*/ filterProc (int /*long*/ xEvent, int /*long*/ gdkEvent, int /*long*/ data2) {

39551

+long /*int*/ filterProc (long /*int*/ xEvent, long /*int*/ gdkEvent, long /*int*/ data2) {

39552

int eventType = OS.X_EVENT_TYPE (xEvent);

39553

if (eventType != OS.FocusOut && eventType != OS.FocusIn) return 0;

39554

XFocusChangeEvent xFocusEvent = new XFocusChangeEvent();

39555

@@ -766,7 +766,7 @@

39556

OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [MAP_EVENT], 0, display.shellMapProcClosure, false);

39557

OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.closures [ENTER_NOTIFY_EVENT], false);

39558

OS.g_signal_connect_closure (shellHandle, OS.move_focus, display.closures [MOVE_FOCUS], false);

39559

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle);

39560

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (shellHandle);

39561

OS.gdk_window_add_filter (window, display.filterProc, shellHandle);

39562

}

39563

39564

@@ -795,7 +795,7 @@

39565

/* Do nothing */

39566

}

39567

39568

-int /*long*/ topHandle () {

39569

+long /*int*/ topHandle () {

39570

return shellHandle;

39571

}

39572

39573

@@ -826,15 +826,15 @@

39574

}

39575

}

39576

39577

-int /*long*/ fixedSizeAllocateProc(int /*long*/ widget, int /*long*/ allocationPtr) {

39578

+long /*int*/ fixedSizeAllocateProc(long /*int*/ widget, long /*int*/ allocationPtr) {

39579

int clientWidth = 0;

39580

if ((style & SWT.MIRRORED) != 0) clientWidth = getClientWidth ();

39581

- int /*long*/ result = super.fixedSizeAllocateProc (widget, allocationPtr);

39582

+ long /*int*/ result = super.fixedSizeAllocateProc (widget, allocationPtr);

39583

if ((style & SWT.MIRRORED) != 0) moveChildren (clientWidth);

39584

return result;

39585

}

39586

39587

-void fixStyle (int /*long*/ handle) {

39588

+void fixStyle (long /*int*/ handle) {

39589

}

39590

39591

void forceResize () {

39592

@@ -1070,7 +1070,7 @@

39593

return result;

39594

}

39595

39596

-int /*long*/ gtk_configure_event (int /*long*/ widget, int /*long*/ event) {

39597

+long /*int*/ gtk_configure_event (long /*int*/ widget, long /*int*/ event) {

39598

int [] x = new int [1], y = new int [1];

39599

OS.gtk_window_get_position (shellHandle, x, y);

39600

if (!moved || oldX != x [0] || oldY != y [0]) {

39601

@@ -1083,19 +1083,19 @@

39602

return 0;

39603

}

39604

39605

-int /*long*/ gtk_delete_event (int /*long*/ widget, int /*long*/ event) {

39606

+long /*int*/ gtk_delete_event (long /*int*/ widget, long /*int*/ event) {

39607

if (isEnabled()) closeWidget ();

39608

return 1;

39609

}

39610

39611

-int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {

39612

+long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {

39613

if (widget != shellHandle) {

39614

return super.gtk_enter_notify_event (widget, event);

39615

}

39616

return 0;

39617

}

39618

39619

-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) {

39620

+long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) {

39621

switch ((int)/*64*/directionType) {

39622

case OS.GTK_DIR_TAB_FORWARD:

39623

case OS.GTK_DIR_TAB_BACKWARD:

39624

@@ -1112,17 +1112,17 @@

39625

return super.gtk_focus (widget, directionType);

39626

}

39627

39628

-int /*long*/ gtk_move_focus (int /*long*/ widget, int /*long*/ directionType) {

39629

+long /*int*/ gtk_move_focus (long /*int*/ widget, long /*int*/ directionType) {

39630

Control control = display.getFocusControl ();

39631

if (control != null) {

39632

- int /*long*/ focusHandle = control.focusHandle ();

39633

+ long /*int*/ focusHandle = control.focusHandle ();

39634

OS.gtk_widget_child_focus (focusHandle, (int)/*64*/directionType);

39635

}

39636

OS.g_signal_stop_emission_by_name (shellHandle, OS.move_focus);

39637

return 1;

39638

}

39639

39640

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {

39641

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {

39642

/* Stop menu mnemonics when the shell is disabled */

39643

if (widget == shellHandle) {

39644

return (state & DISABLED) != 0 ? 1 : 0;

39645

@@ -1130,7 +1130,7 @@

39646

return super.gtk_key_press_event (widget, event);

39647

}

39648

39649

-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {

39650

+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {

39651

int width = OS.GTK_WIDGET_WIDTH (shellHandle);

39652

int height = OS.GTK_WIDGET_HEIGHT (shellHandle);

39653

if (!resized || oldWidth != width || oldHeight != height) {

39654

@@ -1141,9 +1141,9 @@

39655

return 0;

39656

}

39657

39658

-int /*long*/ gtk_realize (int /*long*/ widget) {

39659

- int /*long*/ result = super.gtk_realize (widget);

39660

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle);

39661

+long /*int*/ gtk_realize (long /*int*/ widget) {

39662

+ long /*int*/ result = super.gtk_realize (widget);

39663

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (shellHandle);

39664

if ((style & SWT.SHELL_TRIM) != SWT.SHELL_TRIM) {

39665

int decorations = 0;

39666

if ((style & SWT.NO_TRIM) == 0) {

39667

@@ -1169,7 +1169,7 @@

39668

return result;

39669

}

39670

39671

-int /*long*/ gtk_window_state_event (int /*long*/ widget, int /*long*/ event) {

39672

+long /*int*/ gtk_window_state_event (long /*int*/ widget, long /*int*/ event) {

39673

GdkEventWindowState gdkEvent = new GdkEventWindowState ();

39674

OS.memmove (gdkEvent, event, GdkEventWindowState.sizeof);

39675

minimized = (gdkEvent.new_window_state & OS.GDK_WINDOW_STATE_ICONIFIED) != 0;

39676

@@ -1418,13 +1418,13 @@

39677

return result;

39678

}

39679

39680

-void setCursor (int /*long*/ cursor) {

39681

+void setCursor (long /*int*/ cursor) {

39682

if (enableWindow != 0) {

39683

OS.gdk_window_set_cursor (enableWindow, cursor);

39684

if (!OS.GDK_WINDOWING_X11 ()) {

39685

OS.gdk_flush ();

39686

} else {

39687

- int /*long*/ xDisplay = OS.GDK_DISPLAY ();

39688

+ long /*int*/ xDisplay = OS.GDK_DISPLAY ();

39689

OS.XFlush (xDisplay);

39690

}

39691

}

39692

@@ -1457,9 +1457,9 @@

39693

enableWindow = 0;

39694

}

39695

} else {

39696

- int /*long*/ parentHandle = shellHandle;

39697

+ long /*int*/ parentHandle = shellHandle;

39698

OS.gtk_widget_realize (parentHandle);

39699

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (parentHandle);

39700

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (parentHandle);

39701

Rectangle rect = getBounds ();

39702

GdkWindowAttr attributes = new GdkWindowAttr ();

39703

attributes.width = rect.width;

39704

@@ -1474,7 +1474,7 @@

39705

if (!OS.GDK_WINDOWING_X11 ()) {

39706

OS.gdk_flush ();

39707

} else {

39708

- int /*long*/ xDisplay = OS.GDK_DISPLAY ();

39709

+ long /*int*/ xDisplay = OS.GDK_DISPLAY ();

39710

OS.XFlush (xDisplay);

39711

}

39712

}

39713

@@ -1548,7 +1548,7 @@

39714

if ((state & FOREIGN_HANDLE) != 0) return;

39715

int width = OS.gdk_screen_width () * 5 / 8;

39716

int height = OS.gdk_screen_height () * 5 / 8;

39717

- int /*long*/ screen = OS.gdk_screen_get_default ();

39718

+ long /*int*/ screen = OS.gdk_screen_get_default ();

39719

if (screen != 0) {

39720

if (OS.gdk_screen_get_n_monitors (screen) > 1) {

39721

int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, paintWindow ());

39722

@@ -1583,13 +1583,13 @@

39723

if (menu.parent != this) error (SWT.ERROR_INVALID_PARENT);

39724

}

39725

if (menuBar != null) {

39726

- int /*long*/ menuHandle = menuBar.handle;

39727

+ long /*int*/ menuHandle = menuBar.handle;

39728

OS.gtk_widget_hide (menuHandle);

39729

destroyAccelGroup ();

39730

}

39731

menuBar = menu;

39732

if (menuBar != null) {

39733

- int /*long*/ menuHandle = menu.handle;

39734

+ long /*int*/ menuHandle = menu.handle;

39735

OS.gtk_widget_show (menuHandle);

39736

createAccelGroup ();

39737

menuBar.addAccelerators (accelGroup);

39738

@@ -1835,7 +1835,7 @@

39739

if (mapped) setZOrder (sibling, above, false, false);

39740

}

39741

39742

-int /*long*/ shellMapProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {

39743

+long /*int*/ shellMapProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {

39744

mapped = true;

39745

display.dispatchEvents = null;

39746

return 0;

39747

@@ -1849,12 +1849,12 @@

39748

if (vboxHandle != 0) OS.gtk_widget_show (vboxHandle);

39749

}

39750

39751

-int /*long*/ sizeAllocateProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {

39752

+long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {

39753

int offset = 16;

39754

int [] x = new int [1], y = new int [1];

39755

OS.gdk_window_get_pointer (0, x, y, null);

39756

y [0] += offset;

39757

- int /*long*/ screen = OS.gdk_screen_get_default ();

39758

+ long /*int*/ screen = OS.gdk_screen_get_default ();

39759

if (screen != 0) {

39760

int monitorNumber = OS.gdk_screen_get_monitor_at_point (screen, x[0], y[0]);

39761

GdkRectangle dest = new GdkRectangle ();

39762

@@ -1872,7 +1872,7 @@

39763

return 0;

39764

}

39765

39766

-int /*long*/ sizeRequestProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {

39767

+long /*int*/ sizeRequestProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {

39768

OS.gtk_widget_hide (handle);

39769

return 0;

39770

}

39771

@@ -1918,7 +1918,7 @@

39772

}

39773

39774

void updateModal () {

39775

- int /*long*/ group = 0;

39776

+ long /*int*/ group = 0;

39777

if (display.getModalDialog () == null) {

39778

Shell modal = getModalShell ();

39779

int mask = SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL;

39780

@@ -2072,16 +2072,16 @@

39781

tooltipsHandle = 0;

39782

if (group != 0) OS.g_object_unref (group);

39783

group = modalGroup = 0;

39784

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle);

39785

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (shellHandle);

39786

OS.gdk_window_remove_filter(window, display.filterProc, shellHandle);

39787

lastActive = null;

39788

}

39789

39790

-void setToolTipText (int /*long*/ tipWidget, String string) {

39791

+void setToolTipText (long /*int*/ tipWidget, String string) {

39792

setToolTipText (tipWidget, tipWidget, string);

39793

}

39794

39795

-void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String string) {

39796

+void setToolTipText (long /*int*/ rootWidget, long /*int*/ tipWidget, String string) {

39797

if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0)) {

39798

byte [] buffer = null;

39799

if (string != null && string.length () > 0) {

39800

@@ -2097,12 +2097,12 @@

39801

* 2 fake GDK_MOTION_NOTIFY events (to mimic the GTK call) which

39802

* contain the proper x and y coordinates.

39803

*/

39804

- int /*long*/ eventPtr = 0;

39805

- int /*long*/ tipWindow = OS.GTK_WIDGET_WINDOW (rootWidget);

39806

+ long /*int*/ eventPtr = 0;

39807

+ long /*int*/ tipWindow = OS.GTK_WIDGET_WINDOW (rootWidget);

39808

if (tipWindow != 0) {

39809

int [] x = new int [1], y = new int [1];

39810

- int /*long*/ window = OS.gdk_window_at_pointer (x, y);

39811

- int /*long*/ [] user_data = new int /*long*/ [1];

39812

+ long /*int*/ window = OS.gdk_window_at_pointer (x, y);

39813

+ long /*int*/ [] user_data = new long /*int*/ [1];

39814

if (window != 0) OS.gdk_window_get_user_data (window, user_data);

39815

if (tipWidget == user_data [0]) {

39816

eventPtr = OS.gdk_event_new (OS.GDK_MOTION_NOTIFY);

39817

@@ -2148,7 +2148,7 @@

39818

if (OS.GTK_VERSION >= OS.VERSION (2, 2, 1)) {

39819

OS.gtk_tooltips_force_window (tooltipsHandle);

39820

}

39821

- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (tooltipsHandle);

39822

+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (tooltipsHandle);

39823

if (tipWindow != 0 && tipWindow != tooltipWindow) {

39824

OS.g_signal_connect (tipWindow, OS.size_allocate, display.sizeAllocateProc, shellHandle);

39825

tooltipWindow = tipWindow;

39826

@@ -2164,9 +2164,9 @@

39827

if (tipWindow != 0) {

39828

if ((OS.GTK_WIDGET_FLAGS (tipWidget) & (OS.GTK_REALIZED | OS.GTK_VISIBLE)) != 0) {

39829

int [] x = new int [1], y = new int [1];

39830

- int /*long*/ window = OS.gdk_window_at_pointer (x, y);

39831

+ long /*int*/ window = OS.gdk_window_at_pointer (x, y);

39832

if (window != 0) {

39833

- int /*long*/ [] user_data = new int /*long*/ [1];

39834

+ long /*int*/ [] user_data = new long /*int*/ [1];

39835

OS.gdk_window_get_user_data (window, user_data);

39836

if (tipWidget == user_data [0]) {

39837

/*

39838

@@ -2180,7 +2180,7 @@

39839

int handler_id = OS.g_signal_connect (tipWindow, OS.size_request, display.sizeRequestProc, shellHandle);

39840

OS.gtk_tooltips_set_tip (tooltipsHandle, tipWidget, buffer, null);

39841

OS.gtk_widget_hide (tipWindow);

39842

- int /*long*/ data = OS.gtk_tooltips_data_get (tipWidget);

39843

+ long /*int*/ data = OS.gtk_tooltips_data_get (tipWidget);

39844

OS.GTK_TOOLTIPS_SET_ACTIVE (tooltipsHandle, data);

39845

OS.gtk_tooltips_set_tip (tooltipsHandle, tipWidget, buffer, null);

39846

if (handler_id != 0) OS.g_signal_handler_disconnect (tipWindow, handler_id);

39847

diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/Slider.java

39848

--- x86/org/eclipse/swt/widgets/Slider.java 2009-05-29 17:30:04.000000000 -0400

39849

+++ x86_64/org/eclipse/swt/widgets/Slider.java 2009-09-17 08:48:24.000000000 -0400

39850

@@ -153,7 +153,7 @@

39851

fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);

39852

if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);

39853

OS.gtk_fixed_set_has_window (fixedHandle, true);

39854

- int /*long*/ hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);

39855

+ long /*int*/ hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);

39856

if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES);

39857

if ((style & SWT.HORIZONTAL) != 0) {

39858

handle = OS.gtk_hscrollbar_new (hAdjustment);

39859

@@ -175,20 +175,20 @@

39860

OS.gtk_container_add (fixedHandle, handle);

39861

}

39862

39863

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) {

39864

- int /*long*/ result = super.gtk_button_press_event (widget, eventPtr);

39865

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) {

39866

+ long /*int*/ result = super.gtk_button_press_event (widget, eventPtr);

39867

if (result != 0) return result;

39868

detail = OS.GTK_SCROLL_NONE;

39869

dragSent = false;

39870

return result;

39871

}

39872

39873

-int /*long*/ gtk_change_value (int /*long*/ widget, int /*long*/ scroll, int /*long*/ value1, int /*long*/ value2) {

39874

+long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*int*/ value1, long /*int*/ value2) {

39875

detail = (int)/*64*/scroll;

39876

return 0;

39877

}

39878

39879

-int /*long*/ gtk_value_changed (int /*long*/ adjustment) {

39880

+long /*int*/ gtk_value_changed (long /*int*/ adjustment) {

39881

Event event = new Event ();

39882

dragSent = detail == OS.GTK_SCROLL_JUMP;

39883

switch (detail) {

39884

@@ -214,7 +214,7 @@

39885

return 0;

39886

}

39887

39888

-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {

39889

+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {

39890

GdkEvent gtkEvent = new GdkEvent ();

39891

OS.memmove (gtkEvent, gdkEvent, GdkEvent.sizeof);

39892

switch (gtkEvent.type) {

39893

@@ -247,13 +247,13 @@

39894

39895

void register () {

39896

super.register ();

39897

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39898

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39899

display.addWidget (hAdjustment, this);

39900

}

39901

39902

void deregister () {

39903

super.deregister ();

39904

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39905

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39906

display.removeWidget (hAdjustment);

39907

}

39908

39909

@@ -284,7 +284,7 @@

39910

*/

39911

public int getIncrement () {

39912

checkWidget ();

39913

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39914

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39915

GtkAdjustment adjustment = new GtkAdjustment ();

39916

OS.memmove (adjustment, hAdjustment);

39917

return (int) adjustment.step_increment;

39918

@@ -302,7 +302,7 @@

39919

*/

39920

public int getMaximum () {

39921

checkWidget ();

39922

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39923

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39924

GtkAdjustment adjustment = new GtkAdjustment ();

39925

OS.memmove (adjustment, hAdjustment);

39926

return (int) adjustment.upper;

39927

@@ -320,7 +320,7 @@

39928

*/

39929

public int getMinimum () {

39930

checkWidget ();

39931

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39932

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39933

GtkAdjustment adjustment = new GtkAdjustment ();

39934

OS.memmove (adjustment, hAdjustment);

39935

return (int) adjustment.lower;

39936

@@ -340,7 +340,7 @@

39937

*/

39938

public int getPageIncrement () {

39939

checkWidget ();

39940

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39941

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39942

GtkAdjustment adjustment = new GtkAdjustment ();

39943

OS.memmove (adjustment, hAdjustment);

39944

return (int) adjustment.page_increment;

39945

@@ -358,7 +358,7 @@

39946

*/

39947

public int getSelection () {

39948

checkWidget ();

39949

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39950

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39951

GtkAdjustment adjustment = new GtkAdjustment ();

39952

OS.memmove (adjustment, hAdjustment);

39953

return (int) adjustment.value;

39954

@@ -377,7 +377,7 @@

39955

*/

39956

public int getThumb () {

39957

checkWidget ();

39958

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39959

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39960

GtkAdjustment adjustment = new GtkAdjustment ();

39961

OS.memmove (adjustment, hAdjustment);

39962

return (int) adjustment.page_size;

39963

@@ -444,7 +444,7 @@

39964

*/

39965

public void setMaximum (int value) {

39966

checkWidget ();

39967

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39968

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39969

GtkAdjustment adjustment = new GtkAdjustment ();

39970

OS.memmove (adjustment, hAdjustment);

39971

int minimum = (int) adjustment.lower;

39972

@@ -474,7 +474,7 @@

39973

public void setMinimum (int value) {

39974

checkWidget ();

39975

if (value < 0) return;

39976

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39977

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39978

GtkAdjustment adjustment = new GtkAdjustment ();

39979

OS.memmove (adjustment, hAdjustment);

39980

int maximum = (int) adjustment.upper;

39981

@@ -554,7 +554,7 @@

39982

public void setThumb (int value) {

39983

checkWidget ();

39984

if (value < 1) return;

39985

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39986

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39987

GtkAdjustment adjustment = new GtkAdjustment ();

39988

OS.memmove (adjustment, hAdjustment);

39989

value = (int) Math.min (value, (int)(adjustment.upper - adjustment.lower));

39990

@@ -595,7 +595,7 @@

39991

if (increment < 1) return;

39992

if (pageIncrement < 1) return;

39993

thumb = Math.min (thumb, maximum - minimum);

39994

- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39995

+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);

39996

GtkAdjustment adjustment = new GtkAdjustment ();

39997

OS.memmove (adjustment, hAdjustment);

39998

adjustment.value = Math.min (Math.max (selection, minimum), maximum - thumb);

39999

diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets/Spinner.java

40000

--- x86/org/eclipse/swt/widgets/Spinner.java 2009-05-29 17:30:04.000000000 -0400

40001

+++ x86_64/org/eclipse/swt/widgets/Spinner.java 2009-09-17 08:48:24.000000000 -0400

40002

@@ -45,7 +45,7 @@

40003

public class Spinner extends Composite {

40004

static final int MIN_ARROW_WIDTH = 6;

40005

int lastEventTime = 0;

40006

- int /*long*/ gdkEventKey = 0;

40007

+ long /*int*/ gdkEventKey = 0;

40008

int fixStart = -1, fixEnd = -1;

40009

40010

/**

40011

@@ -202,8 +202,8 @@

40012

if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;

40013

int[] w = new int [1], h = new int [1];

40014

OS.gtk_widget_realize (handle);

40015

- int /*long*/ layout = OS.gtk_entry_get_layout (handle);

40016

- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40017

+ long /*int*/ layout = OS.gtk_entry_get_layout (handle);

40018

+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40019

GtkAdjustment adjustment = new GtkAdjustment ();

40020

OS.memmove (adjustment, hAdjustment);

40021

int digits = OS.gtk_spin_button_get_digits (handle);

40022

@@ -221,7 +221,7 @@

40023

string = buffer.toString ();

40024

}

40025

byte [] buffer1 = Converter.wcsToMbcs (null, string, false);

40026

- int /*long*/ ptr = OS.pango_layout_get_text (layout);

40027

+ long /*int*/ ptr = OS.pango_layout_get_text (layout);

40028

int length = OS.strlen (ptr);

40029

byte [] buffer2 = new byte [length];

40030

OS.memmove (buffer2, ptr, length);

40031

@@ -239,7 +239,7 @@

40032

public Rectangle computeTrim (int x, int y, int width, int height) {

40033

checkWidget ();

40034

int xborder = 0, yborder = 0;

40035

- int /*long*/ style = OS.gtk_widget_get_style (handle);

40036

+ long /*int*/ style = OS.gtk_widget_get_style (handle);

40037

if ((this.style & SWT.BORDER) != 0) {

40038

xborder += OS.gtk_style_get_xthickness (style);

40039

yborder += OS.gtk_style_get_ythickness (style);

40040

@@ -251,7 +251,7 @@

40041

xborder += property [0];

40042

yborder += property [0];

40043

}

40044

- int /*long*/ fontDesc = OS.gtk_style_get_font_desc (style);

40045

+ long /*int*/ fontDesc = OS.gtk_style_get_font_desc (style);

40046

int fontSize = OS.pango_font_description_get_size (fontDesc);

40047

int arrowSize = Math.max (OS.PANGO_PIXELS (fontSize), MIN_ARROW_WIDTH);

40048

arrowSize = arrowSize - arrowSize % 2;

40049

@@ -290,7 +290,7 @@

40050

fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);

40051

if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);

40052

OS.gtk_fixed_set_has_window (fixedHandle, true);

40053

- int /*long*/ adjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0);

40054

+ long /*int*/ adjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0);

40055

if (adjustment == 0) error (SWT.ERROR_NO_HANDLES);

40056

handle = OS.gtk_spin_button_new (adjustment, 1, 0);

40057

if (handle == 0) error (SWT.ERROR_NO_HANDLES);

40058

@@ -319,23 +319,23 @@

40059

40060

void deregister () {

40061

super.deregister ();

40062

- int /*long*/ imContext = imContext ();

40063

+ long /*int*/ imContext = imContext ();

40064

if (imContext != 0) display.removeWidget (imContext);

40065

}

40066

40067

-int /*long*/ eventWindow () {

40068

+long /*int*/ eventWindow () {

40069

return paintWindow ();

40070

}

40071

40072

-int /*long*/ enterExitHandle () {

40073

+long /*int*/ enterExitHandle () {

40074

return fixedHandle;

40075

}

40076

40077

-boolean filterKey (int keyval, int /*long*/ event) {

40078

+boolean filterKey (int keyval, long /*int*/ event) {

40079

int time = OS.gdk_event_get_time (event);

40080

if (time != lastEventTime) {

40081

lastEventTime = time;

40082

- int /*long*/ imContext = imContext ();

40083

+ long /*int*/ imContext = imContext ();

40084

if (imContext != 0) {

40085

return OS.gtk_im_context_filter_keypress (imContext, event);

40086

}

40087

@@ -354,7 +354,7 @@

40088

* filter has to be called by SWT.

40089

*/

40090

if (gdkEventKey != 0 && gdkEventKey != -1) {

40091

- int /*long*/ imContext = imContext ();

40092

+ long /*int*/ imContext = imContext ();

40093

if (imContext != 0) {

40094

OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);

40095

gdkEventKey = -1;

40096

@@ -370,7 +370,7 @@

40097

40098

public int getBorderWidth () {

40099

checkWidget();

40100

- int /*long*/ style = OS.gtk_widget_get_style (handle);

40101

+ long /*int*/ style = OS.gtk_widget_get_style (handle);

40102

if ((this.style & SWT.BORDER) != 0) {

40103

return OS.gtk_style_get_xthickness (style);

40104

}

40105

@@ -394,7 +394,7 @@

40106

*/

40107

public int getIncrement () {

40108

checkWidget ();

40109

- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40110

+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40111

GtkAdjustment adjustment = new GtkAdjustment ();

40112

OS.memmove (adjustment, hAdjustment);

40113

int digits = OS.gtk_spin_button_get_digits (handle);

40114

@@ -415,7 +415,7 @@

40115

*/

40116

public int getMaximum () {

40117

checkWidget ();

40118

- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40119

+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40120

GtkAdjustment adjustment = new GtkAdjustment ();

40121

OS.memmove (adjustment, hAdjustment);

40122

int digits = OS.gtk_spin_button_get_digits (handle);

40123

@@ -436,7 +436,7 @@

40124

*/

40125

public int getMinimum () {

40126

checkWidget ();

40127

- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40128

+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40129

GtkAdjustment adjustment = new GtkAdjustment ();

40130

OS.memmove (adjustment, hAdjustment);

40131

int digits = OS.gtk_spin_button_get_digits (handle);

40132

@@ -458,7 +458,7 @@

40133

*/

40134

public int getPageIncrement () {

40135

checkWidget ();

40136

- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40137

+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40138

GtkAdjustment adjustment = new GtkAdjustment ();

40139

OS.memmove (adjustment, hAdjustment);

40140

int digits = OS.gtk_spin_button_get_digits (handle);

40141

@@ -479,7 +479,7 @@

40142

*/

40143

public int getSelection () {

40144

checkWidget ();

40145

- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40146

+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40147

GtkAdjustment adjustment = new GtkAdjustment ();

40148

OS.memmove (adjustment, hAdjustment);

40149

int digits = OS.gtk_spin_button_get_digits (handle);

40150

@@ -504,7 +504,7 @@

40151

*/

40152

public String getText () {

40153

checkWidget ();

40154

- int /*long*/ str = OS.gtk_entry_get_text (handle);

40155

+ long /*int*/ str = OS.gtk_entry_get_text (handle);

40156

if (str == 0) return "";

40157

int length = OS.strlen (str);

40158

byte [] buffer = new byte [length];

40159

@@ -551,26 +551,26 @@

40160

}

40161

40162

String getDecimalSeparator () {

40163

- int /*long*/ ptr = OS.localeconv_decimal_point ();

40164

+ long /*int*/ ptr = OS.localeconv_decimal_point ();

40165

int length = OS.strlen (ptr);

40166

byte [] buffer = new byte [length];

40167

OS.memmove (buffer, ptr, length);

40168

return new String (Converter.mbcsToWcs (null, buffer));

40169

}

40170

40171

-int /*long*/ gtk_activate (int /*long*/ widget) {

40172

+long /*int*/ gtk_activate (long /*int*/ widget) {

40173

postEvent (SWT.DefaultSelection);

40174

return 0;

40175

}

40176

40177

-int /*long*/ gtk_changed (int /*long*/ widget) {

40178

- int /*long*/ str = OS.gtk_entry_get_text (handle);

40179

+long /*int*/ gtk_changed (long /*int*/ widget) {

40180

+ long /*int*/ str = OS.gtk_entry_get_text (handle);

40181

int length = OS.strlen (str);

40182

if (length > 0) {

40183

- int /*long*/ [] endptr = new int /*long*/ [1];

40184

+ long /*int*/ [] endptr = new long /*int*/ [1];

40185

double value = OS.g_strtod (str, endptr);

40186

if (endptr [0] == str + length) {

40187

- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40188

+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40189

GtkAdjustment adjustment = new GtkAdjustment ();

40190

OS.memmove (adjustment, hAdjustment);

40191

if (value != adjustment.value && adjustment.lower <= value && value <= adjustment.upper) {

40192

@@ -587,7 +587,7 @@

40193

* is to post the modify event when the user is typing.

40194

*/

40195

boolean keyPress = false;

40196

- int /*long*/ eventPtr = OS.gtk_get_current_event ();

40197

+ long /*int*/ eventPtr = OS.gtk_get_current_event ();

40198

if (eventPtr != 0) {

40199

GdkEventKey gdkEvent = new GdkEventKey ();

40200

OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);

40201

@@ -606,7 +606,7 @@

40202

return 0;

40203

}

40204

40205

-int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) {

40206

+long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {

40207

if (text == 0) return 0;

40208

if (!OS.gtk_editable_get_editable (handle)) return 0;

40209

int length = OS.strlen (text);

40210

@@ -644,7 +644,7 @@

40211

return 0;

40212

}

40213

40214

-int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /*long*/ end_pos) {

40215

+long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) {

40216

if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;

40217

String newText = verifyText ("", (int)/*64*/start_pos, (int)/*64*/end_pos);

40218

if (newText == null) {

40219

@@ -665,17 +665,17 @@

40220

return 0;

40221

}

40222

40223

-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {

40224

+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {

40225

if (cursor != null) setCursor (cursor.handle);

40226

return super.gtk_event_after (widget, gdkEvent);

40227

}

40228

40229

-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {

40230

+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {

40231

fixIM ();

40232

return super.gtk_focus_out_event (widget, event);

40233

}

40234

40235

-int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*long*/ new_text_length, int /*long*/ position) {

40236

+long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /*int*/ new_text_length, long /*int*/ position) {

40237

// if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;

40238

if (new_text == 0 || new_text_length == 0) return 0;

40239

byte [] buffer = new byte [(int)/*64*/new_text_length];

40240

@@ -684,7 +684,7 @@

40241

int [] pos = new int [1];

40242

OS.memmove (pos, position, 4);

40243

if (pos [0] == -1) {

40244

- int /*long*/ ptr = OS.gtk_entry_get_text (handle);

40245

+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);

40246

pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);

40247

}

40248

String newText = verifyText (oldText, pos [0], pos [0]);

40249

@@ -716,15 +716,15 @@

40250

return 0;

40251

}

40252

40253

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {

40254

- int /*long*/ result = super.gtk_key_press_event (widget, event);

40255

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {

40256

+ long /*int*/ result = super.gtk_key_press_event (widget, event);

40257

if (result != 0) fixIM ();

40258

if (gdkEventKey == -1) result = 1;

40259

gdkEventKey = 0;

40260

return result;

40261

}

40262

40263

-int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) {

40264

+long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) {

40265

if ((style & SWT.RIGHT_TO_LEFT) != 0) {

40266

OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);

40267

OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);

40268

@@ -732,7 +732,7 @@

40269

return 0;

40270

}

40271

40272

-int /*long*/ gtk_value_changed (int /*long*/ widget) {

40273

+long /*int*/ gtk_value_changed (long /*int*/ widget) {

40274

postEvent (SWT.Selection);

40275

return 0;

40276

}

40277

@@ -745,7 +745,7 @@

40278

OS.g_signal_connect_closure (handle, OS.value_changed, display.closures [VALUE_CHANGED], false);

40279

OS.g_signal_connect_closure (handle, OS.activate, display.closures [ACTIVATE], false);

40280

OS.g_signal_connect_closure (handle, OS.populate_popup, display.closures [POPULATE_POPUP], false);

40281

- int /*long*/ imContext = imContext ();

40282

+ long /*int*/ imContext = imContext ();

40283

if (imContext != 0) {

40284

OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false);

40285

int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());

40286

@@ -754,13 +754,13 @@

40287

}

40288

}

40289

40290

-int /*long*/ imContext () {

40291

+long /*int*/ imContext () {

40292

return OS.GTK_ENTRY_IM_CONTEXT (handle);

40293

}

40294

40295

-int /*long*/ paintWindow () {

40296

- int /*long*/ window = super.paintWindow ();

40297

- int /*long*/ children = OS.gdk_window_get_children (window);

40298

+long /*int*/ paintWindow () {

40299

+ long /*int*/ window = super.paintWindow ();

40300

+ long /*int*/ children = OS.gdk_window_get_children (window);

40301

if (children != 0) window = OS.g_list_data (children);

40302

OS.g_list_free (children);

40303

return window;

40304

@@ -785,7 +785,7 @@

40305

40306

void register () {

40307

super.register ();

40308

- int /*long*/ imContext = imContext ();

40309

+ long /*int*/ imContext = imContext ();

40310

if (imContext != 0) display.addWidget (imContext, this);

40311

}

40312

40313

@@ -872,14 +872,14 @@

40314

OS.gtk_widget_modify_base (handle, 0, color);

40315

}

40316

40317

-void setCursor (int /*long*/ cursor) {

40318

- int /*long*/ defaultCursor = 0;

40319

+void setCursor (long /*int*/ cursor) {

40320

+ long /*int*/ defaultCursor = 0;

40321

if (cursor == 0) defaultCursor = OS.gdk_cursor_new (OS.GDK_XTERM);

40322

super.setCursor (cursor != 0 ? cursor : defaultCursor);

40323

if (cursor == 0) OS.gdk_cursor_destroy (defaultCursor);

40324

}

40325

40326

-void setFontDescription (int /*long*/ font) {

40327

+void setFontDescription (long /*int*/ font) {

40328

super.setFontDescription (font);

40329

}

40330

40331

@@ -898,7 +898,7 @@

40332

public void setIncrement (int value) {

40333

checkWidget ();

40334

if (value < 1) return;

40335

- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40336

+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40337

GtkAdjustment adjustment = new GtkAdjustment ();

40338

OS.memmove (adjustment, hAdjustment);

40339

double newValue = value;

40340

@@ -924,7 +924,7 @@

40341

*/

40342

public void setMaximum (int value) {

40343

checkWidget ();

40344

- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40345

+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40346

GtkAdjustment adjustment = new GtkAdjustment ();

40347

OS.memmove (adjustment, hAdjustment);

40348

double newValue = value;

40349

@@ -951,7 +951,7 @@

40350

*/

40351

public void setMinimum (int value) {

40352

checkWidget ();

40353

- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40354

+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40355

GtkAdjustment adjustment = new GtkAdjustment ();

40356

OS.memmove (adjustment, hAdjustment);

40357

double newValue = value;

40358

@@ -978,7 +978,7 @@

40359

public void setPageIncrement (int value) {

40360

checkWidget ();

40361

if (value < 1) return;

40362

- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40363

+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40364

GtkAdjustment adjustment = new GtkAdjustment ();

40365

OS.memmove (adjustment, hAdjustment);

40366

double newValue = value;

40367

@@ -1065,7 +1065,7 @@

40368

if (value < 0) error (SWT.ERROR_INVALID_ARGUMENT);

40369

int digits = OS.gtk_spin_button_get_digits (handle);

40370

if (value == digits) return;

40371

- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40372

+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40373

GtkAdjustment adjustment = new GtkAdjustment ();

40374

OS.memmove (adjustment, hAdjustment);

40375

int diff = Math.abs (value - digits);

40376

@@ -1137,9 +1137,9 @@

40377

switch (key) {

40378

case OS.GDK_KP_Enter:

40379

case OS.GDK_Return: {

40380

- int /*long*/ imContext = imContext ();

40381

+ long /*int*/ imContext = imContext ();

40382

if (imContext != 0) {

40383

- int /*long*/ [] preeditString = new int /*long*/ [1];

40384

+ long /*int*/ [] preeditString = new long /*int*/ [1];

40385

OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);

40386

if (preeditString [0] != 0) {

40387

int length = OS.strlen (preeditString [0]);

40388

@@ -1158,7 +1158,7 @@

40389

event.text = string;

40390

event.start = start;

40391

event.end = end;

40392

- int /*long*/ eventPtr = OS.gtk_get_current_event ();

40393

+ long /*int*/ eventPtr = OS.gtk_get_current_event ();

40394

if (eventPtr != 0) {

40395

GdkEventKey gdkEvent = new GdkEventKey ();

40396

OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);

40397

@@ -1179,7 +1179,7 @@

40398

index = 0;

40399

}

40400

if (string.length () > 0) {

40401

- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40402

+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);

40403

GtkAdjustment adjustment = new GtkAdjustment ();

40404

OS.memmove (adjustment, hAdjustment);

40405

if (adjustment.lower < 0 && string.charAt (0) == '-') index++;

40406

diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widgets/TabFolder.java

40407

--- x86/org/eclipse/swt/widgets/TabFolder.java 2009-05-29 17:30:04.000000000 -0400

40408

+++ x86_64/org/eclipse/swt/widgets/TabFolder.java 2009-09-17 08:48:24.000000000 -0400

40409

@@ -100,8 +100,8 @@

40410

if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);

40411

}

40412

40413

-int /*long*/ childStyle () {

40414

- int /*long*/ rcStyle = OS.gtk_widget_get_modifier_style (handle);

40415

+long /*int*/ childStyle () {

40416

+ long /*int*/ rcStyle = OS.gtk_widget_get_modifier_style (handle);

40417

if ((OS.gtk_rc_style_get_color_flags (rcStyle, 0) & OS.GTK_RC_BG) != 0) return 0;

40418

OS.gtk_widget_realize (handle);

40419

return OS.gtk_widget_get_style (handle);

40420

@@ -139,7 +139,7 @@

40421

addListener(SWT.DefaultSelection,typedListener);

40422

}

40423

40424

-int /*long*/ clientHandle () {

40425

+long /*int*/ clientHandle () {

40426

int index = OS.gtk_notebook_get_current_page (handle);

40427

if (index != -1 && items [index] != null) {

40428

return items [index].pageHandle;

40429

@@ -164,7 +164,7 @@

40430

public Rectangle computeTrim (int x, int y, int width, int height) {

40431

checkWidget();

40432

forceResize ();

40433

- int /*long*/ clientHandle = clientHandle ();

40434

+ long /*int*/ clientHandle = clientHandle ();

40435

int clientX = OS.GTK_WIDGET_X (clientHandle);

40436

int clientY = OS.GTK_WIDGET_Y (clientHandle);

40437

x -= clientX;

40438

@@ -201,7 +201,7 @@

40439

}

40440

40441

void createItem (TabItem item, int index) {

40442

- int /*long*/ list = OS.gtk_container_get_children (handle);

40443

+ long /*int*/ list = OS.gtk_container_get_children (handle);

40444

int itemCount = 0;

40445

if (list != 0) {

40446

itemCount = OS.g_list_length (list);

40447

@@ -213,15 +213,15 @@

40448

System.arraycopy (items, 0, newItems, 0, items.length);

40449

items = newItems;

40450

}

40451

- int /*long*/ boxHandle = OS.gtk_hbox_new (false, 0);

40452

+ long /*int*/ boxHandle = OS.gtk_hbox_new (false, 0);

40453

if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);

40454

- int /*long*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);

40455

+ long /*int*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);

40456

if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);

40457

- int /*long*/ imageHandle = OS.gtk_image_new ();

40458

+ long /*int*/ imageHandle = OS.gtk_image_new ();

40459

if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);

40460

OS.gtk_container_add (boxHandle, imageHandle);

40461

OS.gtk_container_add (boxHandle, labelHandle);

40462

- int /*long*/ pageHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);

40463

+ long /*int*/ pageHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);

40464

if (pageHandle == 0) error (SWT.ERROR_NO_HANDLES);

40465

OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);

40466

OS.gtk_notebook_insert_page (handle, pageHandle, boxHandle, index);

40467

@@ -283,7 +283,7 @@

40468

}

40469

}

40470

40471

-int /*long*/ eventHandle () {

40472

+long /*int*/ eventHandle () {

40473

return handle;

40474

}

40475

40476

@@ -305,7 +305,7 @@

40477

public TabItem getItem (int index) {

40478

checkWidget();

40479

if (!(0 <= index && index < getItemCount())) error (SWT.ERROR_INVALID_RANGE);

40480

- int /*long*/ list = OS.gtk_container_get_children (handle);

40481

+ long /*int*/ list = OS.gtk_container_get_children (handle);

40482

if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);

40483

int itemCount = OS.g_list_length (list);

40484

OS.g_list_free (list);

40485

@@ -334,7 +334,7 @@

40486

public TabItem getItem(Point point) {

40487

checkWidget();

40488

if (point == null) error (SWT.ERROR_NULL_ARGUMENT);

40489

- int /*long*/ list = OS.gtk_container_get_children (handle);

40490

+ long /*int*/ list = OS.gtk_container_get_children (handle);

40491

if (list == 0) return null;

40492

int itemCount = OS.g_list_length (list);

40493

OS.g_list_free (list);

40494

@@ -358,7 +358,7 @@

40495

*/

40496

public int getItemCount () {

40497

checkWidget();

40498

- int /*long*/ list = OS.gtk_container_get_children (handle);

40499

+ long /*int*/ list = OS.gtk_container_get_children (handle);

40500

if (list == 0) return 0;

40501

int itemCount = OS.g_list_length (list);

40502

OS.g_list_free (list);

40503

@@ -428,11 +428,11 @@

40504

return OS.gtk_notebook_get_current_page (handle);

40505

}

40506

40507

-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) {

40508

+long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) {

40509

return 0;

40510

}

40511

40512

-int /*long*/ gtk_switch_page (int /*long*/ widget, int /*long*/ page, int /*long*/ page_num) {

40513

+long /*int*/ gtk_switch_page (long /*int*/ widget, long /*int*/ page, long /*int*/ page_num) {

40514

int index = OS.gtk_notebook_get_current_page (handle);

40515

if (index != -1) {

40516

Control control = items [index].getControl ();

40517

@@ -477,7 +477,7 @@

40518

public int indexOf (TabItem item) {

40519

checkWidget();

40520

if (item == null) error (SWT.ERROR_NULL_ARGUMENT);

40521

- int /*long*/ list = OS.gtk_container_get_children (handle);

40522

+ long /*int*/ list = OS.gtk_container_get_children (handle);

40523

if (list == 0) return -1;

40524

int count = OS.g_list_length (list);

40525

OS.g_list_free (list);

40526

@@ -494,7 +494,7 @@

40527

Control child = children [i];

40528

int index = 0;

40529

int count = 0;

40530

- int /*long*/ list = OS.gtk_container_get_children (handle);

40531

+ long /*int*/ list = OS.gtk_container_get_children (handle);

40532

if (list != 0) {

40533

count = OS.g_list_length (list);

40534

OS.g_list_free (list);

40535

@@ -519,7 +519,7 @@

40536

boolean mnemonicHit (char key) {

40537

int itemCount = getItemCount ();

40538

for (int i=0; i<itemCount; i++) {

40539

- int /*long*/ labelHandle = items [i].labelHandle;

40540

+ long /*int*/ labelHandle = items [i].labelHandle;

40541

if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;

40542

}

40543

return false;

40544

@@ -528,7 +528,7 @@

40545

boolean mnemonicMatch (char key) {

40546

int itemCount = getItemCount ();

40547

for (int i=0; i<itemCount; i++) {

40548

- int /*long*/ labelHandle = items [i].labelHandle;

40549

+ long /*int*/ labelHandle = items [i].labelHandle;

40550

if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;

40551

}

40552

return false;

40553

@@ -602,7 +602,7 @@

40554

return result;

40555

}

40556

40557

-void setFontDescription (int /*long*/ font) {

40558

+void setFontDescription (long /*int*/ font) {

40559

super.setFontDescription (font);

40560

TabItem [] items = getItems ();

40561

for (int i = 0; i < items.length; i++) {

40562

diff -urN x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widgets/TabItem.java

40563

--- x86/org/eclipse/swt/widgets/TabItem.java 2009-05-29 17:30:04.000000000 -0400

40564

+++ x86_64/org/eclipse/swt/widgets/TabItem.java 2009-09-17 08:48:24.000000000 -0400

40565

@@ -34,7 +34,7 @@

40566

* @noextend This class is not intended to be subclassed by clients.

40567

*/

40568

public class TabItem extends Item {

40569

- int /*long*/ labelHandle, imageHandle, pageHandle;

40570

+ long /*int*/ labelHandle, imageHandle, pageHandle;

40571

Control control;

40572

TabFolder parent;

40573

String toolTipText;

40574

@@ -206,12 +206,12 @@

40575

return toolTipText;

40576

}

40577

40578

-int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {

40579

+long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {

40580

parent.gtk_enter_notify_event (widget, event);

40581

return 0;

40582

}

40583

40584

-int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {

40585

+long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {

40586

return parent.gtk_mnemonic_activate (widget, arg1);

40587

}

40588

40589

@@ -281,7 +281,7 @@

40590

if (oldControl != null) oldControl.setVisible (false);

40591

}

40592

40593

-void setFontDescription (int /*long*/ font) {

40594

+void setFontDescription (long /*int*/ font) {

40595

OS.gtk_widget_modify_font (labelHandle, font);

40596

OS.gtk_widget_modify_font (imageHandle, font);

40597

}

40598

@@ -304,7 +304,7 @@

40599

} else {

40600

imageList.put (imageIndex, image);

40601

}

40602

- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);

40603

+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);

40604

OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);

40605

OS.gtk_widget_show (imageHandle);

40606

} else {

40607

diff -urN x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/widgets/TableColumn.java

40608

--- x86/org/eclipse/swt/widgets/TableColumn.java 2009-05-29 17:30:04.000000000 -0400

40609

+++ x86_64/org/eclipse/swt/widgets/TableColumn.java 2009-09-17 08:48:24.000000000 -0400

40610

@@ -36,7 +36,7 @@

40611

* @noextend This class is not intended to be subclassed by clients.

40612

*/

40613

public class TableColumn extends Item {

40614

- int /*long*/ labelHandle, imageHandle, buttonHandle;

40615

+ long /*int*/ labelHandle, imageHandle, buttonHandle;

40616

Table parent;

40617

int modelIndex, lastButton, lastTime, lastX, lastWidth;

40618

boolean customDraw, useFixedWidth;

40619

@@ -324,7 +324,7 @@

40620

return OS.gtk_tree_view_column_get_width (handle);

40621

}

40622

40623

-int /*long*/ gtk_clicked (int /*long*/ widget) {

40624

+long /*int*/ gtk_clicked (long /*int*/ widget) {

40625

/*

40626

* There is no API to get a double click on a table column. Normally, when

40627

* the mouse is double clicked, this is indicated by GDK_2BUTTON_PRESS

40628

@@ -334,7 +334,7 @@

40629

*/

40630

boolean doubleClick = false;

40631

boolean postEvent = true;

40632

- int /*long*/ eventPtr = OS.gtk_get_current_event ();

40633

+ long /*int*/ eventPtr = OS.gtk_get_current_event ();

40634

if (eventPtr != 0) {

40635

GdkEventButton gdkEvent = new GdkEventButton ();

40636

OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);

40637

@@ -366,7 +366,7 @@

40638

return 0;

40639

}

40640

40641

-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {

40642

+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {

40643

GdkEvent event = new GdkEvent ();

40644

OS.memmove (event, gdkEvent, GdkEvent.sizeof);

40645

switch (event.type) {

40646

@@ -382,11 +382,11 @@

40647

return 0;

40648

}

40649

40650

-int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {

40651

+long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {

40652

return parent.gtk_mnemonic_activate (widget, arg1);

40653

}

40654

40655

-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {

40656

+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {

40657

useFixedWidth = false;

40658

int x = OS.GTK_WIDGET_X (widget);

40659

int width = OS.GTK_WIDGET_WIDTH (widget);

40660

@@ -438,7 +438,7 @@

40661

}

40662

}

40663

} else {

40664

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

40665

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

40666

if (OS.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) {

40667

do {

40668

width = Math.max (width, parent.calculateWidth (handle, iter));

40669

@@ -545,7 +545,7 @@

40670

parent.createRenderers (handle, modelIndex, index == 0, style);

40671

}

40672

40673

-void setFontDescription (int /*long*/ font) {

40674

+void setFontDescription (long /*int*/ font) {

40675

OS.gtk_widget_modify_font (labelHandle, font);

40676

OS.gtk_widget_modify_font (imageHandle, font);

40677

}

40678

@@ -560,7 +560,7 @@

40679

}

40680

int imageIndex = headerImageList.indexOf (image);

40681

if (imageIndex == -1) imageIndex = headerImageList.add (image);

40682

- int /*long*/ pixbuf = headerImageList.getPixbuf (imageIndex);

40683

+ long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex);

40684

OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);

40685

OS.gtk_widget_show (imageHandle);

40686

} else {

40687

diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widgets/TableItem.java

40688

--- x86/org/eclipse/swt/widgets/TableItem.java 2009-05-29 17:30:04.000000000 -0400

40689

+++ x86_64/org/eclipse/swt/widgets/TableItem.java 2009-09-17 08:48:24.000000000 -0400

40690

@@ -127,7 +127,7 @@

40691

}

40692

40693

Color _getBackground () {

40694

- int /*long*/ [] ptr = new int /*long*/ [1];

40695

+ long /*int*/ [] ptr = new long /*int*/ [1];

40696

OS.gtk_tree_model_get (parent.modelHandle, handle, Table.BACKGROUND_COLUMN, ptr, -1);

40697

if (ptr [0] == 0) return parent.getBackground ();

40698

GdkColor gdkColor = new GdkColor ();

40699

@@ -138,7 +138,7 @@

40700

Color _getBackground (int index) {

40701

int count = Math.max (1, parent.columnCount);

40702

if (0 > index || index > count - 1) return _getBackground ();

40703

- int /*long*/ [] ptr = new int /*long*/ [1];

40704

+ long /*int*/ [] ptr = new long /*int*/ [1];

40705

int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;

40706

OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, ptr, -1);

40707

if (ptr [0] == 0) return _getBackground ();

40708

@@ -148,13 +148,13 @@

40709

}

40710

40711

boolean _getChecked () {

40712

- int /*long*/ [] ptr = new int /*long*/ [1];

40713

+ long /*int*/ [] ptr = new long /*int*/ [1];

40714

OS.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1);

40715

return ptr [0] != 0;

40716

}

40717

40718

Color _getForeground () {

40719

- int /*long*/ [] ptr = new int /*long*/ [1];

40720

+ long /*int*/ [] ptr = new long /*int*/ [1];

40721

OS.gtk_tree_model_get (parent.modelHandle, handle, Table.FOREGROUND_COLUMN, ptr, -1);

40722

if (ptr [0] == 0) return parent.getForeground ();

40723

GdkColor gdkColor = new GdkColor ();

40724

@@ -165,7 +165,7 @@

40725

Color _getForeground (int index) {

40726

int count = Math.max (1, parent.columnCount);

40727

if (0 > index || index > count - 1) return _getForeground ();

40728

- int /*long*/ [] ptr = new int /*long*/ [1];

40729

+ long /*int*/ [] ptr = new long /*int*/ [1];

40730

int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;

40731

OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_FOREGROUND, ptr, -1);

40732

if (ptr [0] == 0) return _getForeground ();

40733

@@ -177,7 +177,7 @@

40734

Image _getImage (int index) {

40735

int count = Math.max (1, parent.getColumnCount ());

40736

if (0 > index || index > count - 1) return null;

40737

- int /*long*/ [] ptr = new int /*long*/ [1];

40738

+ long /*int*/ [] ptr = new long /*int*/ [1];

40739

int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;

40740

OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_PIXBUF, ptr, -1);

40741

if (ptr [0] == 0) return null;

40742

@@ -190,7 +190,7 @@

40743

String _getText (int index) {

40744

int count = Math.max (1, parent.getColumnCount ());

40745

if (0 > index || index > count - 1) return "";

40746

- int /*long*/ [] ptr = new int /*long*/ [1];

40747

+ long /*int*/ [] ptr = new long /*int*/ [1];

40748

int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;

40749

OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_TEXT, ptr, -1);

40750

if (ptr [0] == 0) return "";

40751

@@ -269,14 +269,14 @@

40752

// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem

40753

checkWidget ();

40754

if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);

40755

- int /*long*/ parentHandle = parent.handle;

40756

- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);

40757

+ long /*int*/ parentHandle = parent.handle;

40758

+ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);

40759

if (column == 0) return new Rectangle (0, 0, 0, 0);

40760

- int /*long*/ textRenderer = parent.getTextRenderer (column);

40761

- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);

40762

+ long /*int*/ textRenderer = parent.getTextRenderer (column);

40763

+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);

40764

if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);

40765

40766

- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

40767

+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

40768

OS.gtk_widget_realize (parentHandle);

40769

40770

boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;

40771

@@ -357,15 +357,15 @@

40772

public Rectangle getBounds (int index) {

40773

checkWidget();

40774

if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);

40775

- int /*long*/ parentHandle = parent.handle;

40776

- int /*long*/ column = 0;

40777

+ long /*int*/ parentHandle = parent.handle;

40778

+ long /*int*/ column = 0;

40779

if (index >= 0 && index < parent.columnCount) {

40780

column = parent.columns [index].handle;

40781

} else {

40782

column = OS.gtk_tree_view_get_column (parentHandle, index);

40783

}

40784

if (column == 0) return new Rectangle (0, 0, 0, 0);

40785

- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

40786

+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

40787

OS.gtk_widget_realize (parentHandle);

40788

GdkRectangle rect = new GdkRectangle ();

40789

OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);

40790

@@ -549,18 +549,18 @@

40791

public Rectangle getImageBounds (int index) {

40792

checkWidget ();

40793

if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);

40794

- int /*long*/ parentHandle = parent.handle;

40795

- int /*long*/ column = 0;

40796

+ long /*int*/ parentHandle = parent.handle;

40797

+ long /*int*/ column = 0;

40798

if (index >= 0 && index < parent.columnCount) {

40799

column = parent.columns [index].handle;

40800

} else {

40801

column = OS.gtk_tree_view_get_column (parentHandle, index);

40802

}

40803

if (column == 0) return new Rectangle (0, 0, 0, 0);

40804

- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);

40805

+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);

40806

if (pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);

40807

GdkRectangle rect = new GdkRectangle ();

40808

- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

40809

+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

40810

OS.gtk_widget_realize (parentHandle);

40811

OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);

40812

OS.gtk_tree_path_free (path);

40813

@@ -675,19 +675,19 @@

40814

if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0);

40815

// TODO fully test on early and later versions of GTK

40816

// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem

40817

- int /*long*/ parentHandle = parent.handle;

40818

- int /*long*/ column = 0;

40819

+ long /*int*/ parentHandle = parent.handle;

40820

+ long /*int*/ column = 0;

40821

if (index >= 0 && index < parent.columnCount) {

40822

column = parent.columns [index].handle;

40823

} else {

40824

column = OS.gtk_tree_view_get_column (parentHandle, index);

40825

}

40826

if (column == 0) return new Rectangle (0, 0, 0, 0);

40827

- int /*long*/ textRenderer = parent.getTextRenderer (column);

40828

- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);

40829

+ long /*int*/ textRenderer = parent.getTextRenderer (column);

40830

+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);

40831

if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);

40832

40833

- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

40834

+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

40835

OS.gtk_widget_realize (parentHandle);

40836

40837

boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;

40838

@@ -735,12 +735,12 @@

40839

40840

void redraw () {

40841

if ((OS.GTK_WIDGET_FLAGS (parent.handle) & OS.GTK_REALIZED) != 0) {

40842

- int /*long*/ parentHandle = parent.handle;

40843

- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

40844

+ long /*int*/ parentHandle = parent.handle;

40845

+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

40846

GdkRectangle rect = new GdkRectangle ();

40847

OS.gtk_tree_view_get_cell_area (parentHandle, path, 0, rect);

40848

OS.gtk_tree_path_free (path);

40849

- int /*long*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);

40850

+ long /*int*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);

40851

rect.x = 0;

40852

int [] w = new int [1], h = new int [1];

40853

OS.gdk_drawable_get_size (window, w, h);

40854

@@ -845,16 +845,16 @@

40855

boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;

40856

if (!customDraw) {

40857

if ((parent.style & SWT.VIRTUAL) == 0) {

40858

- int /*long*/ parentHandle = parent.handle;

40859

- int /*long*/ column = 0;

40860

+ long /*int*/ parentHandle = parent.handle;

40861

+ long /*int*/ column = 0;

40862

if (parent.columnCount > 0) {

40863

column = parent.columns [index].handle;

40864

} else {

40865

column = OS.gtk_tree_view_get_column (parentHandle, index);

40866

}

40867

if (column == 0) return;

40868

- int /*long*/ textRenderer = parent.getTextRenderer (column);

40869

- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);

40870

+ long /*int*/ textRenderer = parent.getTextRenderer (column);

40871

+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);

40872

OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);

40873

OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);

40874

}

40875

@@ -918,7 +918,7 @@

40876

if (oldFont == font) return;

40877

this.font = font;

40878

if (oldFont != null && oldFont.equals (font)) return;

40879

- int /*long*/ fontHandle = font != null ? font.handle : 0;

40880

+ long /*int*/ fontHandle = font != null ? font.handle : 0;

40881

OS.gtk_list_store_set (parent.modelHandle, handle, Table.FONT_COLUMN, fontHandle, -1);

40882

/*

40883

* Bug in GTK. When using fixed-height-mode,

40884

@@ -969,7 +969,7 @@

40885

if (oldFont != null && oldFont.equals (font)) return;

40886

40887

int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;

40888

- int /*long*/ fontHandle = font != null ? font.handle : 0;

40889

+ long /*int*/ fontHandle = font != null ? font.handle : 0;

40890

OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FONT, fontHandle, -1);

40891

/*

40892

* Bug in GTK. When using fixed-height-mode,

40893

@@ -987,16 +987,16 @@

40894

boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;

40895

if (!customDraw) {

40896

if ((parent.style & SWT.VIRTUAL) == 0) {

40897

- int /*long*/ parentHandle = parent.handle;

40898

- int /*long*/ column = 0;

40899

+ long /*int*/ parentHandle = parent.handle;

40900

+ long /*int*/ column = 0;

40901

if (parent.columnCount > 0) {

40902

column = parent.columns [index].handle;

40903

} else {

40904

column = OS.gtk_tree_view_get_column (parentHandle, index);

40905

}

40906

if (column == 0) return;

40907

- int /*long*/ textRenderer = parent.getTextRenderer (column);

40908

- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);

40909

+ long /*int*/ textRenderer = parent.getTextRenderer (column);

40910

+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);

40911

OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);

40912

OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);

40913

}

40914

@@ -1092,16 +1092,16 @@

40915

boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;

40916

if (!customDraw) {

40917

if ((parent.style & SWT.VIRTUAL) == 0) {

40918

- int /*long*/ parentHandle = parent.handle;

40919

- int /*long*/ column = 0;

40920

+ long /*int*/ parentHandle = parent.handle;

40921

+ long /*int*/ column = 0;

40922

if (parent.columnCount > 0) {

40923

column = parent.columns [index].handle;

40924

} else {

40925

column = OS.gtk_tree_view_get_column (parentHandle, index);

40926

}

40927

if (column == 0) return;

40928

- int /*long*/ textRenderer = parent.getTextRenderer (column);

40929

- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);

40930

+ long /*int*/ textRenderer = parent.getTextRenderer (column);

40931

+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);

40932

OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);

40933

OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);

40934

}

40935

@@ -1134,7 +1134,7 @@

40936

* GTK+'s "inconsistent" state does not match SWT's concept of grayed.

40937

* Render checked+grayed as "inconsistent", unchecked+grayed as blank.

40938

*/

40939

- int /*long*/ [] ptr = new int /*long*/ [1];

40940

+ long /*int*/ [] ptr = new long /*int*/ [1];

40941

OS.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1);

40942

OS.gtk_list_store_set (parent.modelHandle, handle, Table.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);

40943

cached = true;

40944

@@ -1164,7 +1164,7 @@

40945

}

40946

int count = Math.max (1, parent.getColumnCount ());

40947

if (0 > index || index > count - 1) return;

40948

- int /*long*/ pixbuf = 0;

40949

+ long /*int*/ pixbuf = 0;

40950

if (image != null) {

40951

ImageList imageList = parent.imageList;

40952

if (imageList == null) imageList = parent.imageList = new ImageList ();

40953

@@ -1192,10 +1192,10 @@

40954

if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {

40955

if (OS.GTK_VERSION >= OS.VERSION (2, 3, 2)) {

40956

if (image != null) {

40957

- int /*long*/parentHandle = parent.handle;

40958

- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index);

40959

+ long /*int*/parentHandle = parent.handle;

40960

+ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, index);

40961

int [] w = new int [1];

40962

- int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column);

40963

+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer(column);

40964

OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);

40965

if (w[0] < image.getBounds().width) {

40966

/*

40967

@@ -1203,7 +1203,7 @@

40968

* are relying on the fact that it is done as part of modifying

40969

* the style.

40970

*/

40971

- int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle);

40972

+ long /*int*/ style = OS.gtk_widget_get_modifier_style (parentHandle);

40973

parent.modifyStyle (parentHandle, style);

40974

}

40975

}

40976

diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/Table.java

40977

--- x86/org/eclipse/swt/widgets/Table.java 2009-05-29 17:30:04.000000000 -0400

40978

+++ x86_64/org/eclipse/swt/widgets/Table.java 2009-09-17 08:48:24.000000000 -0400

40979

@@ -68,9 +68,9 @@

40980

* @noextend This class is not intended to be subclassed by clients.

40981

*/

40982

public class Table extends Composite {

40983

- int /*long*/ modelHandle, checkRenderer;

40984

+ long /*int*/ modelHandle, checkRenderer;

40985

int itemCount, columnCount, lastIndexOf, sortDirection;

40986

- int /*long*/ ignoreCell;

40987

+ long /*int*/ ignoreCell;

40988

TableItem [] items;

40989

TableColumn [] columns;

40990

TableItem currentItem;

40991

@@ -170,9 +170,9 @@

40992

return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0);

40993

}

40994

40995

-int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*long*/ tree_model, int /*long*/ iter, int /*long*/ data) {

40996

+long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) {

40997

if (cell == ignoreCell) return 0;

40998

- int /*long*/ path = OS.gtk_tree_model_get_path (tree_model, iter);

40999

+ long /*int*/ path = OS.gtk_tree_model_get_path (tree_model, iter);

41000

int [] index = new int [1];

41001

OS.memmove (index, OS.gtk_tree_path_get_indices (path), 4);

41002

TableItem item = _getItem (index[0]);

41003

@@ -223,7 +223,7 @@

41004

setData = checkData (item);

41005

}

41006

}

41007

- int /*long*/ [] ptr = new int /*long*/ [1];

41008

+ long /*int*/ [] ptr = new long /*int*/ [1];

41009

if (setData) {

41010

ptr [0] = 0;

41011

if (isPixbuf) {

41012

@@ -332,7 +332,7 @@

41013

addListener (SWT.DefaultSelection, typedListener);

41014

}

41015

41016

-int calculateWidth (int /*long*/ column, int /*long*/ iter) {

41017

+int calculateWidth (long /*int*/ column, long /*int*/ iter) {

41018

OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);

41019

/*

41020

* Bug in GTK. The width calculated by gtk_tree_view_column_cell_get_size()

41021

@@ -348,11 +348,11 @@

41022

int [] w = new int [1];

41023

OS.gtk_widget_style_get(handle, OS.focus_line_width, w, 0);

41024

width += 2 * w [0];

41025

- int /*long*/ list = OS.gtk_tree_view_column_get_cell_renderers (column);

41026

+ long /*int*/ list = OS.gtk_tree_view_column_get_cell_renderers (column);

41027

if (list == 0) return 0;

41028

- int /*long*/ temp = list;

41029

+ long /*int*/ temp = list;

41030

while (temp != 0) {

41031

- int /*long*/ renderer = OS.g_list_data (temp);

41032

+ long /*int*/ renderer = OS.g_list_data (temp);

41033

if (renderer != 0) {

41034

OS.gtk_cell_renderer_get_size (renderer, handle, null, null, null, w, null);

41035

width += w [0];

41036

@@ -524,18 +524,18 @@

41037

modelIndex++;

41038

}

41039

if (modelIndex == modelLength) {

41040

- int /*long*/ oldModel = modelHandle;

41041

- int /*long*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time

41042

- int /*long*/ newModel = OS.gtk_list_store_newv (types.length, types);

41043

+ long /*int*/ oldModel = modelHandle;

41044

+ long /*int*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time

41045

+ long /*int*/ newModel = OS.gtk_list_store_newv (types.length, types);

41046

if (newModel == 0) error (SWT.ERROR_NO_HANDLES);

41047

- int /*long*/ [] ptr = new int /*long*/ [1];

41048

+ long /*int*/ [] ptr = new long /*int*/ [1];

41049

for (int i=0; i<itemCount; i++) {

41050

- int /*long*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());

41051

+ long /*int*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());

41052

if (newItem == 0) error (SWT.ERROR_NO_HANDLES);

41053

OS.gtk_list_store_append (newModel, newItem);

41054

TableItem item = items [i];

41055

if (item != null) {

41056

- int /*long*/ oldItem = item.handle;

41057

+ long /*int*/ oldItem = item.handle;

41058

for (int j=0; j<modelLength; j++) {

41059

OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);

41060

OS.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);

41061

@@ -553,7 +553,7 @@

41062

modelHandle = newModel;

41063

}

41064

}

41065

- int /*long*/ columnHandle = OS.gtk_tree_view_column_new ();

41066

+ long /*int*/ columnHandle = OS.gtk_tree_view_column_new ();

41067

if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);

41068

if (index == 0 && columnCount > 0) {

41069

TableColumn checkColumn = columns [0];

41070

@@ -610,7 +610,7 @@

41071

OS.gtk_fixed_set_has_window (fixedHandle, true);

41072

scrolledHandle = OS.gtk_scrolled_window_new (0, 0);

41073

if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);

41074

- int /*long*/ [] types = getColumnTypes (1);

41075

+ long /*int*/ [] types = getColumnTypes (1);

41076

modelHandle = OS.gtk_list_store_newv (types.length, types);

41077

if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);

41078

handle = OS.gtk_tree_view_new_with_model (modelHandle);

41079

@@ -625,7 +625,7 @@

41080

OS.gtk_container_add (scrolledHandle, handle);

41081

41082

int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;

41083

- int /*long*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);

41084

+ long /*int*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);

41085

OS.gtk_tree_selection_set_mode (selectionHandle, mode);

41086

OS.gtk_tree_view_set_headers_visible (handle, false);

41087

int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;

41088

@@ -669,11 +669,11 @@

41089

} else {

41090

createColumn (column, index);

41091

}

41092

- int /*long*/ boxHandle = OS.gtk_hbox_new (false, 3);

41093

+ long /*int*/ boxHandle = OS.gtk_hbox_new (false, 3);

41094

if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);

41095

- int /*long*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);

41096

+ long /*int*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);

41097

if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);

41098

- int /*long*/ imageHandle = OS.gtk_image_new ();

41099

+ long /*int*/ imageHandle = OS.gtk_image_new ();

41100

if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);

41101

OS.gtk_container_add (boxHandle, imageHandle);

41102

OS.gtk_container_add (boxHandle, labelHandle);

41103

@@ -682,7 +682,7 @@

41104

column.labelHandle = labelHandle;

41105

column.imageHandle = imageHandle;

41106

OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);

41107

- int /*long*/ widget = OS.gtk_widget_get_parent (boxHandle);

41108

+ long /*int*/ widget = OS.gtk_widget_get_parent (boxHandle);

41109

while (widget != handle) {

41110

if (OS.GTK_IS_BUTTON (widget)) {

41111

column.buttonHandle = widget;

41112

@@ -748,7 +748,7 @@

41113

items [index] = item;

41114

}

41115

41116

-void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check, int columnStyle) {

41117

+void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check, int columnStyle) {

41118

OS.gtk_tree_view_column_clear (columnHandle);

41119

if ((style & SWT.CHECK) != 0 && check) {

41120

OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);

41121

@@ -771,9 +771,9 @@

41122

OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);

41123

}

41124

}

41125

- int /*long*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : OS.gtk_cell_renderer_pixbuf_new ();

41126

+ long /*int*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : OS.gtk_cell_renderer_pixbuf_new ();

41127

if (pixbufRenderer == 0) error (SWT.ERROR_NO_HANDLES);

41128

- int /*long*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new ();

41129

+ long /*int*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new ();

41130

if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);

41131

41132

if (ownerDraw) {

41133

@@ -877,7 +877,7 @@

41134

checkWidget();

41135

if (index < 0 || index >= itemCount) return;

41136

boolean fixColumn = showFirstColumn ();

41137

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41138

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41139

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41140

OS.gtk_tree_selection_unselect_iter (selection, _getItem (index).handle);

41141

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41142

@@ -902,7 +902,7 @@

41143

public void deselect (int start, int end) {

41144

checkWidget();

41145

boolean fixColumn = showFirstColumn ();

41146

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41147

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41148

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41149

for (int index=start; index<=end; index++) {

41150

if (index < 0 || index >= itemCount) continue;

41151

@@ -933,7 +933,7 @@

41152

checkWidget();

41153

if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);

41154

boolean fixColumn = showFirstColumn ();

41155

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41156

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41157

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41158

for (int i=0; i<indices.length; i++) {

41159

int index = indices[i];

41160

@@ -955,7 +955,7 @@

41161

public void deselectAll () {

41162

checkWidget();

41163

boolean fixColumn = showFirstColumn ();

41164

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41165

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41166

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41167

OS.gtk_tree_selection_unselect_all (selection);

41168

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41169

@@ -969,7 +969,7 @@

41170

index++;

41171

}

41172

if (index == columnCount) return;

41173

- int /*long*/ columnHandle = column.handle;

41174

+ long /*int*/ columnHandle = column.handle;

41175

if (columnCount == 1) {

41176

firstCustomDraw = column.customDraw;

41177

}

41178

@@ -977,18 +977,18 @@

41179

columns [columnCount] = null;

41180

OS.gtk_tree_view_remove_column (handle, columnHandle);

41181

if (columnCount == 0) {

41182

- int /*long*/ oldModel = modelHandle;

41183

- int /*long*/[] types = getColumnTypes (1);

41184

- int /*long*/ newModel = OS.gtk_list_store_newv (types.length, types);

41185

+ long /*int*/ oldModel = modelHandle;

41186

+ long /*int*/[] types = getColumnTypes (1);

41187

+ long /*int*/ newModel = OS.gtk_list_store_newv (types.length, types);

41188

if (newModel == 0) error (SWT.ERROR_NO_HANDLES);

41189

- int /*long*/ [] ptr = new int /*long*/ [1];

41190

+ long /*int*/ [] ptr = new long /*int*/ [1];

41191

for (int i=0; i<itemCount; i++) {

41192

- int /*long*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());

41193

+ long /*int*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());

41194

if (newItem == 0) error (SWT.ERROR_NO_HANDLES);

41195

OS.gtk_list_store_append (newModel, newItem);

41196

TableItem item = items [i];

41197

if (item != null) {

41198

- int /*long*/ oldItem = item.handle;

41199

+ long /*int*/ oldItem = item.handle;

41200

for (int j=0; j<FIRST_COLUMN; j++) {

41201

OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);

41202

OS.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);

41203

@@ -1019,7 +1019,7 @@

41204

for (int i=0; i<itemCount; i++) {

41205

TableItem item = items [i];

41206

if (item != null) {

41207

- int /*long*/ iter = item.handle;

41208

+ long /*int*/ iter = item.handle;

41209

int modelIndex = column.modelIndex;

41210

OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, 0, -1);

41211

OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_TEXT, 0, -1);

41212

@@ -1076,7 +1076,7 @@

41213

index++;

41214

}

41215

if (index == itemCount) return;

41216

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41217

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41218

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41219

OS.gtk_list_store_remove (modelHandle, item.handle);

41220

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41221

@@ -1088,10 +1088,10 @@

41222

boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {

41223

boolean selected = false;

41224

if (filter) {

41225

- int /*long*/ [] path = new int /*long*/ [1];

41226

+ long /*int*/ [] path = new long /*int*/ [1];

41227

if (OS.gtk_tree_view_get_path_at_pos (handle, x, y, path, null, null, null)) {

41228

if (path [0] != 0) {

41229

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41230

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41231

if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;

41232

OS.gtk_tree_path_free (path [0]);

41233

}

41234

@@ -1104,7 +1104,7 @@

41235

return dragDetect;

41236

}

41237

41238

-int /*long*/ eventWindow () {

41239

+long /*int*/ eventWindow () {

41240

return paintWindow ();

41241

}

41242

41243

@@ -1142,13 +1142,13 @@

41244

checkWidget ();

41245

forceResize ();

41246

OS.gtk_widget_realize (handle);

41247

- int /*long*/ fixedWindow = OS.GTK_WIDGET_WINDOW (fixedHandle);

41248

- int /*long*/ binWindow = OS.gtk_tree_view_get_bin_window (handle);

41249

+ long /*int*/ fixedWindow = OS.GTK_WIDGET_WINDOW (fixedHandle);

41250

+ long /*int*/ binWindow = OS.gtk_tree_view_get_bin_window (handle);

41251

int [] binX = new int [1], binY = new int [1];

41252

OS.gdk_window_get_origin (binWindow, binX, binY);

41253

int [] fixedX = new int [1], fixedY = new int [1];

41254

OS.gdk_window_get_origin (fixedWindow, fixedX, fixedY);

41255

- int /*long*/ clientHandle = clientHandle ();

41256

+ long /*int*/ clientHandle = clientHandle ();

41257

int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);

41258

int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);

41259

return new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height);

41260

@@ -1213,8 +1213,8 @@

41261

return columnCount;

41262

}

41263

41264

-int /*long*/[] getColumnTypes (int columnCount) {

41265

- int /*long*/[] types = new int /*long*/ [FIRST_COLUMN + (columnCount * CELL_TYPES)];

41266

+long /*int*/[] getColumnTypes (int columnCount) {

41267

+ long /*int*/[] types = new long /*int*/ [FIRST_COLUMN + (columnCount * CELL_TYPES)];

41268

// per row data

41269

types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();

41270

types [GRAYED_COLUMN] = OS.G_TYPE_BOOLEAN ();

41271

@@ -1263,13 +1263,13 @@

41272

public int [] getColumnOrder () {

41273

checkWidget ();

41274

if (columnCount == 0) return new int [0];

41275

- int /*long*/ list = OS.gtk_tree_view_get_columns (handle);

41276

+ long /*int*/ list = OS.gtk_tree_view_get_columns (handle);

41277

if (list == 0) return new int [0];

41278

int i = 0, count = OS.g_list_length (list);

41279

int [] order = new int [count];

41280

- int /*long*/ temp = list;

41281

+ long /*int*/ temp = list;

41282

while (temp != 0) {

41283

- int /*long*/ column = OS.g_list_data (temp);

41284

+ long /*int*/ column = OS.g_list_data (temp);

41285

if (column != 0) {

41286

for (int j=0; j<columnCount; j++) {

41287

if (columns [j].handle == column) {

41288

@@ -1319,11 +1319,11 @@

41289

}

41290

41291

TableItem getFocusItem () {

41292

- int /*long*/ [] path = new int /*long*/ [1];

41293

+ long /*int*/ [] path = new long /*int*/ [1];

41294

OS.gtk_tree_view_get_cursor (handle, path, null);

41295

if (path [0] == 0) return null;

41296

TableItem item = null;

41297

- int /*long*/ indices = OS.gtk_tree_path_get_indices (path [0]);

41298

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path [0]);

41299

if (indices != 0) {

41300

int [] index = new int []{-1};

41301

OS.memmove (index, indices, 4);

41302

@@ -1371,7 +1371,7 @@

41303

GtkRequisition requisition = new GtkRequisition ();

41304

int height = 0;

41305

for (int i=0; i<columnCount; i++) {

41306

- int /*long*/ buttonHandle = columns [i].buttonHandle;

41307

+ long /*int*/ buttonHandle = columns [i].buttonHandle;

41308

if (buttonHandle != 0) {

41309

OS.gtk_widget_size_request (buttonHandle, requisition);

41310

height = Math.max (height, requisition.height);

41311

@@ -1380,8 +1380,8 @@

41312

return height;

41313

}

41314

OS.gtk_widget_realize (handle);

41315

- int /*long*/ fixedWindow = OS.GTK_WIDGET_WINDOW (fixedHandle);

41316

- int /*long*/ binWindow = OS.gtk_tree_view_get_bin_window (handle);

41317

+ long /*int*/ fixedWindow = OS.GTK_WIDGET_WINDOW (fixedHandle);

41318

+ long /*int*/ binWindow = OS.gtk_tree_view_get_bin_window (handle);

41319

int [] binY = new int [1];

41320

OS.gdk_window_get_origin (binWindow, null, binY);

41321

int [] fixedY = new int [1];

41322

@@ -1458,11 +1458,11 @@

41323

public TableItem getItem (Point point) {

41324

checkWidget();

41325

if (point == null) error (SWT.ERROR_NULL_ARGUMENT);

41326

- int /*long*/ [] path = new int /*long*/ [1];

41327

+ long /*int*/ [] path = new long /*int*/ [1];

41328

OS.gtk_widget_realize (handle);

41329

if (!OS.gtk_tree_view_get_path_at_pos (handle, point.x, point.y, path, null, null, null)) return null;

41330

if (path [0] == 0) return null;

41331

- int /*long*/ indices = OS.gtk_tree_path_get_indices (path [0]);

41332

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path [0]);

41333

TableItem item = null;

41334

if (indices != 0) {

41335

int [] index = new int [1];

41336

@@ -1502,7 +1502,7 @@

41337

public int getItemHeight () {

41338

checkWidget();

41339

if (itemCount == 0) {

41340

- int /*long*/ column = OS.gtk_tree_view_get_column (handle, 0);

41341

+ long /*int*/ column = OS.gtk_tree_view_get_column (handle, 0);

41342

int [] w = new int [1], h = new int [1];

41343

ignoreSize = true;

41344

OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);

41345

@@ -1510,11 +1510,11 @@

41346

return h [0];

41347

} else {

41348

int height = 0;

41349

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

41350

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

41351

OS.gtk_tree_model_get_iter_first (modelHandle, iter);

41352

int columnCount = Math.max (1, this.columnCount);

41353

for (int i=0; i<columnCount; i++) {

41354

- int /*long*/ column = OS.gtk_tree_view_get_column (handle, i);

41355

+ long /*int*/ column = OS.gtk_tree_view_get_column (handle, i);

41356

OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);

41357

int [] w = new int [1], h = new int [1];

41358

OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);

41359

@@ -1577,14 +1577,14 @@

41360

return OS.gtk_tree_view_get_rules_hint (handle);

41361

}

41362

41363

-int /*long*/ getPixbufRenderer (int /*long*/ column) {

41364

- int /*long*/ list = OS.gtk_tree_view_column_get_cell_renderers (column);

41365

+long /*int*/ getPixbufRenderer (long /*int*/ column) {

41366

+ long /*int*/ list = OS.gtk_tree_view_column_get_cell_renderers (column);

41367

if (list == 0) return 0;

41368

int count = OS.g_list_length (list);

41369

- int /*long*/ pixbufRenderer = 0;

41370

+ long /*int*/ pixbufRenderer = 0;

41371

int i = 0;

41372

while (i < count) {

41373

- int /*long*/ renderer = OS.g_list_nth_data (list, i);

41374

+ long /*int*/ renderer = OS.g_list_nth_data (list, i);

41375

if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {

41376

pixbufRenderer = renderer;

41377

break;

41378

@@ -1613,7 +1613,7 @@

41379

*/

41380

public TableItem [] getSelection () {

41381

checkWidget();

41382

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41383

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41384

if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {

41385

display.treeSelectionLength = 0;

41386

display.treeSelection = new int [itemCount];

41387

@@ -1627,15 +1627,15 @@

41388

* in versions smaller than 2.2.4 if the model is NULL. The fix is

41389

* to give a valid pointer instead.

41390

*/

41391

- int /*long*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new int /*long*/ [1] : null;

41392

- int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

41393

+ long /*int*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new long /*int*/ [1] : null;

41394

+ long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

41395

if (list != 0) {

41396

int count = OS.g_list_length (list);

41397

int [] treeSelection = new int [count];

41398

int length = 0;

41399

for (int i=0; i<count; i++) {

41400

- int /*long*/ data = OS.g_list_nth_data (list, i);

41401

- int /*long*/ indices = OS.gtk_tree_path_get_indices (data);

41402

+ long /*int*/ data = OS.g_list_nth_data (list, i);

41403

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (data);

41404

if (indices != 0) {

41405

int [] index = new int [1];

41406

OS.memmove (index, indices, 4);

41407

@@ -1663,7 +1663,7 @@

41408

*/

41409

public int getSelectionCount () {

41410

checkWidget();

41411

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41412

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41413

if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {

41414

display.treeSelectionLength = 0;

41415

display.treeSelection = null;

41416

@@ -1689,25 +1689,25 @@

41417

if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {

41418

display.treeSelectionLength = 0;

41419

display.treeSelection = new int [itemCount];

41420

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41421

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41422

OS.gtk_tree_selection_selected_foreach (selection, display.treeSelectionProc, handle);

41423

if (display.treeSelectionLength == 0) return -1;

41424

return display.treeSelection [0];

41425

}

41426

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41427

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41428

/*

41429

* Bug in GTK. gtk_tree_selection_get_selected_rows() segmentation faults

41430

* in versions smaller than 2.2.4 if the model is NULL. The fix is

41431

* to give a valid pointer instead.

41432

*/

41433

- int /*long*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new int /*long*/ [1] : null;

41434

- int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

41435

+ long /*int*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new long /*int*/ [1] : null;

41436

+ long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

41437

if (list != 0) {

41438

int count = OS.g_list_length (list);

41439

int [] index = new int [1];

41440

for (int i=0; i<count; i++) {

41441

- int /*long*/ data = OS.g_list_nth_data (list, i);

41442

- int /*long*/ indices = OS.gtk_tree_path_get_indices (data);

41443

+ long /*int*/ data = OS.g_list_nth_data (list, i);

41444

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (data);

41445

if (indices != 0) {

41446

OS.memmove (index, indices, 4);

41447

break;

41448

@@ -1737,7 +1737,7 @@

41449

*/

41450

public int [] getSelectionIndices () {

41451

checkWidget();

41452

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41453

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41454

if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {

41455

display.treeSelectionLength = 0;

41456

display.treeSelection = new int [itemCount];

41457

@@ -1752,15 +1752,15 @@

41458

* in versions smaller than 2.2.4 if the model is NULL. The fix is

41459

* to give a valid pointer instead.

41460

*/

41461

- int /*long*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new int /*long*/ [1] : null;

41462

- int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

41463

+ long /*int*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new long /*int*/ [1] : null;

41464

+ long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

41465

if (list != 0) {

41466

int count = OS.g_list_length (list);

41467

int [] treeSelection = new int [count];

41468

int length = 0;

41469

for (int i=0; i<count; i++) {

41470

- int /*long*/ data = OS.g_list_nth_data (list, i);

41471

- int /*long*/ indices = OS.gtk_tree_path_get_indices (data);

41472

+ long /*int*/ data = OS.g_list_nth_data (list, i);

41473

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (data);

41474

if (indices != 0) {

41475

int [] index = new int [1];

41476

OS.memmove (index, indices, 4);

41477

@@ -1818,14 +1818,14 @@

41478

return sortDirection;

41479

}

41480

41481

-int /*long*/ getTextRenderer (int /*long*/ column) {

41482

- int /*long*/ list = OS.gtk_tree_view_column_get_cell_renderers (column);

41483

+long /*int*/ getTextRenderer (long /*int*/ column) {

41484

+ long /*int*/ list = OS.gtk_tree_view_column_get_cell_renderers (column);

41485

if (list == 0) return 0;

41486

int count = OS.g_list_length (list);

41487

- int /*long*/ textRenderer = 0;

41488

+ long /*int*/ textRenderer = 0;

41489

int i = 0;

41490

while (i < count) {

41491

- int /*long*/ renderer = OS.g_list_nth_data (list, i);

41492

+ long /*int*/ renderer = OS.g_list_nth_data (list, i);

41493

if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {

41494

textRenderer = renderer;

41495

break;

41496

@@ -1850,22 +1850,22 @@

41497

*/

41498

public int getTopIndex () {

41499

checkWidget();

41500

- int /*long*/ [] path = new int /*long*/ [1];

41501

+ long /*int*/ [] path = new long /*int*/ [1];

41502

OS.gtk_widget_realize (handle);

41503

if (!OS.gtk_tree_view_get_path_at_pos (handle, 1, 1, path, null, null, null)) return 0;

41504

if (path [0] == 0) return 0;

41505

- int /*long*/ indices = OS.gtk_tree_path_get_indices (path[0]);

41506

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path[0]);

41507

int[] index = new int [1];

41508

if (indices != 0) OS.memmove (index, indices, 4);

41509

OS.gtk_tree_path_free (path [0]);

41510

return index [0];

41511

}

41512

41513

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

41514

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

41515

GdkEventButton gdkEvent = new GdkEventButton ();

41516

OS.memmove (gdkEvent, event, GdkEventButton.sizeof);

41517

if (gdkEvent.window != OS.gtk_tree_view_get_bin_window (handle)) return 0;

41518

- int /*long*/ result = super.gtk_button_press_event (widget, event);

41519

+ long /*int*/ result = super.gtk_button_press_event (widget, event);

41520

if (result != 0) return result;

41521

/*

41522

* Feature in GTK. In a multi-select table view, when multiple items are already

41523

@@ -1877,10 +1877,10 @@

41524

*/

41525

int button = gdkEvent.button;

41526

if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {

41527

- int /*long*/ [] path = new int /*long*/ [1];

41528

+ long /*int*/ [] path = new long /*int*/ [1];

41529

if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {

41530

if (path [0] != 0) {

41531

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41532

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41533

if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;

41534

OS.gtk_tree_path_free (path [0]);

41535

}

41536

@@ -1895,10 +1895,10 @@

41537

* widget from automatically selecting the first item.

41538

*/

41539

if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {

41540

- int /*long*/ [] path = new int /*long*/ [1];

41541

+ long /*int*/ [] path = new long /*int*/ [1];

41542

if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {

41543

if (path [0] != 0) {

41544

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41545

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41546

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41547

OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);

41548

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41549

@@ -1918,13 +1918,13 @@

41550

return result;

41551

}

41552

41553

-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) {

41554

- int /*long*/ window = OS.GDK_EVENT_WINDOW (event);

41555

+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {

41556

+ long /*int*/ window = OS.GDK_EVENT_WINDOW (event);

41557

if (window != OS.gtk_tree_view_get_bin_window (handle)) return 0;

41558

return super.gtk_button_release_event (widget, event);

41559

}

41560

41561

-int /*long*/ gtk_changed (int /*long*/ widget) {

41562

+long /*int*/ gtk_changed (long /*int*/ widget) {

41563

TableItem item = getFocusItem ();

41564

if (item != null) {

41565

Event event = new Event ();

41566

@@ -1934,8 +1934,8 @@

41567

return 0;

41568

}

41569

41570

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {

41571

- int /*long*/ result = super.gtk_key_press_event (widget, eventPtr);

41572

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) {

41573

+ long /*int*/ result = super.gtk_key_press_event (widget, eventPtr);

41574

if (result != 0) return result;

41575

if (OS.GTK_VERSION < OS.VERSION (2, 2 ,0)) {

41576

/*

41577

@@ -1959,8 +1959,8 @@

41578

return result;

41579

}

41580

41581

-int /*long*/ gtk_popup_menu (int /*long*/ widget) {

41582

- int /*long*/ result = super.gtk_popup_menu (widget);

41583

+long /*int*/ gtk_popup_menu (long /*int*/ widget) {

41584

+ long /*int*/ result = super.gtk_popup_menu (widget);

41585

/*

41586

* Bug in GTK. The context menu for the typeahead in GtkTreeViewer

41587

* opens in the bottom right corner of the screen when Shift+F10

41588

@@ -1973,15 +1973,15 @@

41589

return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;

41590

}

41591

41592

-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {

41593

- int /*long*/ window = OS.GDK_EVENT_WINDOW (event);

41594

+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {

41595

+ long /*int*/ window = OS.GDK_EVENT_WINDOW (event);

41596

if (window != OS.gtk_tree_view_get_bin_window (handle)) return 0;

41597

return super.gtk_motion_notify_event (widget, event);

41598

}

41599

41600

-int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long*/ column) {

41601

+long /*int*/ gtk_row_activated (long /*int*/ tree, long /*int*/ path, long /*int*/ column) {

41602

TableItem item = null;

41603

- int /*long*/ indices = OS.gtk_tree_path_get_indices (path);

41604

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path);

41605

if (indices != 0) {

41606

int [] index = new int []{-1};

41607

OS.memmove (index, indices, 4);

41608

@@ -2007,10 +2007,10 @@

41609

return 0;

41610

}

41611

41612

-int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {

41613

- int /*long*/ path = OS.gtk_tree_path_new_from_string (pathStr);

41614

+long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) {

41615

+ long /*int*/ path = OS.gtk_tree_path_new_from_string (pathStr);

41616

if (path == 0) return 0;

41617

- int /*long*/ indices = OS.gtk_tree_path_get_indices (path);

41618

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path);

41619

if (indices != 0) {

41620

int [] index = new int [1];

41621

OS.memmove (index, indices, 4);

41622

@@ -2025,7 +2025,7 @@

41623

return 0;

41624

}

41625

41626

-void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {

41627

+void gtk_widget_size_request (long /*int*/ widget, GtkRequisition requisition) {

41628

/*

41629

* Bug in GTK. For some reason, gtk_widget_size_request() fails

41630

* to include the height of the tree view items when there are

41631

@@ -2036,17 +2036,17 @@

41632

super.gtk_widget_size_request (widget, requisition);

41633

return;

41634

}

41635

- int /*long*/ columns = OS.gtk_tree_view_get_columns (handle), list = columns;

41636

+ long /*int*/ columns = OS.gtk_tree_view_get_columns (handle), list = columns;

41637

boolean fixVisible = columns != 0;

41638

while (list != 0) {

41639

- int /*long*/ column = OS.g_list_data (list);

41640

+ long /*int*/ column = OS.g_list_data (list);

41641

if (OS.gtk_tree_view_column_get_visible (column)) {

41642

fixVisible = false;

41643

break;

41644

}

41645

list = OS.g_list_next (list);

41646

}

41647

- int /*long*/ columnHandle = 0;

41648

+ long /*int*/ columnHandle = 0;

41649

if (fixVisible) {

41650

columnHandle = OS.g_list_data (columns);

41651

OS.gtk_tree_view_column_set_visible (columnHandle, true);

41652

@@ -2059,13 +2059,13 @@

41653

}

41654

41655

void hideFirstColumn () {

41656

- int /*long*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);

41657

+ long /*int*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);

41658

OS.gtk_tree_view_column_set_visible (firstColumn, false);

41659

}

41660

41661

void hookEvents () {

41662

super.hookEvents ();

41663

- int /*long*/ selection = OS.gtk_tree_view_get_selection(handle);

41664

+ long /*int*/ selection = OS.gtk_tree_view_get_selection(handle);

41665

OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false);

41666

OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false);

41667

if (checkRenderer != 0) {

41668

@@ -2155,9 +2155,9 @@

41669

*/

41670

public boolean isSelected (int index) {

41671

checkWidget();

41672

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41673

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41674

byte [] buffer = Converter.wcsToMbcs (null, Integer.toString (index), true);

41675

- int /*long*/ path = OS.gtk_tree_path_new_from_string (buffer);

41676

+ long /*int*/ path = OS.gtk_tree_path_new_from_string (buffer);

41677

boolean answer = OS.gtk_tree_selection_path_is_selected (selection, path);

41678

OS.gtk_tree_path_free (path);

41679

return answer;

41680

@@ -2165,7 +2165,7 @@

41681

41682

boolean mnemonicHit (char key) {

41683

for (int i=0; i<columnCount; i++) {

41684

- int /*long*/ labelHandle = columns [i].labelHandle;

41685

+ long /*int*/ labelHandle = columns [i].labelHandle;

41686

if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;

41687

}

41688

return false;

41689

@@ -2173,13 +2173,13 @@

41690

41691

boolean mnemonicMatch (char key) {

41692

for (int i=0; i<columnCount; i++) {

41693

- int /*long*/ labelHandle = columns [i].labelHandle;

41694

+ long /*int*/ labelHandle = columns [i].labelHandle;

41695

if (labelHandle != 0 && mnemonicMatch (labelHandle, key)) return true;

41696

}

41697

return false;

41698

}

41699

41700

-int /*long*/ paintWindow () {

41701

+long /*int*/ paintWindow () {

41702

OS.gtk_widget_realize (handle);

41703

return OS.gtk_tree_view_get_bin_window (handle);

41704

}

41705

@@ -2269,7 +2269,7 @@

41706

public void remove (int index) {

41707

checkWidget();

41708

if (!(0 <= index && index < itemCount)) error (SWT.ERROR_ITEM_NOT_REMOVED);

41709

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

41710

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

41711

TableItem item = items [index];

41712

boolean disposed = false;

41713

if (item != null) {

41714

@@ -2282,7 +2282,7 @@

41715

OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);

41716

}

41717

if (!disposed) {

41718

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41719

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41720

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41721

OS.gtk_list_store_remove (modelHandle, iter);

41722

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41723

@@ -2314,8 +2314,8 @@

41724

if (!(0 <= start && start <= end && end < itemCount)) {

41725

error (SWT.ERROR_INVALID_RANGE);

41726

}

41727

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41728

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

41729

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41730

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

41731

if (iter == 0) error (SWT.ERROR_NO_HANDLES);

41732

if (fixAccessibility ()) {

41733

ignoreAccessibility = true;

41734

@@ -2367,9 +2367,9 @@

41735

if (!(0 <= start && start <= end && end < itemCount)) {

41736

error (SWT.ERROR_INVALID_RANGE);

41737

}

41738

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41739

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41740

int last = -1;

41741

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

41742

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

41743

if (iter == 0) error (SWT.ERROR_NO_HANDLES);

41744

if (fixAccessibility ()) {

41745

ignoreAccessibility = true;

41746

@@ -2423,7 +2423,7 @@

41747

}

41748

items = new TableItem [4];

41749

itemCount = 0;

41750

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41751

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41752

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41753

if (fixAccessibility ()) {

41754

ignoreAccessibility = true;

41755

@@ -2485,16 +2485,16 @@

41756

eventTable.unhook (SWT.DefaultSelection,listener);

41757

}

41758

41759

-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) {

41760

- int /*long*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));

41761

+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) {

41762

+ long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));

41763

GtkCellRendererClass klass = new GtkCellRendererClass ();

41764

OS.memmove (klass, g_class);

41765

- int /*long*/ result = OS.call (klass.get_size, cell, handle, cell_area, x_offset, y_offset, width, height);

41766

+ long /*int*/ result = OS.call (klass.get_size, cell, handle, cell_area, x_offset, y_offset, width, height);

41767

if (!ignoreSize && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {

41768

- int /*long*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);

41769

+ long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);

41770

TableItem item = null;

41771

if (iter != 0) {

41772

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

41773

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

41774

int [] buffer = new int [1];

41775

OS.memmove (buffer, OS.gtk_tree_path_get_indices (path), 4);

41776

int index = buffer [0];

41777

@@ -2504,7 +2504,7 @@

41778

if (item != null) {

41779

int columnIndex = 0;

41780

if (columnCount > 0) {

41781

- int /*long*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);

41782

+ long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);

41783

for (int i = 0; i < columnCount; i++) {

41784

if (columns [i].handle == columnHandle) {

41785

columnIndex = i;

41786

@@ -2543,18 +2543,18 @@

41787

return result;

41788

}

41789

41790

-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) {

41791

+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) {

41792

TableItem item = null;

41793

- int /*long*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);

41794

+ long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);

41795

if (iter != 0) {

41796

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

41797

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

41798

int [] buffer = new int [1];

41799

OS.memmove (buffer, OS.gtk_tree_path_get_indices (path), 4);

41800

int index = buffer [0];

41801

item = _getItem (index);

41802

OS.gtk_tree_path_free (path);

41803

}

41804

- int /*long*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);

41805

+ long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);

41806

int columnIndex = 0;

41807

if (columnCount > 0) {

41808

for (int i = 0; i < columnCount; i++) {

41809

@@ -2568,7 +2568,7 @@

41810

if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) || (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {

41811

drawFlags = (int)/*64*/flags;

41812

drawState = SWT.FOREGROUND;

41813

- int /*long*/ [] ptr = new int /*long*/ [1];

41814

+ long /*int*/ [] ptr = new long /*int*/ [1];

41815

OS.gtk_tree_model_get (modelHandle, item.handle, Table.BACKGROUND_COLUMN, ptr, -1);

41816

if (ptr [0] == 0) {

41817

int modelIndex = columnCount == 0 ? Table.FIRST_COLUMN : columns [columnIndex].modelIndex;

41818

@@ -2579,7 +2579,7 @@

41819

if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;

41820

41821

GdkRectangle rect = new GdkRectangle ();

41822

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

41823

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

41824

OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);

41825

OS.gtk_tree_path_free (path);

41826

41827

@@ -2623,7 +2623,7 @@

41828

if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED;

41829

if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED;

41830

if ((drawState & SWT.SELECTED) != 0) {

41831

- int /*long*/ style = OS.gtk_widget_get_style (widget);

41832

+ long /*int*/ style = OS.gtk_widget_get_style (widget);

41833

//TODO - parity and sorted

41834

byte[] detail = Converter.wcsToMbcs (null, "cell_odd", true);

41835

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);

41836

@@ -2634,7 +2634,7 @@

41837

}

41838

}

41839

}

41840

- int /*long*/ result = 0;

41841

+ long /*int*/ result = 0;

41842

if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) {

41843

GC gc = new GC (this);

41844

gc.setBackground (item.getBackground (columnIndex));

41845

@@ -2644,7 +2644,7 @@

41846

gc.dispose ();

41847

}

41848

if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {

41849

- int /*long*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));

41850

+ long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));

41851

GtkCellRendererClass klass = new GtkCellRendererClass ();

41852

OS.memmove (klass, g_class);

41853

if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {

41854

@@ -2656,7 +2656,7 @@

41855

if (OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {

41856

if (hooks (SWT.PaintItem)) {

41857

GdkRectangle rect = new GdkRectangle ();

41858

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

41859

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

41860

OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);

41861

OS.gtk_tree_path_free (path);

41862

ignoreSize = true;

41863

@@ -2707,8 +2707,8 @@

41864

for (int i=0; i<end; i++) {

41865

boolean customDraw = columnCount != 0 ? columns [i].customDraw : firstCustomDraw;

41866

if (customDraw) {

41867

- int /*long*/ column = OS.gtk_tree_view_get_column (handle, i);

41868

- int /*long*/ textRenderer = getTextRenderer (column);

41869

+ long /*int*/ column = OS.gtk_tree_view_get_column (handle, i);

41870

+ long /*int*/ textRenderer = getTextRenderer (column);

41871

OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, 0, 0, 0);

41872

if (columnCount != 0) columns [i].customDraw = false;

41873

}

41874

@@ -2732,12 +2732,12 @@

41875

checkWidget();

41876

if (!(0 <= index && index < itemCount)) return;

41877

boolean fixColumn = showFirstColumn ();

41878

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41879

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41880

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41881

TableItem item = _getItem (index);

41882

OS.gtk_tree_selection_select_iter (selection, item.handle);

41883

if ((style & SWT.SINGLE) != 0) {

41884

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

41885

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

41886

OS.gtk_tree_view_set_cursor (handle, path, 0, false);

41887

OS.gtk_tree_path_free (path);

41888

}

41889

@@ -2775,13 +2775,13 @@

41890

start = Math.max (0, start);

41891

end = Math.min (end, itemCount - 1);

41892

boolean fixColumn = showFirstColumn ();

41893

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41894

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41895

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41896

for (int index=start; index<=end; index++) {

41897

TableItem item = _getItem (index);

41898

OS.gtk_tree_selection_select_iter (selection, item.handle);

41899

if ((style & SWT.SINGLE) != 0) {

41900

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

41901

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

41902

OS.gtk_tree_view_set_cursor (handle, path, 0, false);

41903

OS.gtk_tree_path_free (path);

41904

}

41905

@@ -2819,7 +2819,7 @@

41906

int length = indices.length;

41907

if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;

41908

boolean fixColumn = showFirstColumn ();

41909

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41910

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41911

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41912

for (int i=0; i<length; i++) {

41913

int index = indices [i];

41914

@@ -2827,7 +2827,7 @@

41915

TableItem item = _getItem (index);

41916

OS.gtk_tree_selection_select_iter (selection, item.handle);

41917

if ((style & SWT.SINGLE) != 0) {

41918

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

41919

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

41920

OS.gtk_tree_view_set_cursor (handle, path, 0, false);

41921

OS.gtk_tree_path_free (path);

41922

}

41923

@@ -2851,7 +2851,7 @@

41924

checkWidget();

41925

if ((style & SWT.SINGLE) != 0) return;

41926

boolean fixColumn = showFirstColumn ();

41927

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41928

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41929

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41930

OS.gtk_tree_selection_select_all (selection);

41931

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41932

@@ -2866,8 +2866,8 @@

41933

*/

41934

if (!(0 <= index && index < itemCount)) return;

41935

TableItem item = _getItem (index);

41936

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

41937

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

41938

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

41939

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

41940

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

41941

OS.gtk_tree_view_set_cursor (handle, path, 0, false);

41942

/*

41943

@@ -2889,9 +2889,9 @@

41944

OS.gtk_widget_modify_base (handle, 0, color);

41945

}

41946

41947

-void setBackgroundPixmap (int /*long*/ pixmap) {

41948

+void setBackgroundPixmap (long /*int*/ pixmap) {

41949

super.setBackgroundPixmap (pixmap);

41950

- int /*long*/ window = paintWindow ();

41951

+ long /*int*/ window = paintWindow ();

41952

if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, true);

41953

}

41954

41955

@@ -2955,13 +2955,13 @@

41956

seen [index] = true;

41957

}

41958

for (int i=0; i<order.length; i++) {

41959

- int /*long*/ column = columns [order [i]].handle;

41960

- int /*long*/ baseColumn = i == 0 ? 0 : columns [order [i-1]].handle;

41961

+ long /*int*/ column = columns [order [i]].handle;

41962

+ long /*int*/ baseColumn = i == 0 ? 0 : columns [order [i-1]].handle;

41963

OS.gtk_tree_view_move_column_after (handle, column, baseColumn);

41964

}

41965

}

41966

41967

-void setFontDescription (int /*long*/ font) {

41968

+void setFontDescription (long /*int*/ font) {

41969

super.setFontDescription (font);

41970

TableColumn[] columns = getColumns ();

41971

for (int i = 0; i < columns.length; i++) {

41972

@@ -3016,7 +3016,7 @@

41973

System.arraycopy (items, 0, newItems, 0, itemCount);

41974

items = newItems;

41975

if (isVirtual) {

41976

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

41977

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

41978

if (iter == 0) error (SWT.ERROR_NO_HANDLES);

41979

if (fixAccessibility ()) {

41980

ignoreAccessibility = true;

41981

@@ -3065,12 +3065,12 @@

41982

41983

void setParentBackground () {

41984

super.setParentBackground ();

41985

- int /*long*/ window = paintWindow ();

41986

+ long /*int*/ window = paintWindow ();

41987

if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, true);

41988

}

41989

41990

-void setParentWindow (int /*long*/ widget) {

41991

- int /*long*/ window = eventWindow ();

41992

+void setParentWindow (long /*int*/ widget) {

41993

+ long /*int*/ window = eventWindow ();

41994

OS.gtk_widget_set_parent_window (widget, window);

41995

}

41996

41997

@@ -3088,7 +3088,7 @@

41998

}

41999

}

42000

42001

-void setScrollWidth (int /*long*/ column, TableItem item) {

42002

+void setScrollWidth (long /*int*/ column, TableItem item) {

42003

if (columnCount != 0 || currentItem == item) return;

42004

/*

42005

* Use GTK_TREE_VIEW_COLUMN_GROW_ONLY on GTK versions < 2.3.2

42006

@@ -3345,7 +3345,7 @@

42007

public void setTopIndex (int index) {

42008

checkWidget();

42009

if (!(0 <= index && index < itemCount)) return;

42010

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, _getItem (index).handle);

42011

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, _getItem (index).handle);

42012

OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f);

42013

if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {

42014

/*

42015

@@ -3419,10 +3419,10 @@

42016

*/

42017

int columnCount = Math.max (1, this.columnCount);

42018

for (int i=0; i<columnCount; i++) {

42019

- int /*long*/ column = OS.gtk_tree_view_get_column (handle, i);

42020

+ long /*int*/ column = OS.gtk_tree_view_get_column (handle, i);

42021

if (OS.gtk_tree_view_column_get_visible (column)) return false;

42022

}

42023

- int /*long*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);

42024

+ long /*int*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);

42025

OS.gtk_tree_view_column_set_visible (firstColumn, true);

42026

return true;

42027

}

42028

@@ -3453,8 +3453,8 @@

42029

showItem (item.handle);

42030

}

42031

42032

-void showItem (int /*long*/ iter) {

42033

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

42034

+void showItem (long /*int*/ iter) {

42035

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

42036

/*

42037

* This code intentionally commented.

42038

* Bug in GTK. According to the documentation, gtk_tree_view_scroll_to_cell

42039

@@ -3507,9 +3507,9 @@

42040

showItem (item.handle);

42041

}

42042

42043

-int /*long*/ treeSelectionProc (int /*long*/ model, int /*long*/ path, int /*long*/ iter, int[] selection, int length) {

42044

+long /*int*/ treeSelectionProc (long /*int*/ model, long /*int*/ path, long /*int*/ iter, int[] selection, int length) {

42045

if (selection != null) {

42046

- int /*long*/ indices = OS.gtk_tree_path_get_indices (path);

42047

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path);

42048

if (indices != 0) {

42049

int [] index = new int [1];

42050

OS.memmove (index, indices, 4);

42051

@@ -3528,12 +3528,12 @@

42052

* The fix is to queue a resize event for each child to

42053

* force the position to be corrected.

42054

*/

42055

- int /*long*/ parentHandle = parentingHandle ();

42056

- int /*long*/ list = OS.gtk_container_get_children (parentHandle);

42057

+ long /*int*/ parentHandle = parentingHandle ();

42058

+ long /*int*/ list = OS.gtk_container_get_children (parentHandle);

42059

if (list == 0) return;

42060

- int /*long*/ temp = list;

42061

+ long /*int*/ temp = list;

42062

while (temp != 0) {

42063

- int /*long*/ widget = OS.g_list_data (temp);

42064

+ long /*int*/ widget = OS.g_list_data (temp);

42065

if (widget != 0) OS.gtk_widget_queue_resize (widget);

42066

temp = OS.g_list_next (temp);

42067

}

42068

diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Text.java

42069

--- x86/org/eclipse/swt/widgets/Text.java 2009-05-29 17:30:04.000000000 -0400

42070

+++ x86_64/org/eclipse/swt/widgets/Text.java 2009-09-17 08:48:24.000000000 -0400

42071

@@ -56,9 +56,9 @@

42072

* @noextend This class is not intended to be subclassed by clients.

42073

*/

42074

public class Text extends Scrollable {

42075

- int /*long*/ bufferHandle;

42076

+ long /*int*/ bufferHandle;

42077

int tabs = 8, lastEventTime = 0;

42078

- int /*long*/ gdkEventKey = 0;

42079

+ long /*int*/ gdkEventKey = 0;

42080

int fixStart = -1, fixEnd = -1;

42081

boolean doubleClick;

42082

String message = "";

42083

@@ -325,7 +325,7 @@

42084

OS.gtk_text_buffer_get_end_iter (bufferHandle, position);

42085

OS.gtk_text_buffer_insert (bufferHandle, position, buffer, buffer.length);

42086

OS.gtk_text_buffer_place_cursor (bufferHandle, position);

42087

- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42088

+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42089

OS.gtk_text_view_scroll_mark_onscreen (handle, mark);

42090

}

42091

}

42092

@@ -345,8 +345,8 @@

42093

OS.gtk_editable_select_region (handle, position, position);

42094

} else {

42095

byte [] position = new byte [ITER_SIZEOF];

42096

- int /*long*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle);

42097

- int /*long*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);

42098

+ long /*int*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle);

42099

+ long /*int*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);

42100

OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, insertMark);

42101

OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, position);

42102

OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, position);

42103

@@ -360,13 +360,13 @@

42104

int[] w = new int [1], h = new int [1];

42105

if ((style & SWT.SINGLE) != 0) {

42106

OS.gtk_widget_realize (handle);

42107

- int /*long*/ layout = OS.gtk_entry_get_layout (handle);

42108

+ long /*int*/ layout = OS.gtk_entry_get_layout (handle);

42109

OS.pango_layout_get_size (layout, w, h);

42110

} else {

42111

byte [] start = new byte [ITER_SIZEOF], end = new byte [ITER_SIZEOF];

42112

OS.gtk_text_buffer_get_bounds (bufferHandle, start, end);

42113

- int /*long*/ text = OS.gtk_text_buffer_get_text (bufferHandle, start, end, true);

42114

- int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, text);

42115

+ long /*int*/ text = OS.gtk_text_buffer_get_text (bufferHandle, start, end, true);

42116

+ long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, text);

42117

OS.g_free (text);

42118

OS.pango_layout_set_width (layout, wHint * OS.PANGO_SCALE);

42119

OS.pango_layout_get_size (layout, w, h);

42120

@@ -376,7 +376,7 @@

42121

int height = OS.PANGO_PIXELS (h [0]);

42122

if ((style & SWT.SINGLE) != 0 && message.length () > 0) {

42123

byte [] buffer = Converter.wcsToMbcs (null, message, true);

42124

- int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);

42125

+ long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);

42126

OS.pango_layout_get_size (layout, w, h);

42127

OS.g_object_unref (layout);

42128

width = Math.max (width, OS.PANGO_PIXELS (w [0]));

42129

@@ -395,7 +395,7 @@

42130

int xborder = 0, yborder = 0;

42131

if ((style & SWT.SINGLE) != 0) {

42132

if ((style & SWT.BORDER) != 0) {

42133

- int /*long*/ style = OS.gtk_widget_get_style (handle);

42134

+ long /*int*/ style = OS.gtk_widget_get_style (handle);

42135

xborder += OS.gtk_style_get_xthickness (style);

42136

yborder += OS.gtk_style_get_ythickness (style);

42137

}

42138

@@ -440,7 +440,7 @@

42139

if ((style & SWT.SINGLE) != 0) {

42140

OS.gtk_editable_copy_clipboard (handle);

42141

} else {

42142

- int /*long*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);

42143

+ long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);

42144

OS.gtk_text_buffer_copy_clipboard (bufferHandle, clipboard);

42145

}

42146

}

42147

@@ -462,7 +462,7 @@

42148

if ((style & SWT.SINGLE) != 0) {

42149

OS.gtk_editable_cut_clipboard (handle);

42150

} else {

42151

- int /*long*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);

42152

+ long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);

42153

OS.gtk_text_buffer_cut_clipboard (bufferHandle, clipboard, OS.gtk_text_view_get_editable (handle));

42154

}

42155

}

42156

@@ -470,7 +470,7 @@

42157

void deregister () {

42158

super.deregister ();

42159

if (bufferHandle != 0) display.removeWidget (bufferHandle);

42160

- int /*long*/ imContext = imContext ();

42161

+ long /*int*/ imContext = imContext ();

42162

if (imContext != 0) display.removeWidget (imContext);

42163

}

42164

42165

@@ -498,9 +498,9 @@

42166

if ((style & SWT.SINGLE) != 0) {

42167

int [] index = new int [1];

42168

int [] trailing = new int [1];

42169

- int /*long*/ layout = OS.gtk_entry_get_layout (handle);

42170

+ long /*int*/ layout = OS.gtk_entry_get_layout (handle);

42171

OS.pango_layout_xy_to_index (layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, trailing);

42172

- int /*long*/ ptr = OS.pango_layout_get_text (layout);

42173

+ long /*int*/ ptr = OS.pango_layout_get_text (layout);

42174

position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];

42175

} else {

42176

byte [] p = new byte [ITER_SIZEOF];

42177

@@ -519,15 +519,15 @@

42178

return super.dragDetect (x, y, filter, consume);

42179

}

42180

42181

-int /*long*/ eventWindow () {

42182

+long /*int*/ eventWindow () {

42183

return paintWindow ();

42184

}

42185

42186

-boolean filterKey (int keyval, int /*long*/ event) {

42187

+boolean filterKey (int keyval, long /*int*/ event) {

42188

int time = OS.gdk_event_get_time (event);

42189

if (time != lastEventTime) {

42190

lastEventTime = time;

42191

- int /*long*/ imContext = imContext ();

42192

+ long /*int*/ imContext = imContext ();

42193

if (imContext != 0) {

42194

return OS.gtk_im_context_filter_keypress (imContext, event);

42195

}

42196

@@ -546,7 +546,7 @@

42197

* filter has to be called by SWT.

42198

*/

42199

if (gdkEventKey != 0 && gdkEventKey != -1) {

42200

- int /*long*/ imContext = imContext ();

42201

+ long /*int*/ imContext = imContext ();

42202

if (imContext != 0) {

42203

OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);

42204

gdkEventKey = -1;

42205

@@ -563,7 +563,7 @@

42206

public int getBorderWidth () {

42207

checkWidget();

42208

if ((style & SWT.MULTI) != 0) return super.getBorderWidth ();

42209

- int /*long*/ style = OS.gtk_widget_get_style (handle);

42210

+ long /*int*/ style = OS.gtk_widget_get_style (handle);

42211

if ((this.style & SWT.BORDER) != 0) {

42212

return OS.gtk_style_get_xthickness (style);

42213

}

42214

@@ -587,7 +587,7 @@

42215

checkWidget ();

42216

if ((style & SWT.SINGLE) != 0) return 0;

42217

byte [] position = new byte [ITER_SIZEOF];

42218

- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42219

+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42220

OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);

42221

return OS.gtk_text_iter_get_line (position);

42222

}

42223

@@ -615,7 +615,7 @@

42224

}

42225

int [] offset_x = new int [1], offset_y = new int [1];

42226

OS.gtk_entry_get_layout_offsets (handle, offset_x, offset_y);

42227

- int /*long*/ layout = OS.gtk_entry_get_layout (handle);

42228

+ long /*int*/ layout = OS.gtk_entry_get_layout (handle);

42229

PangoRectangle pos = new PangoRectangle ();

42230

OS.pango_layout_index_to_pos (layout, index, pos);

42231

int x = offset_x [0] + OS.PANGO_PIXELS (pos.x) - getBorderWidth ();

42232

@@ -623,7 +623,7 @@

42233

return new Point (x, y);

42234

}

42235

byte [] position = new byte [ITER_SIZEOF];

42236

- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42237

+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42238

OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);

42239

GdkRectangle rect = new GdkRectangle ();

42240

OS.gtk_text_view_get_iter_location (handle, position, rect);

42241

@@ -652,7 +652,7 @@

42242

return OS.gtk_editable_get_position (handle);

42243

}

42244

byte [] position = new byte [ITER_SIZEOF];

42245

- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42246

+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42247

OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);

42248

return OS.gtk_text_iter_get_offset (position);

42249

}

42250

@@ -670,7 +670,7 @@

42251

public int getCharCount () {

42252

checkWidget ();

42253

if ((style & SWT.SINGLE) != 0) {

42254

- int /*long*/ ptr = OS.gtk_entry_get_text (handle);

42255

+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);

42256

return (int)/*64*/OS.g_utf8_strlen (ptr, -1);

42257

}

42258

return OS.gtk_text_buffer_get_char_count (bufferHandle);

42259

@@ -839,9 +839,9 @@

42260

if ((style & SWT.SINGLE) != 0) {

42261

int [] index = new int [1];

42262

int [] trailing = new int [1];

42263

- int /*long*/ layout = OS.gtk_entry_get_layout (handle);

42264

+ long /*int*/ layout = OS.gtk_entry_get_layout (handle);

42265

OS.pango_layout_xy_to_index (layout, point.x * OS.PANGO_SCALE, point.y * OS.PANGO_SCALE, index, trailing);

42266

- int /*long*/ ptr = OS.pango_layout_get_text (layout);

42267

+ long /*int*/ ptr = OS.pango_layout_get_text (layout);

42268

position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];

42269

} else {

42270

byte [] p = new byte [ITER_SIZEOF];

42271

@@ -937,7 +937,7 @@

42272

42273

int getTabWidth (int tabs) {

42274

byte[] buffer = Converter.wcsToMbcs(null, " ", true);

42275

- int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);

42276

+ long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);

42277

int [] width = new int [1];

42278

int [] height = new int [1];

42279

OS.pango_layout_get_size (layout, width, height);

42280

@@ -961,7 +961,7 @@

42281

*/

42282

public String getText () {

42283

checkWidget ();

42284

- int /*long*/ address;

42285

+ long /*int*/ address;

42286

if ((style & SWT.SINGLE) != 0) {

42287

address = OS.gtk_entry_get_text (handle);

42288

} else {

42289

@@ -999,7 +999,7 @@

42290

public String getText (int start, int end) {

42291

checkWidget ();

42292

if (!(start <= end && 0 <= end)) return "";

42293

- int /*long*/ address;

42294

+ long /*int*/ address;

42295

if ((style & SWT.SINGLE) != 0) {

42296

start = Math.max (0, start);

42297

address = OS.gtk_editable_get_chars (handle, start, end + 1);

42298

@@ -1100,13 +1100,13 @@

42299

return lineTop [0];

42300

}

42301

42302

-int /*long*/ gtk_activate (int /*long*/ widget) {

42303

+long /*int*/ gtk_activate (long /*int*/ widget) {

42304

postEvent (SWT.DefaultSelection);

42305

return 0;

42306

}

42307

42308

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

42309

- int /*long*/ result = super.gtk_button_press_event (widget, event);

42310

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

42311

+ long /*int*/ result = super.gtk_button_press_event (widget, event);

42312

if (result != 0) return result;

42313

GdkEventButton gdkEvent = new GdkEventButton ();

42314

OS.memmove (gdkEvent, event, GdkEventButton.sizeof);

42315

@@ -1121,7 +1121,7 @@

42316

}

42317

42318

42319

-int /*long*/ gtk_changed (int /*long*/ widget) {

42320

+long /*int*/ gtk_changed (long /*int*/ widget) {

42321

/*

42322

* Feature in GTK. When the user types, GTK positions

42323

* the caret after sending the changed signal. This

42324

@@ -1130,7 +1130,7 @@

42325

* is to post the modify event when the user is typing.

42326

*/

42327

boolean keyPress = false;

42328

- int /*long*/ eventPtr = OS.gtk_get_current_event ();

42329

+ long /*int*/ eventPtr = OS.gtk_get_current_event ();

42330

if (eventPtr != 0) {

42331

GdkEventKey gdkEvent = new GdkEventKey ();

42332

OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);

42333

@@ -1149,7 +1149,7 @@

42334

return 0;

42335

}

42336

42337

-int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) {

42338

+long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {

42339

if (text == 0) return 0;

42340

if ((style & SWT.SINGLE) != 0) {

42341

if (!OS.gtk_editable_get_editable (handle)) return 0;

42342

@@ -1191,7 +1191,7 @@

42343

return 0;

42344

}

42345

42346

-int /*long*/ gtk_delete_range (int /*long*/ widget, int /*long*/ iter1, int /*long*/ iter2) {

42347

+long /*int*/ gtk_delete_range (long /*int*/ widget, long /*int*/ iter1, long /*int*/ iter2) {

42348

if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;

42349

byte [] startIter = new byte [ITER_SIZEOF];

42350

byte [] endIter = new byte [ITER_SIZEOF];

42351

@@ -1227,7 +1227,7 @@

42352

return 0;

42353

}

42354

42355

-int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /*long*/ end_pos) {

42356

+long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) {

42357

if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;

42358

String newText = verifyText ("", (int)/*64*/start_pos, (int)/*64*/end_pos);

42359

if (newText == null) {

42360

@@ -1255,7 +1255,7 @@

42361

return 0;

42362

}

42363

42364

-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {

42365

+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {

42366

if (cursor != null) setCursor (cursor.handle);

42367

/*

42368

* Feature in GTK. The gtk-entry-select-on-focus property is a global

42369

@@ -1271,7 +1271,7 @@

42370

GdkEventFocus gdkEventFocus = new GdkEventFocus ();

42371

OS.memmove (gdkEventFocus, gdkEvent, GdkEventFocus.sizeof);

42372

if (gdkEventFocus.in == 0) {

42373

- int /*long*/ settings = OS.gtk_settings_get_default ();

42374

+ long /*int*/ settings = OS.gtk_settings_get_default ();

42375

OS.g_object_set (settings, OS.gtk_entry_select_on_focus, true, 0);

42376

}

42377

break;

42378

@@ -1280,29 +1280,29 @@

42379

return super.gtk_event_after (widget, gdkEvent);

42380

}

42381

42382

-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) {

42383

+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) {

42384

if ((state & OBSCURED) != 0) return 0;

42385

- int /*long*/ result = super.gtk_expose_event (widget, event);

42386

+ long /*int*/ result = super.gtk_expose_event (widget, event);

42387

if ((style & SWT.SINGLE) != 0 && message.length () > 0) {

42388

- int /*long*/ str = OS.gtk_entry_get_text (handle);

42389

+ long /*int*/ str = OS.gtk_entry_get_text (handle);

42390

if (!OS.GTK_WIDGET_HAS_FOCUS (handle) && OS.strlen (str) == 0) {

42391

GdkEventExpose gdkEvent = new GdkEventExpose ();

42392

OS.memmove (gdkEvent, event, GdkEventExpose.sizeof);

42393

- int /*long*/ window = paintWindow ();

42394

+ long /*int*/ window = paintWindow ();

42395

int [] w = new int [1], h = new int [1];

42396

OS.gdk_drawable_get_size (window, w, h);

42397

GtkBorder innerBorder = Display.getEntryInnerBorder (handle);

42398

int width = w [0] - innerBorder.left - innerBorder.right;

42399

int height = h [0] - innerBorder.top - innerBorder.bottom;

42400

- int /*long*/ context = OS.gtk_widget_get_pango_context (handle);

42401

- int /*long*/ lang = OS.pango_context_get_language (context);

42402

- int /*long*/ metrics = OS.pango_context_get_metrics (context, getFontDescription (), lang);

42403

+ long /*int*/ context = OS.gtk_widget_get_pango_context (handle);

42404

+ long /*int*/ lang = OS.pango_context_get_language (context);

42405

+ long /*int*/ metrics = OS.pango_context_get_metrics (context, getFontDescription (), lang);

42406

int ascent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_ascent (metrics));

42407

int descent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_descent (metrics));

42408

OS.pango_font_metrics_unref (metrics);

42409

byte [] buffer = Converter.wcsToMbcs (null, message, true);

42410

- int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);

42411

- int /*long*/ line = OS.pango_layout_get_line (layout, 0);

42412

+ long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);

42413

+ long /*int*/ line = OS.pango_layout_get_line (layout, 0);

42414

PangoRectangle rect = new PangoRectangle ();

42415

OS.pango_layout_line_get_extents (line, null, rect);

42416

rect.y = OS.PANGO_PIXELS (rect.y);

42417

@@ -1325,8 +1325,8 @@

42418

case SWT.CENTER: x = (width - rect.width) / 2; break;

42419

case SWT.RIGHT: x = rtl ? innerBorder.left : width - rect.width; break;

42420

}

42421

- int /*long*/ gc = OS.gdk_gc_new (window);

42422

- int /*long*/ style = OS.gtk_widget_get_style (handle);

42423

+ long /*int*/ gc = OS.gdk_gc_new (window);

42424

+ long /*int*/ style = OS.gtk_widget_get_style (handle);

42425

GdkColor textColor = new GdkColor ();

42426

OS.gtk_style_get_text (style, OS.GTK_STATE_INSENSITIVE, textColor);

42427

GdkColor baseColor = new GdkColor ();

42428

@@ -1339,13 +1339,13 @@

42429

return result;

42430

}

42431

42432

-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {

42433

+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {

42434

fixIM ();

42435

return super.gtk_focus_out_event (widget, event);

42436

}

42437

42438

-int /*long*/ gtk_grab_focus (int /*long*/ widget) {

42439

- int /*long*/ result = super.gtk_grab_focus (widget);

42440

+long /*int*/ gtk_grab_focus (long /*int*/ widget) {

42441

+ long /*int*/ result = super.gtk_grab_focus (widget);

42442

/*

42443

* Feature in GTK. GtkEntry widgets select their text on focus in,

42444

* clearing the previous selection. This behavior is controlled by

42445

@@ -1354,13 +1354,13 @@

42446

* the entry has done focus in processing.

42447

*/

42448

if ((style & SWT.SINGLE) != 0 && display.entrySelectOnFocus) {

42449

- int /*long*/ settings = OS.gtk_settings_get_default ();

42450

+ long /*int*/ settings = OS.gtk_settings_get_default ();

42451

OS.g_object_set (settings, OS.gtk_entry_select_on_focus, false, 0);

42452

}

42453

return result;

42454

}

42455

42456

-int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*long*/ new_text_length, int /*long*/ position) {

42457

+long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /*int*/ new_text_length, long /*int*/ position) {

42458

if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;

42459

if (new_text == 0 || new_text_length == 0) return 0;

42460

byte [] buffer = new byte [(int)/*64*/new_text_length];

42461

@@ -1369,7 +1369,7 @@

42462

int [] pos = new int [1];

42463

OS.memmove (pos, position, 4);

42464

if (pos [0] == -1) {

42465

- int /*long*/ ptr = OS.gtk_entry_get_text (handle);

42466

+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);

42467

pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);

42468

}

42469

/* Use the selection when the text was deleted */

42470

@@ -1408,15 +1408,15 @@

42471

return 0;

42472

}

42473

42474

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {

42475

- int /*long*/ result = super.gtk_key_press_event (widget, event);

42476

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {

42477

+ long /*int*/ result = super.gtk_key_press_event (widget, event);

42478

if (result != 0) fixIM ();

42479

if (gdkEventKey == -1) result = 1;

42480

gdkEventKey = 0;

42481

return result;

42482

}

42483

42484

-int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) {

42485

+long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) {

42486

if ((style & SWT.RIGHT_TO_LEFT) != 0) {

42487

OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);

42488

OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);

42489

@@ -1424,7 +1424,7 @@

42490

return 0;

42491

}

42492

42493

-int /*long*/ gtk_text_buffer_insert_text (int /*long*/ widget, int /*long*/ iter, int /*long*/ text, int /*long*/ length) {

42494

+long /*int*/ gtk_text_buffer_insert_text (long /*int*/ widget, long /*int*/ iter, long /*int*/ text, long /*int*/ length) {

42495

if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;

42496

byte [] position = new byte [ITER_SIZEOF];

42497

OS.memmove (position, iter, position.length);

42498

@@ -1468,7 +1468,7 @@

42499

OS.g_signal_connect_closure (bufferHandle, OS.delete_range, display.closures [DELETE_RANGE], false);

42500

OS.g_signal_connect_closure (handle, OS.populate_popup, display.closures [POPULATE_POPUP], false);

42501

}

42502

- int /*long*/ imContext = imContext ();

42503

+ long /*int*/ imContext = imContext ();

42504

if (imContext != 0) {

42505

OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false);

42506

int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());

42507

@@ -1477,7 +1477,7 @@

42508

}

42509

}

42510

42511

-int /*long*/ imContext () {

42512

+long /*int*/ imContext () {

42513

if ((style & SWT.SINGLE) != 0) {

42514

return OS.gtk_editable_get_editable (handle) ? OS.GTK_ENTRY_IM_CONTEXT (handle) : 0;

42515

}

42516

@@ -1518,15 +1518,15 @@

42517

}

42518

OS.gtk_text_buffer_insert (bufferHandle, start, buffer, buffer.length);

42519

OS.gtk_text_buffer_place_cursor (bufferHandle, start);

42520

- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42521

+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42522

OS.gtk_text_view_scroll_mark_onscreen (handle, mark);

42523

}

42524

}

42525

42526

-int /*long*/ paintWindow () {

42527

+long /*int*/ paintWindow () {

42528

if ((style & SWT.SINGLE) != 0) {

42529

- int /*long*/ window = super.paintWindow ();

42530

- int /*long*/ children = OS.gdk_window_get_children (window);

42531

+ long /*int*/ window = super.paintWindow ();

42532

+ long /*int*/ children = OS.gdk_window_get_children (window);

42533

if (children != 0) window = OS.g_list_data (children);

42534

OS.g_list_free (children);

42535

return window;

42536

@@ -1552,7 +1552,7 @@

42537

if ((style & SWT.SINGLE) != 0) {

42538

OS.gtk_editable_paste_clipboard (handle);

42539

} else {

42540

- int /*long*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);

42541

+ long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);

42542

OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (handle));

42543

}

42544

}

42545

@@ -1560,7 +1560,7 @@

42546

void register () {

42547

super.register ();

42548

if (bufferHandle != 0) display.addWidget (bufferHandle, this);

42549

- int /*long*/ imContext = imContext ();

42550

+ long /*int*/ imContext = imContext ();

42551

if (imContext != 0) display.addWidget (imContext, this);

42552

}

42553

42554

@@ -1575,7 +1575,7 @@

42555

* it around until ownership of the clipboard is lost.

42556

*/

42557

if ((style & SWT.MULTI) != 0) {

42558

- int /*long*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);

42559

+ long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);

42560

OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (handle));

42561

}

42562

}

42563

@@ -1672,8 +1672,8 @@

42564

byte [] end = new byte [ITER_SIZEOF];

42565

OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, start, 0);

42566

OS.gtk_text_buffer_get_end_iter (bufferHandle, end);

42567

- int /*long*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle);

42568

- int /*long*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);

42569

+ long /*int*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle);

42570

+ long /*int*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);

42571

OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, start);

42572

OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, end);

42573

}

42574

@@ -1684,8 +1684,8 @@

42575

OS.gtk_widget_modify_base (handle, 0, color);

42576

}

42577

42578

-void setCursor (int /*long*/ cursor) {

42579

- int /*long*/ defaultCursor = 0;

42580

+void setCursor (long /*int*/ cursor) {

42581

+ long /*int*/ defaultCursor = 0;

42582

if (cursor == 0) defaultCursor = OS.gdk_cursor_new (OS.GDK_XTERM);

42583

super.setCursor (cursor != 0 ? cursor : defaultCursor);

42584

if (cursor == 0) OS.gdk_cursor_destroy (defaultCursor);

42585

@@ -1764,7 +1764,7 @@

42586

}

42587

}

42588

42589

-void setFontDescription (int /*long*/ font) {

42590

+void setFontDescription (long /*int*/ font) {

42591

super.setFontDescription (font);

42592

setTabStops (tabs);

42593

}

42594

@@ -1847,7 +1847,7 @@

42595

byte [] position = new byte [ITER_SIZEOF];

42596

OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, position, start);

42597

OS.gtk_text_buffer_place_cursor (bufferHandle, position);

42598

- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42599

+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42600

OS.gtk_text_view_scroll_mark_onscreen (handle, mark);

42601

}

42602

}

42603

@@ -1887,8 +1887,8 @@

42604

byte [] endIter = new byte [ITER_SIZEOF];

42605

OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start);

42606

OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, endIter, end);

42607

- int /*long*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle);

42608

- int /*long*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);

42609

+ long /*int*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle);

42610

+ long /*int*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);

42611

OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, startIter);

42612

OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, endIter);

42613

}

42614

@@ -1954,7 +1954,7 @@

42615

void setTabStops (int tabs) {

42616

if ((style & SWT.SINGLE) != 0) return;

42617

int tabWidth = getTabWidth (tabs);

42618

- int /*long*/ tabArray = OS.pango_tab_array_new (1, false);

42619

+ long /*int*/ tabArray = OS.pango_tab_array_new (1, false);

42620

OS.pango_tab_array_set_tab (tabArray, 0, OS.PANGO_TAB_LEFT, tabWidth);

42621

OS.gtk_text_view_set_tabs (handle, tabArray);

42622

OS.pango_tab_array_free (tabArray);

42623

@@ -2008,7 +2008,7 @@

42624

OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT);

42625

OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, position, 0);

42626

OS.gtk_text_buffer_place_cursor (bufferHandle, position);

42627

- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42628

+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42629

OS.gtk_text_view_scroll_mark_onscreen (handle, mark);

42630

}

42631

sendEvent (SWT.Modify);

42632

@@ -2080,7 +2080,7 @@

42633

public void showSelection () {

42634

checkWidget ();

42635

if ((style & SWT.SINGLE) != 0) return;

42636

- int /*long*/ mark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);

42637

+ long /*int*/ mark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);

42638

OS.gtk_text_view_scroll_mark_onscreen (handle, mark);

42639

mark = OS.gtk_text_buffer_get_insert (bufferHandle);

42640

OS.gtk_text_view_scroll_mark_onscreen (handle, mark);

42641

@@ -2091,9 +2091,9 @@

42642

switch (key) {

42643

case OS.GDK_KP_Enter:

42644

case OS.GDK_Return: {

42645

- int /*long*/ imContext = imContext ();

42646

+ long /*int*/ imContext = imContext ();

42647

if (imContext != 0) {

42648

- int /*long*/ [] preeditString = new int /*long*/ [1];

42649

+ long /*int*/ [] preeditString = new long /*int*/ [1];

42650

OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);

42651

if (preeditString [0] != 0) {

42652

int length = OS.strlen (preeditString [0]);

42653

@@ -2127,7 +2127,7 @@

42654

event.text = string;

42655

event.start = start;

42656

event.end = end;

42657

- int /*long*/ eventPtr = OS.gtk_get_current_event ();

42658

+ long /*int*/ eventPtr = OS.gtk_get_current_event ();

42659

if (eventPtr != 0) {

42660

GdkEventKey gdkEvent = new GdkEventKey ();

42661

OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);

42662

diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widgets/ToolBar.java

42663

--- x86/org/eclipse/swt/widgets/ToolBar.java 2009-05-29 17:30:04.000000000 -0400

42664

+++ x86_64/org/eclipse/swt/widgets/ToolBar.java 2009-09-17 08:48:24.000000000 -0400

42665

@@ -188,11 +188,11 @@

42666

return result;

42667

}

42668

42669

-int /*long*/ eventHandle () {

42670

+long /*int*/ eventHandle () {

42671

return fixedHandle;

42672

}

42673

42674

-int /*long*/ enterExitHandle() {

42675

+long /*int*/ enterExitHandle() {

42676

return handle;

42677

}

42678

42679

@@ -210,7 +210,7 @@

42680

}

42681

}

42682

42683

-boolean forceFocus (int /*long*/ focusHandle) {

42684

+boolean forceFocus (long /*int*/ focusHandle) {

42685

if (lastFocus != null && lastFocus.setFocus ()) return true;

42686

ToolItem [] items = getItems ();

42687

for (int i = 0; i < items.length; i++) {

42688

@@ -279,7 +279,7 @@

42689

*/

42690

public int getItemCount () {

42691

checkWidget();

42692

- int /*long*/ list = OS.gtk_container_get_children (handle);

42693

+ long /*int*/ list = OS.gtk_container_get_children (handle);

42694

if (list == 0) return 0;

42695

int itemCount = OS.g_list_length (list);

42696

OS.g_list_free (list);

42697

@@ -308,13 +308,13 @@

42698

}

42699

42700

ToolItem [] _getItems () {

42701

- int /*long*/ list = OS.gtk_container_get_children (handle);

42702

+ long /*int*/ list = OS.gtk_container_get_children (handle);

42703

if (list == 0) return new ToolItem [0];

42704

int count = OS.g_list_length (list);

42705

ToolItem [] items = new ToolItem [count];

42706

int index = 0;

42707

for (int i=0; i<count; i++) {

42708

- int /*long*/ data = OS.g_list_nth_data (list, i);

42709

+ long /*int*/ data = OS.g_list_nth_data (list, i);

42710

Widget widget = display.getWidget (data);

42711

if (widget != null) items [index++] = (ToolItem) widget;

42712

}

42713

@@ -364,9 +364,9 @@

42714

return tabItemList;

42715

}

42716

42717

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {

42718

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) {

42719

if (!hasFocus ()) return 0;

42720

- int /*long*/ result = super.gtk_key_press_event (widget, eventPtr);

42721

+ long /*int*/ result = super.gtk_key_press_event (widget, eventPtr);

42722

if (result != 0) return result;

42723

ToolItem [] items = getItems ();

42724

int length = items.length;

42725

@@ -387,7 +387,7 @@

42726

if ((item.style & SWT.DROP_DOWN) != 0) {

42727

Event event = new Event ();

42728

event.detail = SWT.ARROW;

42729

- int /*long*/ topHandle = item.topHandle ();

42730

+ long /*int*/ topHandle = item.topHandle ();

42731

event.x = OS.GTK_WIDGET_X (topHandle);

42732

event.y = OS.GTK_WIDGET_Y (topHandle) + OS.GTK_WIDGET_HEIGHT (topHandle);

42733

if ((style & SWT.MIRRORED) != 0) event.x = getClientWidth() - OS.GTK_WIDGET_WIDTH(topHandle) - event.x;

42734

@@ -449,7 +449,7 @@

42735

boolean mnemonicHit (char key) {

42736

ToolItem [] items = getItems ();

42737

for (int i=0; i<items.length; i++) {

42738

- int /*long*/ labelHandle = items [i].labelHandle;

42739

+ long /*int*/ labelHandle = items [i].labelHandle;

42740

if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;

42741

}

42742

return false;

42743

@@ -458,7 +458,7 @@

42744

boolean mnemonicMatch (char key) {

42745

ToolItem [] items = getItems ();

42746

for (int i=0; i<items.length; i++) {

42747

- int /*long*/ labelHandle = items [i].labelHandle;

42748

+ long /*int*/ labelHandle = items [i].labelHandle;

42749

if (labelHandle != 0 && mnemonicMatch (labelHandle, key)) return true;

42750

}

42751

return false;

42752

@@ -504,7 +504,7 @@

42753

return result;

42754

}

42755

42756

-void setFontDescription (int /*long*/ font) {

42757

+void setFontDescription (long /*int*/ font) {

42758

super.setFontDescription (font);

42759

ToolItem [] items = getItems ();

42760

for (int i = 0; i < items.length; i++) {

42761

diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widgets/ToolItem.java

42762

--- x86/org/eclipse/swt/widgets/ToolItem.java 2009-05-29 17:30:04.000000000 -0400

42763

+++ x86_64/org/eclipse/swt/widgets/ToolItem.java 2009-09-17 08:48:24.000000000 -0400

42764

@@ -38,7 +38,7 @@

42765

* @noextend This class is not intended to be subclassed by clients.

42766

*/

42767

public class ToolItem extends Item {

42768

- int /*long*/ boxHandle, arrowHandle, arrowBoxHandle, separatorHandle, labelHandle, imageHandle;

42769

+ long /*int*/ boxHandle, arrowHandle, arrowBoxHandle, separatorHandle, labelHandle, imageHandle;

42770

ToolBar parent;

42771

Control control;

42772

Image hotImage, disabledImage;

42773

@@ -246,11 +246,11 @@

42774

}

42775

OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_CAN_FOCUS);

42776

// This code is intentionally commented.

42777

-// int /*long*/ fontHandle = parent.fontHandle ();

42778

+// long /*int*/ fontHandle = parent.fontHandle ();

42779

// GdkColor color = new GdkColor ();

42780

-// int /*long*/ style = OS.gtk_widget_get_style (fontHandle);

42781

+// long /*int*/ style = OS.gtk_widget_get_style (fontHandle);

42782

// OS.gtk_style_get_fg (style, OS.GTK_STATE_NORMAL, color);

42783

-// int /*long*/ font = OS.gtk_style_get_font_desc (style);

42784

+// long /*int*/ font = OS.gtk_style_get_font_desc (style);

42785

// setForegroundColor (color);

42786

// setFontDescription (font);

42787

if ((parent.state & FOREGROUND) != 0) {

42788

@@ -306,7 +306,7 @@

42789

public Rectangle getBounds () {

42790

checkWidget();

42791

parent.forceResize ();

42792

- int /*long*/ topHandle = topHandle ();

42793

+ long /*int*/ topHandle = topHandle ();

42794

int x, y, width, height;

42795

/*

42796

* Bug in GTK. Toolbar items are only allocated their minimum size

42797

@@ -395,7 +395,7 @@

42798

*/

42799

public boolean getEnabled () {

42800

checkWidget();

42801

- int /*long*/ topHandle = topHandle ();

42802

+ long /*int*/ topHandle = topHandle ();

42803

return OS.GTK_WIDGET_SENSITIVE (topHandle);

42804

}

42805

42806

@@ -485,11 +485,11 @@

42807

public int getWidth () {

42808

checkWidget();

42809

parent.forceResize ();

42810

- int /*long*/ topHandle = topHandle ();

42811

+ long /*int*/ topHandle = topHandle ();

42812

return OS.GTK_WIDGET_WIDTH (topHandle);

42813

}

42814

42815

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

42816

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

42817

GdkEventButton gdkEvent = new GdkEventButton ();

42818

OS.memmove (gdkEvent, event, GdkEventButton.sizeof);

42819

double x = gdkEvent.x;

42820

@@ -497,14 +497,14 @@

42821

double y = gdkEvent.y;

42822

gdkEvent.y += OS.GTK_WIDGET_Y (handle);

42823

OS.memmove (event, gdkEvent, GdkEventButton.sizeof);

42824

- int /*long*/ result = parent.gtk_button_press_event (widget, event);

42825

+ long /*int*/ result = parent.gtk_button_press_event (widget, event);

42826

gdkEvent.x = x;

42827

gdkEvent.y = y;

42828

OS.memmove (event, gdkEvent, GdkEventButton.sizeof);

42829

return result;

42830

}

42831

42832

-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) {

42833

+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {

42834

GdkEventButton gdkEvent = new GdkEventButton ();

42835

OS.memmove (gdkEvent, event, GdkEventButton.sizeof);

42836

double x = gdkEvent.x;

42837

@@ -512,17 +512,17 @@

42838

double y = gdkEvent.y;

42839

gdkEvent.y += OS.GTK_WIDGET_Y (handle);

42840

OS.memmove (event, gdkEvent, GdkEventButton.sizeof);

42841

- int /*long*/ result = parent.gtk_button_release_event (widget, event);

42842

+ long /*int*/ result = parent.gtk_button_release_event (widget, event);

42843

gdkEvent.x = x;

42844

gdkEvent.y = y;

42845

OS.memmove(event, gdkEvent, GdkEventButton.sizeof);

42846

return result;

42847

}

42848

42849

-int /*long*/ gtk_clicked (int /*long*/ widget) {

42850

+long /*int*/ gtk_clicked (long /*int*/ widget) {

42851

Event event = new Event ();

42852

if ((style & SWT.DROP_DOWN) != 0) {

42853

- int /*long*/ eventPtr = OS.gtk_get_current_event ();

42854

+ long /*int*/ eventPtr = OS.gtk_get_current_event ();

42855

if (eventPtr != 0) {

42856

GdkEvent gdkEvent = new GdkEvent ();

42857

OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof);

42858

@@ -538,7 +538,7 @@

42859

if ((((parent.style & SWT.RIGHT_TO_LEFT) == 0) && x <= (int)x_win [0])

42860

|| (((parent.style & SWT.RIGHT_TO_LEFT) != 0) && (int)x_win [0] <= x + width)) {

42861

event.detail = SWT.ARROW;

42862

- int /*long*/ topHandle = topHandle ();

42863

+ long /*int*/ topHandle = topHandle ();

42864

event.x = OS.GTK_WIDGET_X (topHandle);

42865

if ((parent.style & SWT.MIRRORED) != 0) event.x = parent.getClientWidth () - OS.GTK_WIDGET_WIDTH (topHandle) - event.x;

42866

event.y = OS.GTK_WIDGET_Y (topHandle) + OS.GTK_WIDGET_HEIGHT (topHandle);

42867

@@ -558,7 +558,7 @@

42868

return 0;

42869

}

42870

42871

-int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {

42872

+long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {

42873

parent.gtk_enter_notify_event (widget, event);

42874

drawHotImage = (parent.style & SWT.FLAT) != 0 && hotImage != null;

42875

if (drawHotImage && imageHandle != 0) {

42876

@@ -566,7 +566,7 @@

42877

if (imageList != null) {

42878

int index = imageList.indexOf (hotImage);

42879

if (index != -1) {

42880

- int /*long*/ pixbuf = imageList.getPixbuf (index);

42881

+ long /*int*/ pixbuf = imageList.getPixbuf (index);

42882

OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);

42883

}

42884

}

42885

@@ -574,7 +574,7 @@

42886

return 0;

42887

}

42888

42889

-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {

42890

+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {

42891

GdkEvent event = new GdkEvent ();

42892

OS.memmove (event, gdkEvent, GdkEvent.sizeof);

42893

switch (event.type) {

42894

@@ -590,13 +590,13 @@

42895

return 0;

42896

}

42897

42898

-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {

42899

+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {

42900

OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_CAN_FOCUS);

42901

parent.lastFocus = this;

42902

return 0;

42903

}

42904

42905

-int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {

42906

+long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) {

42907

parent.gtk_leave_notify_event (widget, event);

42908

if (drawHotImage) {

42909

drawHotImage = false;

42910

@@ -605,7 +605,7 @@

42911

if (imageList != null) {

42912

int index = imageList.indexOf (image);

42913

if (index != -1) {

42914

- int /*long*/ pixbuf = imageList.getPixbuf (index);

42915

+ long /*int*/ pixbuf = imageList.getPixbuf (index);

42916

OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);

42917

}

42918

}

42919

@@ -614,12 +614,12 @@

42920

return 0;

42921

}

42922

42923

-int /*long*/ gtk_map (int /*long*/ widget) {

42924

+long /*int*/ gtk_map (long /*int*/ widget) {

42925

parent.fixZOrder ();

42926

return 0;

42927

}

42928

42929

-int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {

42930

+long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {

42931

return parent.gtk_mnemonic_activate (widget, arg1);

42932

}

42933

42934

@@ -656,7 +656,7 @@

42935

OS.g_signal_connect_closure_by_id (handle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT], false);

42936

OS.g_signal_connect_closure_by_id (handle, display.signalIds [EVENT_AFTER], 0, display.closures[EVENT_AFTER], false);

42937

42938

- int /*long*/ topHandle = topHandle ();

42939

+ long /*int*/ topHandle = topHandle ();

42940

OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.closures [MAP], true);

42941

}

42942

42943

@@ -840,7 +840,7 @@

42944

*/

42945

public void setEnabled (boolean enabled) {

42946

checkWidget();

42947

- int /*long*/ topHandle = topHandle ();

42948

+ long /*int*/ topHandle = topHandle ();

42949

OS.gtk_widget_set_sensitive (topHandle, enabled);

42950

if (enabled) {

42951

/*

42952

@@ -868,7 +868,7 @@

42953

return result;

42954

}

42955

42956

-void setFontDescription (int /*long*/ font) {

42957

+void setFontDescription (long /*int*/ font) {

42958

OS.gtk_widget_modify_font (handle, font);

42959

if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);

42960

if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);

42961

@@ -927,7 +927,7 @@

42962

} else {

42963

imageList.put (imageIndex, image);

42964

}

42965

- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);

42966

+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);

42967

OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);

42968

OS.gtk_widget_show (imageHandle);

42969

} else {

42970

diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets/ToolTip.java

42971

--- x86/org/eclipse/swt/widgets/ToolTip.java 2009-05-29 17:30:04.000000000 -0400

42972

+++ x86_64/org/eclipse/swt/widgets/ToolTip.java 2009-09-17 08:48:24.000000000 -0400

42973

@@ -47,7 +47,7 @@

42974

String text, message;

42975

TrayItem item;

42976

int x, y, timerId;

42977

- int /*long*/ layoutText = 0, layoutMessage = 0;

42978

+ long /*int*/ layoutText = 0, layoutMessage = 0;

42979

int [] borderPolygon;

42980

boolean spikeAbove, autohide;

42981

42982

@@ -135,7 +135,7 @@

42983

}

42984

42985

void configure () {

42986

- int /*long*/ screen = OS.gdk_screen_get_default ();

42987

+ long /*int*/ screen = OS.gdk_screen_get_default ();

42988

OS.gtk_widget_realize (handle);

42989

int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, OS.GTK_WIDGET_WINDOW (handle));

42990

GdkRectangle dest = new GdkRectangle ();

42991

@@ -249,9 +249,9 @@

42992

OS.gtk_window_move (handle, Math.min(dest.width - w, x - w + 17), y - h - TIP_HEIGHT);

42993

}

42994

}

42995

- int /*long*/ rgn = OS.gdk_region_polygon (polyline, polyline.length / 2, OS.GDK_EVEN_ODD_RULE);

42996

+ long /*int*/ rgn = OS.gdk_region_polygon (polyline, polyline.length / 2, OS.GDK_EVEN_ODD_RULE);

42997

OS.gtk_widget_realize (handle);

42998

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle);

42999

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle);

43000

OS.gdk_window_shape_combine_region (window, rgn, 0, 0);

43001

OS.gdk_region_destroy (rgn);

43002

}

43003

@@ -291,13 +291,13 @@

43004

void deregister () {

43005

super.deregister ();

43006

if ((style & SWT.BALLOON) == 0) {

43007

- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);

43008

+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);

43009

if (tipWindow != 0) display.removeWidget (tipWindow);

43010

}

43011

}

43012

43013

void destroyWidget () {

43014

- int /*long*/ topHandle = topHandle ();

43015

+ long /*int*/ topHandle = topHandle ();

43016

if (parent != null) parent.removeTooTip (this);

43017

releaseHandle ();

43018

if (topHandle != 0 && (state & HANDLE) != 0) {

43019

@@ -330,7 +330,7 @@

43020

int x = this.x;

43021

int y = this.y;

43022

if (item != null) {

43023

- int /*long*/ itemHandle = item.handle;

43024

+ long /*int*/ itemHandle = item.handle;

43025

if(OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {

43026

GdkRectangle area = new GdkRectangle ();

43027

OS.gtk_status_icon_get_geometry (itemHandle, 0, area, 0);

43028

@@ -338,7 +338,7 @@

43029

y = area.y + area.height / 2;

43030

} else {

43031

OS.gtk_widget_realize (itemHandle);

43032

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (itemHandle);

43033

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (itemHandle);

43034

int [] px = new int [1], py = new int [1];

43035

OS.gdk_window_get_origin (window, px, py);

43036

x = px [0] + OS.GTK_WIDGET_WIDTH (itemHandle) / 2;

43037

@@ -458,19 +458,19 @@

43038

public boolean getVisible () {

43039

checkWidget ();

43040

if ((style & SWT.BALLOON) != 0) return OS.GTK_WIDGET_VISIBLE (handle);

43041

- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);

43042

+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);

43043

return OS.GTK_WIDGET_VISIBLE (tipWindow);

43044

}

43045

43046

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

43047

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

43048

notifyListeners (SWT.Selection, new Event ());

43049

setVisible (false);

43050

return 0;

43051

}

43052

43053

-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {

43054

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle);

43055

- int /*long*/ gdkGC = OS.gdk_gc_new (window);

43056

+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {

43057

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle);

43058

+ long /*int*/ gdkGC = OS.gdk_gc_new (window);

43059

OS.gdk_draw_polygon (window, gdkGC, 0, borderPolygon, borderPolygon.length / 2);

43060

int x = BORDER + PADDING;

43061

int y = BORDER + PADDING;

43062

@@ -484,8 +484,8 @@

43063

case SWT.ICON_WARNING: buffer = Converter.wcsToMbcs (null, "gtk-dialog-warning", true); break;

43064

}

43065

if (buffer != null) {

43066

- int /*long*/ style = OS.gtk_widget_get_default_style ();

43067

- int /*long*/ pixbuf = OS.gtk_icon_set_render_icon (

43068

+ long /*int*/ style = OS.gtk_widget_get_default_style ();

43069

+ long /*int*/ pixbuf = OS.gtk_icon_set_render_icon (

43070

OS.gtk_icon_factory_lookup_default (buffer),

43071

style,

43072

OS.GTK_TEXT_DIR_NONE,

43073

@@ -511,11 +511,11 @@

43074

return 0;

43075

}

43076

43077

-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {

43078

+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {

43079

Point point = getLocation ();

43080

int x = point.x;

43081

int y = point.y;

43082

- int /*long*/ screen = OS.gdk_screen_get_default ();

43083

+ long /*int*/ screen = OS.gdk_screen_get_default ();

43084

OS.gtk_widget_realize (widget);

43085

int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, OS.GTK_WIDGET_WINDOW (widget));

43086

GdkRectangle dest = new GdkRectangle ();

43087

@@ -534,7 +534,7 @@

43088

OS.gtk_widget_add_events (handle, OS.GDK_BUTTON_PRESS_MASK);

43089

OS.g_signal_connect_closure (handle, OS.button_press_event, display.closures [BUTTON_PRESS_EVENT], false);

43090

} else {

43091

- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);

43092

+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);

43093

if (tipWindow != 0) {

43094

OS.g_signal_connect_closure (tipWindow, OS.size_allocate, display.closures [SIZE_ALLOCATE], false);

43095

OS.gtk_widget_add_events (tipWindow, OS.GDK_BUTTON_PRESS_MASK);

43096

@@ -565,7 +565,7 @@

43097

void register () {

43098

super.register ();

43099

if ((style & SWT.BALLOON) == 0) {

43100

- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);

43101

+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);

43102

if (tipWindow != 0) display.addWidget (tipWindow, this);

43103

}

43104

}

43105

@@ -652,7 +652,7 @@

43106

if ((style & SWT.BALLOON) != 0) {

43107

if (OS.GTK_WIDGET_VISIBLE (handle)) configure ();

43108

} else {

43109

- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);

43110

+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);

43111

if (OS.GTK_WIDGET_VISIBLE (tipWindow)) {

43112

OS.gtk_window_move (tipWindow, x, y);

43113

}

43114

@@ -744,13 +744,13 @@

43115

if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {

43116

OS.pango_layout_set_auto_dir (layoutText, false);

43117

}

43118

- int /*long*/ boldAttr = OS.pango_attr_weight_new (OS.PANGO_WEIGHT_BOLD);

43119

+ long /*int*/ boldAttr = OS.pango_attr_weight_new (OS.PANGO_WEIGHT_BOLD);

43120

PangoAttribute attribute = new PangoAttribute ();

43121

OS.memmove (attribute, boldAttr, PangoAttribute.sizeof);

43122

attribute.start_index = 0;

43123

attribute.end_index = buffer.length;

43124

OS.memmove (boldAttr, attribute, PangoAttribute.sizeof);

43125

- int /*long*/ attrList = OS.pango_attr_list_new ();

43126

+ long /*int*/ attrList = OS.pango_attr_list_new ();

43127

OS.pango_attr_list_insert (attrList, boldAttr);

43128

OS.pango_layout_set_attributes (layoutText, attrList);

43129

OS.pango_attr_list_unref (attrList);

43130

@@ -784,13 +784,13 @@

43131

configure ();

43132

OS.gtk_widget_show (handle);

43133

} else {

43134

- int /*long*/ vboxHandle = parent.vboxHandle;

43135

+ long /*int*/ vboxHandle = parent.vboxHandle;

43136

StringBuffer string = new StringBuffer (text);

43137

if (text.length () > 0) string.append ("\n\n");

43138

string.append (message);

43139

byte [] buffer = Converter.wcsToMbcs (null, string.toString(), true);

43140

OS.gtk_tooltips_set_tip (handle, vboxHandle, buffer, null);

43141

- int /*long*/ data = OS.gtk_tooltips_data_get (vboxHandle);

43142

+ long /*int*/ data = OS.gtk_tooltips_data_get (vboxHandle);

43143

OS.GTK_TOOLTIPS_SET_ACTIVE (handle, data);

43144

OS.gtk_tooltips_set_tip (handle, vboxHandle, buffer, null);

43145

}

43146

@@ -799,17 +799,17 @@

43147

if ((style & SWT.BALLOON) != 0) {

43148

OS.gtk_widget_hide (handle);

43149

} else {

43150

- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);

43151

+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);

43152

OS.gtk_widget_hide (tipWindow);

43153

}

43154

}

43155

}

43156

43157

-int /*long*/ timerProc (int /*long*/ widget) {

43158

+long /*int*/ timerProc (long /*int*/ widget) {

43159

if ((style & SWT.BALLOON) != 0) {

43160

OS.gtk_widget_hide (handle);

43161

} else {

43162

- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);

43163

+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);

43164

OS.gtk_widget_hide (tipWindow);

43165

}

43166

return 0;

43167

diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widgets/Tracker.java

43168

--- x86/org/eclipse/swt/widgets/Tracker.java 2009-05-29 17:30:04.000000000 -0400

43169

+++ x86_64/org/eclipse/swt/widgets/Tracker.java 2009-09-17 08:48:24.000000000 -0400

43170

@@ -42,7 +42,7 @@

43171

public class Tracker extends Widget {

43172

Composite parent;

43173

Cursor cursor;

43174

- int /*long*/ lastCursor, window;

43175

+ long /*int*/ lastCursor, window;

43176

boolean tracking, cancelled, grabbed, stippled;

43177

Rectangle [] rectangles = new Rectangle [0], proportions = rectangles;

43178

Rectangle bounds;

43179

@@ -305,14 +305,14 @@

43180

}

43181

43182

void drawRectangles (Rectangle [] rects) {

43183

- int /*long*/ window = OS.GDK_ROOT_PARENT ();

43184

+ long /*int*/ window = OS.GDK_ROOT_PARENT ();

43185

if (parent != null) {

43186

window = OS.GTK_WIDGET_WINDOW (parent.paintHandle());

43187

}

43188

if (window == 0) return;

43189

- int /*long*/ gc = OS.gdk_gc_new (window);

43190

+ long /*int*/ gc = OS.gdk_gc_new (window);

43191

if (gc == 0) return;

43192

- int /*long*/ colormap = OS.gdk_colormap_get_system ();

43193

+ long /*int*/ colormap = OS.gdk_colormap_get_system ();

43194

GdkColor color = new GdkColor ();

43195

OS.gdk_color_white (colormap, color);

43196

OS.gdk_gc_set_foreground (gc, color);

43197

@@ -365,17 +365,17 @@

43198

}

43199

43200

boolean grab () {

43201

- int /*long*/ cursor = this.cursor != null ? this.cursor.handle : 0;

43202

+ long /*int*/ cursor = this.cursor != null ? this.cursor.handle : 0;

43203

int result = OS.gdk_pointer_grab (window, false, OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_RELEASE_MASK, window, cursor, OS.GDK_CURRENT_TIME);

43204

return result == OS.GDK_GRAB_SUCCESS;

43205

}

43206

43207

-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) {

43208

+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {

43209

return gtk_mouse (OS.GDK_BUTTON_RELEASE, widget, event);

43210

}

43211

43212

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {

43213

- int /*long*/ result = super.gtk_key_press_event (widget, eventPtr);

43214

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) {

43215

+ long /*int*/ result = super.gtk_key_press_event (widget, eventPtr);

43216

if (result != 0) return result;

43217

GdkEventKey keyEvent = new GdkEventKey ();

43218

OS.memmove (keyEvent, eventPtr, GdkEventKey.sizeof);

43219

@@ -509,8 +509,8 @@

43220

return result;

43221

}

43222

43223

-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ eventPtr) {

43224

- int /*long*/ cursor = this.cursor != null ? this.cursor.handle : 0;

43225

+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ eventPtr) {

43226

+ long /*int*/ cursor = this.cursor != null ? this.cursor.handle : 0;

43227

if (cursor != lastCursor) {

43228

ungrab ();

43229

grabbed = grab ();

43230

@@ -519,7 +519,7 @@

43231

return gtk_mouse (OS.GDK_MOTION_NOTIFY, widget, eventPtr);

43232

}

43233

43234

-int /*long*/ gtk_mouse (int eventType, int /*long*/ widget, int /*long*/ eventPtr) {

43235

+long /*int*/ gtk_mouse (int eventType, long /*int*/ widget, long /*int*/ eventPtr) {

43236

int [] newX = new int [1], newY = new int [1];

43237

OS.gdk_window_get_pointer (window, newX, newY, null);

43238

if (oldX != newX [0] || oldY != newY [0]) {

43239

@@ -709,7 +709,7 @@

43240

GdkEvent gdkEvent = new GdkEvent();

43241

while (tracking) {

43242

if (parent != null && parent.isDisposed ()) break;

43243

- int /*long*/ eventPtr;

43244

+ long /*int*/ eventPtr;

43245

while (true) {

43246

eventPtr = OS.gdk_event_get ();

43247

if (eventPtr != 0) {

43248

@@ -719,7 +719,7 @@

43249

}

43250

}

43251

OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof);

43252

- int /*long*/ widget = OS.gtk_get_event_widget (eventPtr);

43253

+ long /*int*/ widget = OS.gtk_get_event_widget (eventPtr);

43254

switch (gdkEvent.type) {

43255

case OS.GDK_MOTION_NOTIFY: gtk_motion_notify_event (widget, eventPtr); break;

43256

case OS.GDK_BUTTON_RELEASE: gtk_button_release_event (widget, eventPtr); break;

43257

diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widgets/TrayItem.java

43258

--- x86/org/eclipse/swt/widgets/TrayItem.java 2009-05-29 17:30:04.000000000 -0400

43259

+++ x86_64/org/eclipse/swt/widgets/TrayItem.java 2009-09-17 08:48:24.000000000 -0400

43260

@@ -40,8 +40,8 @@

43261

Tray parent;

43262

ToolTip toolTip;

43263

String toolTipText;

43264

- int /*long*/ imageHandle;

43265

- int /*long*/ tooltipsHandle;

43266

+ long /*int*/ imageHandle;

43267

+ long /*int*/ tooltipsHandle;

43268

ImageList imageList;

43269

43270

/**

43271

@@ -164,20 +164,20 @@

43272

OS.gtk_container_add (handle, imageHandle);

43273

OS.gtk_widget_show (handle);

43274

OS.gtk_widget_show (imageHandle);

43275

- int /*long*/ id = OS.gtk_plug_get_id (handle);

43276

+ long /*int*/ id = OS.gtk_plug_get_id (handle);

43277

int monitor = 0;

43278

- int /*long*/ screen = OS.gdk_screen_get_default ();

43279

+ long /*int*/ screen = OS.gdk_screen_get_default ();

43280

if (screen != 0) {

43281

monitor = OS.gdk_screen_get_number (screen);

43282

}

43283

byte [] trayBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_S" + monitor, true);

43284

- int /*long*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true);

43285

- int /*long*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom);

43286

- int /*long*/ xDisplay = OS.GDK_DISPLAY ();

43287

- int /*long*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom);

43288

+ long /*int*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true);

43289

+ long /*int*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom);

43290

+ long /*int*/ xDisplay = OS.GDK_DISPLAY ();

43291

+ long /*int*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom);

43292

byte [] messageBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_OPCODE", true);

43293

- int /*long*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true);

43294

- int /*long*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom);

43295

+ long /*int*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true);

43296

+ long /*int*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom);

43297

XClientMessageEvent event = new XClientMessageEvent ();

43298

event.type = OS.ClientMessage;

43299

event.window = trayWindow;

43300

@@ -186,7 +186,7 @@

43301

event.data [0] = OS.GDK_CURRENT_TIME;

43302

event.data [1] = OS.SYSTEM_TRAY_REQUEST_DOCK;

43303

event.data [2] = id;

43304

- int /*long*/ clientEvent = OS.g_malloc (XClientMessageEvent.sizeof);

43305

+ long /*int*/ clientEvent = OS.g_malloc (XClientMessageEvent.sizeof);

43306

OS.memmove (clientEvent, event, XClientMessageEvent.sizeof);

43307

OS.XSendEvent (xDisplay, trayWindow, false, OS.NoEventMask, clientEvent);

43308

OS.g_free (clientEvent);

43309

@@ -254,7 +254,7 @@

43310

return toolTipText;

43311

}

43312

43313

-int /*long*/ gtk_activate (int /*long*/ widget) {

43314

+long /*int*/ gtk_activate (long /*int*/ widget) {

43315

postEvent (SWT.Selection);

43316

/*

43317

* Feature in GTK. GTK will generate a single-click event before sending

43318

@@ -262,10 +262,10 @@

43319

* the single-click as the current event and for the double-click in the

43320

* event queue.

43321

*/

43322

- int /*long*/ nextEvent = OS.gdk_event_peek ();

43323

+ long /*int*/ nextEvent = OS.gdk_event_peek ();

43324

if (nextEvent != 0) {

43325

int nextEventType = OS.GDK_EVENT_TYPE (nextEvent);

43326

- int /*long*/ currEvent = OS.gtk_get_current_event ();

43327

+ long /*int*/ currEvent = OS.gtk_get_current_event ();

43328

int currEventType = 0;

43329

if (currEvent != 0) {

43330

currEventType = OS.GDK_EVENT_TYPE (currEvent);

43331

@@ -279,7 +279,7 @@

43332

return 0;

43333

}

43334

43335

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) {

43336

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) {

43337

GdkEventButton gdkEvent = new GdkEventButton ();

43338

OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);

43339

if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;

43340

@@ -295,13 +295,13 @@

43341

return 0;

43342

}

43343

43344

-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {

43345

+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {

43346

if (image != null && image.mask != 0) {

43347

if (OS.gdk_drawable_get_depth (image.mask) == 1) {

43348

int xoffset = (int) Math.floor (OS.GTK_WIDGET_X (widget) + ((OS.GTK_WIDGET_WIDTH (widget) - OS.GTK_WIDGET_REQUISITION_WIDTH (widget)) * 0.5) + 0.5);

43349

int yoffset = (int) Math.floor (OS.GTK_WIDGET_Y (widget) + ((OS.GTK_WIDGET_HEIGHT (widget) - OS.GTK_WIDGET_REQUISITION_HEIGHT (widget)) * 0.5) + 0.5);

43350

Rectangle b = image.getBounds();

43351

- int /*long*/ gdkImagePtr = OS.gdk_drawable_get_image (image.mask, 0, 0, b.width, b.height);

43352

+ long /*int*/ gdkImagePtr = OS.gdk_drawable_get_image (image.mask, 0, 0, b.width, b.height);

43353

if (gdkImagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);

43354

GdkImage gdkImage = new GdkImage();

43355

OS.memmove (gdkImage, gdkImagePtr);

43356

@@ -320,7 +320,7 @@

43357

}

43358

}

43359

OS.gtk_widget_realize (handle);

43360

- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle);

43361

+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle);

43362

OS.gdk_window_shape_combine_region (window, region.handle, 0, 0);

43363

region.dispose ();

43364

}

43365

@@ -328,7 +328,7 @@

43366

return 0;

43367

}

43368

43369

-int /*long*/ gtk_status_icon_popup_menu (int /*long*/ widget, int /*long*/ button, int /*long*/ activate_time) {

43370

+long /*int*/ gtk_status_icon_popup_menu (long /*int*/ widget, long /*int*/ button, long /*int*/ activate_time) {

43371

sendEvent (SWT.MenuDetect);

43372

return 0;

43373

}

43374

@@ -468,7 +468,7 @@

43375

} else {

43376

imageList.put (imageIndex, image);

43377

}

43378

- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);

43379

+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);

43380

if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {

43381

OS.gtk_status_icon_set_from_pixbuf (handle, pixbuf);

43382

OS.gtk_status_icon_set_visible (handle, true);

43383

diff -urN x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/widgets/TreeColumn.java

43384

--- x86/org/eclipse/swt/widgets/TreeColumn.java 2009-05-29 17:30:04.000000000 -0400

43385

+++ x86_64/org/eclipse/swt/widgets/TreeColumn.java 2009-09-17 08:48:24.000000000 -0400

43386

@@ -38,7 +38,7 @@

43387

* @noextend This class is not intended to be subclassed by clients.

43388

*/

43389

public class TreeColumn extends Item {

43390

- int /*long*/ labelHandle, imageHandle, buttonHandle;

43391

+ long /*int*/ labelHandle, imageHandle, buttonHandle;

43392

Tree parent;

43393

int modelIndex, lastButton, lastTime, lastX, lastWidth;

43394

boolean customDraw, useFixedWidth;

43395

@@ -326,7 +326,7 @@

43396

return OS.gtk_tree_view_column_get_width (handle);

43397

}

43398

43399

-int /*long*/ gtk_clicked (int /*long*/ widget) {

43400

+long /*int*/ gtk_clicked (long /*int*/ widget) {

43401

/*

43402

* There is no API to get a double click on a table column. Normally, when

43403

* the mouse is double clicked, this is indicated by GDK_2BUTTON_PRESS

43404

@@ -336,7 +336,7 @@

43405

*/

43406

boolean doubleClick = false;

43407

boolean postEvent = true;

43408

- int /*long*/ eventPtr = OS.gtk_get_current_event ();

43409

+ long /*int*/ eventPtr = OS.gtk_get_current_event ();

43410

if (eventPtr != 0) {

43411

GdkEventButton gdkEvent = new GdkEventButton ();

43412

OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);

43413

@@ -368,7 +368,7 @@

43414

return 0;

43415

}

43416

43417

-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {

43418

+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {

43419

GdkEvent event = new GdkEvent ();

43420

OS.memmove (event, gdkEvent, GdkEvent.sizeof);

43421

switch (event.type) {

43422

@@ -384,11 +384,11 @@

43423

return 0;

43424

}

43425

43426

-int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {

43427

+long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {

43428

return parent.gtk_mnemonic_activate (widget, arg1);

43429

}

43430

43431

-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {

43432

+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {

43433

useFixedWidth = false;

43434

int x = OS.GTK_WIDGET_X (widget);

43435

int width = OS.GTK_WIDGET_WIDTH (widget);

43436

@@ -435,7 +435,7 @@

43437

if ((parent.style & SWT.VIRTUAL) != 0) {

43438

//NOT DONE

43439

} else {

43440

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43441

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43442

if (OS.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) {

43443

do {

43444

width = Math.max (width, parent.calculateWidth (handle, iter, true));

43445

@@ -542,7 +542,7 @@

43446

parent.createRenderers (handle, modelIndex, index == 0, style);

43447

}

43448

43449

-void setFontDescription (int /*long*/ font) {

43450

+void setFontDescription (long /*int*/ font) {

43451

OS.gtk_widget_modify_font (labelHandle, font);

43452

OS.gtk_widget_modify_font (imageHandle, font);

43453

}

43454

@@ -557,7 +557,7 @@

43455

}

43456

int imageIndex = headerImageList.indexOf (image);

43457

if (imageIndex == -1) imageIndex = headerImageList.add (image);

43458

- int /*long*/ pixbuf = headerImageList.getPixbuf (imageIndex);

43459

+ long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex);

43460

OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);

43461

OS.gtk_widget_show (imageHandle);

43462

} else {

43463

diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widgets/TreeItem.java

43464

--- x86/org/eclipse/swt/widgets/TreeItem.java 2009-05-29 17:30:04.000000000 -0400

43465

+++ x86_64/org/eclipse/swt/widgets/TreeItem.java 2009-09-17 08:48:24.000000000 -0400

43466

@@ -181,7 +181,7 @@

43467

this (checkNull (parentItem).parent, parentItem.handle, style, checkIndex (index), true);

43468

}

43469

43470

-TreeItem (Tree parent, int /*long*/ parentIter, int style, int index, boolean create) {

43471

+TreeItem (Tree parent, long /*int*/ parentIter, int style, int index, boolean create) {

43472

super (parent, style);

43473

this.parent = parent;

43474

if (create) {

43475

@@ -212,7 +212,7 @@

43476

}

43477

43478

Color _getBackground () {

43479

- int /*long*/ [] ptr = new int /*long*/ [1];

43480

+ long /*int*/ [] ptr = new long /*int*/ [1];

43481

OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.BACKGROUND_COLUMN, ptr, -1);

43482

if (ptr [0] == 0) return parent.getBackground ();

43483

GdkColor gdkColor = new GdkColor ();

43484

@@ -223,7 +223,7 @@

43485

Color _getBackground (int index) {

43486

int count = Math.max (1, parent.columnCount);

43487

if (0 > index || index > count - 1) return _getBackground ();

43488

- int /*long*/ [] ptr = new int /*long*/ [1];

43489

+ long /*int*/ [] ptr = new long /*int*/ [1];

43490

int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;

43491

OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, ptr, -1);

43492

if (ptr [0] == 0) return _getBackground ();

43493

@@ -233,13 +233,13 @@

43494

}

43495

43496

boolean _getChecked () {

43497

- int /*long*/ [] ptr = new int /*long*/ [1];

43498

+ long /*int*/ [] ptr = new long /*int*/ [1];

43499

OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1);

43500

return ptr [0] != 0;

43501

}

43502

43503

Color _getForeground () {

43504

- int /*long*/ [] ptr = new int /*long*/ [1];

43505

+ long /*int*/ [] ptr = new long /*int*/ [1];

43506

OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.FOREGROUND_COLUMN, ptr, -1);

43507

if (ptr [0] == 0) return parent.getForeground ();

43508

GdkColor gdkColor = new GdkColor ();

43509

@@ -250,7 +250,7 @@

43510

Color _getForeground (int index) {

43511

int count = Math.max (1, parent.columnCount);

43512

if (0 > index || index > count - 1) return _getForeground ();

43513

- int /*long*/ [] ptr = new int /*long*/ [1];

43514

+ long /*int*/ [] ptr = new long /*int*/ [1];

43515

int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;

43516

OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_FOREGROUND, ptr, -1);

43517

if (ptr [0] == 0) return _getForeground ();

43518

@@ -262,7 +262,7 @@

43519

Image _getImage (int index) {

43520

int count = Math.max (1, parent.getColumnCount ());

43521

if (0 > index || index > count - 1) return null;

43522

- int /*long*/ [] ptr = new int /*long*/ [1];

43523

+ long /*int*/ [] ptr = new long /*int*/ [1];

43524

int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;

43525

OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_PIXBUF, ptr, -1);

43526

if (ptr [0] == 0) return null;

43527

@@ -275,7 +275,7 @@

43528

String _getText (int index) {

43529

int count = Math.max (1, parent.getColumnCount ());

43530

if (0 > index || index > count - 1) return "";

43531

- int /*long*/ [] ptr = new int /*long*/ [1];

43532

+ long /*int*/ [] ptr = new long /*int*/ [1];

43533

int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;

43534

OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, ptr, -1);

43535

if (ptr [0] == 0) return ""; //$NON-NLS-1$

43536

@@ -423,15 +423,15 @@

43537

// TODO fully test on early and later versions of GTK

43538

checkWidget();

43539

if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);

43540

- int /*long*/ parentHandle = parent.handle;

43541

- int /*long*/ column = 0;

43542

+ long /*int*/ parentHandle = parent.handle;

43543

+ long /*int*/ column = 0;

43544

if (index >= 0 && index < parent.columnCount) {

43545

column = parent.columns [index].handle;

43546

} else {

43547

column = OS.gtk_tree_view_get_column (parentHandle, index);

43548

}

43549

if (column == 0) return new Rectangle (0, 0, 0, 0);

43550

- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43551

+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43552

OS.gtk_widget_realize (parentHandle);

43553

GdkRectangle rect = new GdkRectangle ();

43554

OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);

43555

@@ -494,14 +494,14 @@

43556

// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem

43557

checkWidget ();

43558

if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);

43559

- int /*long*/ parentHandle = parent.handle;

43560

- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);

43561

+ long /*int*/ parentHandle = parent.handle;

43562

+ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);

43563

if (column == 0) return new Rectangle (0, 0, 0, 0);

43564

- int /*long*/ textRenderer = parent.getTextRenderer (column);

43565

- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);

43566

+ long /*int*/ textRenderer = parent.getTextRenderer (column);

43567

+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);

43568

if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);

43569

43570

- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43571

+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43572

OS.gtk_widget_realize (parentHandle);

43573

43574

boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;

43575

@@ -594,7 +594,7 @@

43576

*/

43577

public boolean getExpanded () {

43578

checkWidget();

43579

- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43580

+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43581

boolean answer = OS.gtk_tree_view_row_expanded (parent.handle, path);

43582

OS.gtk_tree_path_free (path);

43583

return answer;

43584

@@ -746,18 +746,18 @@

43585

// TODO fully test on early and later versions of GTK

43586

checkWidget ();

43587

if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);

43588

- int /*long*/ parentHandle = parent.handle;

43589

- int /*long*/ column = 0;

43590

+ long /*int*/ parentHandle = parent.handle;

43591

+ long /*int*/ column = 0;

43592

if (index >= 0 && index < parent.getColumnCount ()) {

43593

column = parent.columns [index].handle;

43594

} else {

43595

column = OS.gtk_tree_view_get_column (parentHandle, index);

43596

}

43597

if (column == 0) return new Rectangle (0, 0, 0, 0);

43598

- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);

43599

+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);

43600

if (pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);

43601

GdkRectangle rect = new GdkRectangle ();

43602

- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43603

+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43604

OS.gtk_widget_realize (parentHandle);

43605

OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);

43606

if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;

43607

@@ -908,12 +908,12 @@

43608

*/

43609

public TreeItem getParentItem () {

43610

checkWidget();

43611

- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43612

+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43613

TreeItem item = null;

43614

int depth = OS.gtk_tree_path_get_depth (path);

43615

if (depth > 1) {

43616

OS.gtk_tree_path_up (path);

43617

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43618

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43619

if (OS.gtk_tree_model_get_iter (parent.modelHandle, iter, path)) {

43620

item = parent._getItem (iter);

43621

}

43622

@@ -971,19 +971,19 @@

43623

if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0);

43624

// TODO fully test on early and later versions of GTK

43625

// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem

43626

- int /*long*/ parentHandle = parent.handle;

43627

- int /*long*/ column = 0;

43628

+ long /*int*/ parentHandle = parent.handle;

43629

+ long /*int*/ column = 0;

43630

if (index >= 0 && index < parent.columnCount) {

43631

column = parent.columns [index].handle;

43632

} else {

43633

column = OS.gtk_tree_view_get_column (parentHandle, index);

43634

}

43635

if (column == 0) return new Rectangle (0, 0, 0, 0);

43636

- int /*long*/ textRenderer = parent.getTextRenderer (column);

43637

- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);

43638

+ long /*int*/ textRenderer = parent.getTextRenderer (column);

43639

+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);

43640

if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);

43641

43642

- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43643

+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43644

OS.gtk_widget_realize (parentHandle);

43645

43646

boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;

43647

@@ -1066,8 +1066,8 @@

43648

if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);

43649

int index = -1;

43650

boolean isParent = false;

43651

- int /*long*/ currentPath = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43652

- int /*long*/ parentPath = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);

43653

+ long /*int*/ currentPath = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43654

+ long /*int*/ parentPath = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);

43655

int depth = OS.gtk_tree_path_get_depth (parentPath);

43656

if (depth > 1 && OS.gtk_tree_path_up(parentPath)) {

43657

if (OS.gtk_tree_path_compare(currentPath, parentPath) == 0) isParent = true;

43658

@@ -1075,9 +1075,9 @@

43659

OS.gtk_tree_path_free (currentPath);

43660

OS.gtk_tree_path_free (parentPath);

43661

if (!isParent) return index;

43662

- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);

43663

+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);

43664

if (depth > 1) {

43665

- int /*long*/ indices = OS.gtk_tree_path_get_indices (path);

43666

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path);

43667

if (indices != 0) {

43668

int[] temp = new int[depth];

43669

OS.memmove (temp, indices, 4 * temp.length);

43670

@@ -1089,13 +1089,13 @@

43671

}

43672

43673

void redraw () {

43674

- int /*long*/ parentHandle = parent.handle;

43675

+ long /*int*/ parentHandle = parent.handle;

43676

if ((OS.GTK_WIDGET_FLAGS (parentHandle) & OS.GTK_REALIZED) != 0) {

43677

- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43678

+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43679

GdkRectangle rect = new GdkRectangle ();

43680

OS.gtk_tree_view_get_cell_area (parentHandle, path, 0, rect);

43681

OS.gtk_tree_path_free (path);

43682

- int /*long*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);

43683

+ long /*int*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);

43684

rect.x = 0;

43685

int [] w = new int [1], h = new int [1];

43686

OS.gdk_drawable_get_size (window, w, h);

43687

@@ -1136,15 +1136,15 @@

43688

*/

43689

public void removeAll () {

43690

checkWidget ();

43691

- int /*long*/ modelHandle = parent.modelHandle;

43692

+ long /*int*/ modelHandle = parent.modelHandle;

43693

int length = OS.gtk_tree_model_iter_n_children (modelHandle, handle);

43694

if (length == 0) return;

43695

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43696

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43697

if (iter == 0) error (SWT.ERROR_NO_HANDLES);

43698

if (parent.fixAccessibility ()) {

43699

parent.ignoreAccessibility = true;

43700

}

43701

- int /*long*/ selection = OS.gtk_tree_view_get_selection (parent.handle);

43702

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (parent.handle);

43703

int [] value = new int [1];

43704

while (OS.gtk_tree_model_iter_children (modelHandle, iter, handle)) {

43705

OS.gtk_tree_model_get (modelHandle, iter, Tree.ID_COLUMN, value, -1);

43706

@@ -1249,16 +1249,16 @@

43707

boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;

43708

if (!customDraw) {

43709

if ((parent.style & SWT.VIRTUAL) == 0) {

43710

- int /*long*/ parentHandle = parent.handle;

43711

- int /*long*/ column = 0;

43712

+ long /*int*/ parentHandle = parent.handle;

43713

+ long /*int*/ column = 0;

43714

if (parent.columnCount > 0) {

43715

column = parent.columns [index].handle;

43716

} else {

43717

column = OS.gtk_tree_view_get_column (parentHandle, index);

43718

}

43719

if (column == 0) return;

43720

- int /*long*/ textRenderer = parent.getTextRenderer (column);

43721

- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);

43722

+ long /*int*/ textRenderer = parent.getTextRenderer (column);

43723

+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);

43724

OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);

43725

OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);

43726

}

43727

@@ -1309,7 +1309,7 @@

43728

*/

43729

public void setExpanded (boolean expanded) {

43730

checkWidget();

43731

- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43732

+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

43733

if (expanded) {

43734

OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);

43735

OS.gtk_tree_view_expand_row (parent.handle, path, false);

43736

@@ -1351,7 +1351,7 @@

43737

if (oldFont == font) return;

43738

this.font = font;

43739

if (oldFont != null && oldFont.equals (font)) return;

43740

- int /*long*/ fontHandle = font != null ? font.handle : 0;

43741

+ long /*int*/ fontHandle = font != null ? font.handle : 0;

43742

OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.FONT_COLUMN, fontHandle, -1);

43743

/*

43744

* Bug in GTK. When using fixed-height-mode,

43745

@@ -1402,7 +1402,7 @@

43746

if (oldFont != null && oldFont.equals (font)) return;

43747

43748

int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;

43749

- int /*long*/ fontHandle = font != null ? font.handle : 0;

43750

+ long /*int*/ fontHandle = font != null ? font.handle : 0;

43751

OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FONT, fontHandle, -1);

43752

/*

43753

* Bug in GTK. When using fixed-height-mode,

43754

@@ -1420,16 +1420,16 @@

43755

boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;

43756

if (!customDraw) {

43757

if ((parent.style & SWT.VIRTUAL) == 0) {

43758

- int /*long*/ parentHandle = parent.handle;

43759

- int /*long*/ column = 0;

43760

+ long /*int*/ parentHandle = parent.handle;

43761

+ long /*int*/ column = 0;

43762

if (parent.columnCount > 0) {

43763

column = parent.columns [index].handle;

43764

} else {

43765

column = OS.gtk_tree_view_get_column (parentHandle, index);

43766

}

43767

if (column == 0) return;

43768

- int /*long*/ textRenderer = parent.getTextRenderer (column);

43769

- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);

43770

+ long /*int*/ textRenderer = parent.getTextRenderer (column);

43771

+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);

43772

OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);

43773

OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);

43774

}

43775

@@ -1529,16 +1529,16 @@

43776

boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;

43777

if (!customDraw) {

43778

if ((parent.style & SWT.VIRTUAL) == 0) {

43779

- int /*long*/ parentHandle = parent.handle;

43780

- int /*long*/ column = 0;

43781

+ long /*int*/ parentHandle = parent.handle;

43782

+ long /*int*/ column = 0;

43783

if (parent.columnCount > 0) {

43784

column = parent.columns [index].handle;

43785

} else {

43786

column = OS.gtk_tree_view_get_column (parentHandle, index);

43787

}

43788

if (column == 0) return;

43789

- int /*long*/ textRenderer = parent.getTextRenderer (column);

43790

- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);

43791

+ long /*int*/ textRenderer = parent.getTextRenderer (column);

43792

+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);

43793

OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);

43794

OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);

43795

}

43796

@@ -1571,7 +1571,7 @@

43797

* GTK+'s "inconsistent" state does not match SWT's concept of grayed.

43798

* Render checked+grayed as "inconsistent", unchecked+grayed as blank.

43799

*/

43800

- int /*long*/ [] ptr = new int /*long*/ [1];

43801

+ long /*int*/ [] ptr = new long /*int*/ [1];

43802

OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1);

43803

OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);

43804

cached = true;

43805

@@ -1603,7 +1603,7 @@

43806

}

43807

int count = Math.max (1, parent.getColumnCount ());

43808

if (0 > index || index > count - 1) return;

43809

- int /*long*/ pixbuf = 0;

43810

+ long /*int*/ pixbuf = 0;

43811

if (image != null) {

43812

ImageList imageList = parent.imageList;

43813

if (imageList == null) imageList = parent.imageList = new ImageList ();

43814

@@ -1633,10 +1633,10 @@

43815

if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {

43816

if (OS.GTK_VERSION >= OS.VERSION (2, 3, 2)) {

43817

if (image != null) {

43818

- int /*long*/parentHandle = parent.handle;

43819

- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index);

43820

+ long /*int*/parentHandle = parent.handle;

43821

+ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, index);

43822

int [] w = new int [1];

43823

- int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column);

43824

+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer(column);

43825

OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);

43826

if (w[0] < image.getBounds().width) {

43827

/*

43828

@@ -1644,7 +1644,7 @@

43829

* are relying on the fact that it is done as part of modifying

43830

* the style.

43831

*/

43832

- int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle);

43833

+ long /*int*/ style = OS.gtk_widget_get_modifier_style (parentHandle);

43834

parent.modifyStyle (parentHandle, style);

43835

}

43836

}

43837

diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tree.java

43838

--- x86/org/eclipse/swt/widgets/Tree.java 2009-05-29 17:30:04.000000000 -0400

43839

+++ x86_64/org/eclipse/swt/widgets/Tree.java 2009-09-17 08:48:24.000000000 -0400

43840

@@ -75,9 +75,9 @@

43841

* @noextend This class is not intended to be subclassed by clients.

43842

*/

43843

public class Tree extends Composite {

43844

- int /*long*/ modelHandle, checkRenderer;

43845

+ long /*int*/ modelHandle, checkRenderer;

43846

int columnCount, sortDirection;

43847

- int /*long*/ ignoreCell;

43848

+ long /*int*/ ignoreCell;

43849

TreeItem[] items;

43850

TreeColumn [] columns;

43851

TreeColumn sortColumn;

43852

@@ -155,14 +155,14 @@

43853

}

43854

}

43855

43856

-TreeItem _getItem (int /*long*/ iter) {

43857

+TreeItem _getItem (long /*int*/ iter) {

43858

int id = getId (iter, true);

43859

if (items [id] != null) return items [id];

43860

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

43861

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

43862

int depth = OS.gtk_tree_path_get_depth (path);

43863

int [] indices = new int [depth];

43864

OS.memmove (indices, OS.gtk_tree_path_get_indices (path), 4*depth);

43865

- int /*long*/ parentIter = 0;

43866

+ long /*int*/ parentIter = 0;

43867

if (depth > 1) {

43868

OS.gtk_tree_path_up (path);

43869

parentIter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43870

@@ -174,8 +174,8 @@

43871

return items [id];

43872

}

43873

43874

-TreeItem _getItem (int /*long*/ parentIter, int index) {

43875

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43876

+TreeItem _getItem (long /*int*/ parentIter, int index) {

43877

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43878

OS.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index);

43879

int id = getId (iter, true);

43880

OS.g_free (iter);

43881

@@ -183,7 +183,7 @@

43882

return items [id] = new TreeItem (this, parentIter, SWT.NONE, index, false);

43883

}

43884

43885

-int getId (int /*long*/ iter, boolean queryModel) {

43886

+int getId (long /*int*/ iter, boolean queryModel) {

43887

if (queryModel) {

43888

int[] value = new int[1];

43889

OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);

43890

@@ -219,7 +219,7 @@

43891

return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0);

43892

}

43893

43894

-int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*long*/ tree_model, int /*long*/ iter, int /*long*/ data) {

43895

+long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) {

43896

if (cell == ignoreCell) return 0;

43897

TreeItem item = _getItem (iter);

43898

if (item != null) OS.g_object_set_qdata (cell, Display.SWT_OBJECT_INDEX2, item.handle);

43899

@@ -246,7 +246,7 @@

43900

* fix is to only provide the data if the row is visible.

43901

*/

43902

if (OS.GTK_VERSION < OS.VERSION (2, 3, 2)) {

43903

- int /*long*/ path = OS.gtk_tree_model_get_path (tree_model, iter);

43904

+ long /*int*/ path = OS.gtk_tree_model_get_path (tree_model, iter);

43905

OS.gtk_widget_realize (handle);

43906

GdkRectangle visible = new GdkRectangle ();

43907

OS.gtk_tree_view_get_visible_rect (handle, visible);

43908

@@ -268,7 +268,7 @@

43909

setData = checkData (item);

43910

}

43911

}

43912

- int /*long*/ [] ptr = new int /*long*/ [1];

43913

+ long /*int*/ [] ptr = new long /*int*/ [1];

43914

if (setData) {

43915

if (isPixbuf) {

43916

ptr [0] = 0;

43917

@@ -406,7 +406,7 @@

43918

addListener (SWT.Collapse, typedListener);

43919

}

43920

43921

-int calculateWidth (int /*long*/ column, int /*long*/ iter, boolean recurse) {

43922

+int calculateWidth (long /*int*/ column, long /*int*/ iter, boolean recurse) {

43923

OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);

43924

/*

43925

* Bug in GTK. The width calculated by gtk_tree_view_column_cell_get_size()

43926

@@ -420,7 +420,7 @@

43927

43928

int width = 0;

43929

int [] w = new int [1];

43930

- int /*long*/ path = 0;

43931

+ long /*int*/ path = 0;

43932

43933

if (OS.gtk_tree_view_get_expander_column (handle) == column) {

43934

/* indent */

43935

@@ -435,11 +435,11 @@

43936

}

43937

OS.gtk_widget_style_get(handle, OS.focus_line_width, w, 0);

43938

width += 2 * w [0];

43939

- int /*long*/ list = OS.gtk_tree_view_column_get_cell_renderers (column);

43940

+ long /*int*/ list = OS.gtk_tree_view_column_get_cell_renderers (column);

43941

if (list == 0) return 0;

43942

- int /*long*/ temp = list;

43943

+ long /*int*/ temp = list;

43944

while (temp != 0) {

43945

- int /*long*/ renderer = OS.g_list_data (temp);

43946

+ long /*int*/ renderer = OS.g_list_data (temp);

43947

if (renderer != 0) {

43948

OS.gtk_cell_renderer_get_size (renderer, handle, null, null, null, w, null);

43949

width += w [0];

43950

@@ -452,7 +452,7 @@

43951

if (path == 0) path = OS.gtk_tree_model_get_path (modelHandle, iter);

43952

boolean expanded = OS.gtk_tree_view_row_expanded (handle, path);

43953

if (expanded) {

43954

- int /*long*/ childIter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43955

+ long /*int*/ childIter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43956

boolean valid = OS.gtk_tree_model_iter_children (modelHandle, childIter, iter);

43957

while (valid) {

43958

width = Math.max (width, calculateWidth (column, childIter, true));

43959

@@ -498,8 +498,8 @@

43960

clear (0, index, all);

43961

}

43962

43963

-void clear (int /*long*/ parentIter, int index, boolean all) {

43964

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43965

+void clear (long /*int*/ parentIter, int index, boolean all) {

43966

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43967

OS.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index);

43968

int[] value = new int[1];

43969

OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);

43970

@@ -534,10 +534,10 @@

43971

checkWidget ();

43972

clearAll (all, 0);

43973

}

43974

-void clearAll (boolean all, int /*long*/ parentIter) {

43975

+void clearAll (boolean all, long /*int*/ parentIter) {

43976

int length = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);

43977

if (length == 0) return;

43978

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43979

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43980

boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parentIter);

43981

int[] value = new int[1];

43982

while (valid) {

43983

@@ -563,13 +563,13 @@

43984

return size;

43985

}

43986

43987

-void copyModel (int /*long*/ oldModel, int oldStart, int /*long*/ newModel, int newStart, int /*long*/ [] types, int /*long*/ oldParent, int /*long*/ newParent, int modelLength) {

43988

- int /*long*/ iter = OS.g_malloc(OS.GtkTreeIter_sizeof ());

43989

+void copyModel (long /*int*/ oldModel, int oldStart, long /*int*/ newModel, int newStart, long /*int*/ [] types, long /*int*/ oldParent, long /*int*/ newParent, int modelLength) {

43990

+ long /*int*/ iter = OS.g_malloc(OS.GtkTreeIter_sizeof ());

43991

if (OS.gtk_tree_model_iter_children (oldModel, iter, oldParent)) {

43992

- int /*long*/ [] oldItems = new int /*long*/ [OS.gtk_tree_model_iter_n_children (oldModel, oldParent)];

43993

+ long /*int*/ [] oldItems = new long /*int*/ [OS.gtk_tree_model_iter_n_children (oldModel, oldParent)];

43994

int oldIndex = 0;

43995

do {

43996

- int /*long*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43997

+ long /*int*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());

43998

if (newItem == 0) error (SWT.ERROR_NO_HANDLES);

43999

OS.gtk_tree_store_append (newModel, newItem, newParent);

44000

int [] index = new int [1];

44001

@@ -578,9 +578,9 @@

44002

if (index [0] != -1) {

44003

item = items [index [0]];

44004

if (item != null) {

44005

- int /*long*/ oldItem = item.handle;

44006

+ long /*int*/ oldItem = item.handle;

44007

oldItems[oldIndex++] = oldItem;

44008

- int /*long*/ [] ptr = new int /*long*/ [1];

44009

+ long /*int*/ [] ptr = new long /*int*/ [1];

44010

for (int j = 0; j < FIRST_COLUMN; j++) {

44011

OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);

44012

OS.gtk_tree_store_set (newModel, newItem, j, ptr [0], -1);

44013

@@ -605,7 +605,7 @@

44014

}

44015

} while (OS.gtk_tree_model_iter_next(oldModel, iter));

44016

for (int i = 0; i < oldItems.length; i++) {

44017

- int /*long*/ oldItem = oldItems [i];

44018

+ long /*int*/ oldItem = oldItems [i];

44019

if (oldItem != 0) {

44020

OS.gtk_tree_store_remove (oldModel, oldItem);

44021

OS.g_free (oldItem);

44022

@@ -638,17 +638,17 @@

44023

modelIndex++;

44024

}

44025

if (modelIndex == modelLength) {

44026

- int /*long*/ oldModel = modelHandle;

44027

- int /*long*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time

44028

- int /*long*/ newModel = OS.gtk_tree_store_newv (types.length, types);

44029

+ long /*int*/ oldModel = modelHandle;

44030

+ long /*int*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time

44031

+ long /*int*/ newModel = OS.gtk_tree_store_newv (types.length, types);

44032

if (newModel == 0) error (SWT.ERROR_NO_HANDLES);

44033

- copyModel (oldModel, FIRST_COLUMN, newModel, FIRST_COLUMN, types, (int /*long*/)0, (int /*long*/)0, modelLength);

44034

+ copyModel (oldModel, FIRST_COLUMN, newModel, FIRST_COLUMN, types, (long /*int*/)0, (long /*int*/)0, modelLength);

44035

OS.gtk_tree_view_set_model (handle, newModel);

44036

OS.g_object_unref (oldModel);

44037

modelHandle = newModel;

44038

}

44039

}

44040

- int /*long*/ columnHandle = OS.gtk_tree_view_column_new ();

44041

+ long /*int*/ columnHandle = OS.gtk_tree_view_column_new ();

44042

if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);

44043

if (index == 0 && columnCount > 0) {

44044

TreeColumn checkColumn = columns [0];

44045

@@ -705,7 +705,7 @@

44046

OS.gtk_fixed_set_has_window (fixedHandle, true);

44047

scrolledHandle = OS.gtk_scrolled_window_new (0, 0);

44048

if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);

44049

- int /*long*/ [] types = getColumnTypes (1);

44050

+ long /*int*/ [] types = getColumnTypes (1);

44051

modelHandle = OS.gtk_tree_store_newv (types.length, types);

44052

if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);

44053

handle = OS.gtk_tree_view_new_with_model (modelHandle);

44054

@@ -720,7 +720,7 @@

44055

OS.gtk_container_add (scrolledHandle, handle);

44056

44057

int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;

44058

- int /*long*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);

44059

+ long /*int*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);

44060

OS.gtk_tree_selection_set_mode (selectionHandle, mode);

44061

OS.gtk_tree_view_set_headers_visible (handle, false);

44062

int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;

44063

@@ -769,11 +769,11 @@

44064

} else {

44065

createColumn (column, index);

44066

}

44067

- int /*long*/ boxHandle = OS.gtk_hbox_new (false, 3);

44068

+ long /*int*/ boxHandle = OS.gtk_hbox_new (false, 3);

44069

if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);

44070

- int /*long*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);

44071

+ long /*int*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);

44072

if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);

44073

- int /*long*/ imageHandle = OS.gtk_image_new ();

44074

+ long /*int*/ imageHandle = OS.gtk_image_new ();

44075

if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);

44076

OS.gtk_container_add (boxHandle, imageHandle);

44077

OS.gtk_container_add (boxHandle, labelHandle);

44078

@@ -782,7 +782,7 @@

44079

column.labelHandle = labelHandle;

44080

column.imageHandle = imageHandle;

44081

OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);

44082

- int /*long*/ widget = OS.gtk_widget_get_parent (boxHandle);

44083

+ long /*int*/ widget = OS.gtk_widget_get_parent (boxHandle);

44084

while (widget != handle) {

44085

if (OS.GTK_IS_BUTTON (widget)) {

44086

column.buttonHandle = widget;

44087

@@ -816,7 +816,7 @@

44088

}

44089

}

44090

44091

-void createItem (TreeItem item, int /*long*/ parentIter, int index) {

44092

+void createItem (TreeItem item, long /*int*/ parentIter, int index) {

44093

int count = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);

44094

if (index == -1) index = count;

44095

if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE);

44096

@@ -836,7 +836,7 @@

44097

modelChanged = true;

44098

}

44099

44100

-void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check, int columnStyle) {

44101

+void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check, int columnStyle) {

44102

OS.gtk_tree_view_column_clear (columnHandle);

44103

if ((style & SWT.CHECK) != 0 && check) {

44104

OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);

44105

@@ -859,9 +859,9 @@

44106

OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);

44107

}

44108

}

44109

- int /*long*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : OS.gtk_cell_renderer_pixbuf_new ();

44110

+ long /*int*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : OS.gtk_cell_renderer_pixbuf_new ();

44111

if (pixbufRenderer == 0) error (SWT.ERROR_NO_HANDLES);

44112

- int /*long*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new ();

44113

+ long /*int*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new ();

44114

if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);

44115

44116

if (ownerDraw) {

44117

@@ -971,7 +971,7 @@

44118

if (item == null) error (SWT.ERROR_NULL_ARGUMENT);

44119

if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);

44120

boolean fixColumn = showFirstColumn ();

44121

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

44122

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

44123

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

44124

OS.gtk_tree_selection_unselect_iter (selection, item.handle);

44125

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

44126

@@ -989,7 +989,7 @@

44127

public void deselectAll() {

44128

checkWidget();

44129

boolean fixColumn = showFirstColumn ();

44130

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

44131

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

44132

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

44133

OS.gtk_tree_selection_unselect_all (selection);

44134

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

44135

@@ -1003,7 +1003,7 @@

44136

index++;

44137

}

44138

if (index == columnCount) return;

44139

- int /*long*/ columnHandle = column.handle;

44140

+ long /*int*/ columnHandle = column.handle;

44141

if (columnCount == 1) {

44142

firstCustomDraw = column.customDraw;

44143

}

44144

@@ -1011,11 +1011,11 @@

44145

columns [columnCount] = null;

44146

OS.gtk_tree_view_remove_column (handle, columnHandle);

44147

if (columnCount == 0) {

44148

- int /*long*/ oldModel = modelHandle;

44149

- int /*long*/[] types = getColumnTypes (1);

44150

- int /*long*/ newModel = OS.gtk_tree_store_newv (types.length, types);

44151

+ long /*int*/ oldModel = modelHandle;

44152

+ long /*int*/[] types = getColumnTypes (1);

44153

+ long /*int*/ newModel = OS.gtk_tree_store_newv (types.length, types);

44154

if (newModel == 0) error (SWT.ERROR_NO_HANDLES);

44155

- copyModel(oldModel, column.modelIndex, newModel, FIRST_COLUMN, types, (int /*long*/)0, (int /*long*/)0, FIRST_COLUMN + CELL_TYPES);

44156

+ copyModel(oldModel, column.modelIndex, newModel, FIRST_COLUMN, types, (long /*int*/)0, (long /*int*/)0, FIRST_COLUMN + CELL_TYPES);

44157

OS.gtk_tree_view_set_model (handle, newModel);

44158

OS.g_object_unref (oldModel);

44159

modelHandle = newModel;

44160

@@ -1025,7 +1025,7 @@

44161

for (int i=0; i<items.length; i++) {

44162

TreeItem item = items [i];

44163

if (item != null) {

44164

- int /*long*/ iter = item.handle;

44165

+ long /*int*/ iter = item.handle;

44166

int modelIndex = column.modelIndex;

44167

OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, 0, -1);

44168

OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_TEXT, 0, -1);

44169

@@ -1090,7 +1090,7 @@

44170

if (OS.GTK_VERSION < OS.VERSION (2, 0, 6)) {

44171

int length = OS.gtk_tree_model_iter_n_children (modelHandle, 0);

44172

if (length > 0) {

44173

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44174

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44175

boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, 0);

44176

while (valid) {

44177

if (item.handle == iter) {

44178

@@ -1102,7 +1102,7 @@

44179

OS.g_free (iter);

44180

}

44181

}

44182

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

44183

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

44184

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

44185

OS.gtk_tree_store_remove (modelHandle, item.handle);

44186

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

44187

@@ -1112,10 +1112,10 @@

44188

boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {

44189

boolean selected = false;

44190

if (filter) {

44191

- int /*long*/ [] path = new int /*long*/ [1];

44192

+ long /*int*/ [] path = new long /*int*/ [1];

44193

if (OS.gtk_tree_view_get_path_at_pos (handle, x, y, path, null, null, null)) {

44194

if (path [0] != 0) {

44195

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

44196

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

44197

if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;

44198

OS.gtk_tree_path_free (path [0]);

44199

}

44200

@@ -1128,7 +1128,7 @@

44201

return dragDetect;

44202

}

44203

44204

-int /*long*/ eventWindow () {

44205

+long /*int*/ eventWindow () {

44206

return paintWindow ();

44207

}

44208

44209

@@ -1166,13 +1166,13 @@

44210

checkWidget ();

44211

forceResize ();

44212

OS.gtk_widget_realize (handle);

44213

- int /*long*/ fixedWindow = OS.GTK_WIDGET_WINDOW (fixedHandle);

44214

- int /*long*/ binWindow = OS.gtk_tree_view_get_bin_window (handle);

44215

+ long /*int*/ fixedWindow = OS.GTK_WIDGET_WINDOW (fixedHandle);

44216

+ long /*int*/ binWindow = OS.gtk_tree_view_get_bin_window (handle);

44217

int [] binX = new int [1], binY = new int [1];

44218

OS.gdk_window_get_origin (binWindow, binX, binY);

44219

int [] fixedX = new int [1], fixedY = new int [1];

44220

OS.gdk_window_get_origin (fixedWindow, fixedX, fixedY);

44221

- int /*long*/ clientHandle = clientHandle ();

44222

+ long /*int*/ clientHandle = clientHandle ();

44223

int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);

44224

int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);

44225

return new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height);

44226

@@ -1272,13 +1272,13 @@

44227

public int [] getColumnOrder () {

44228

checkWidget ();

44229

if (columnCount == 0) return new int [0];

44230

- int /*long*/ list = OS.gtk_tree_view_get_columns (handle);

44231

+ long /*int*/ list = OS.gtk_tree_view_get_columns (handle);

44232

if (list == 0) return new int [0];

44233

int i = 0, count = OS.g_list_length (list);

44234

int [] order = new int [count];

44235

- int /*long*/ temp = list;

44236

+ long /*int*/ temp = list;

44237

while (temp != 0) {

44238

- int /*long*/ column = OS.g_list_data (temp);

44239

+ long /*int*/ column = OS.g_list_data (temp);

44240

if (column != 0) {

44241

for (int j=0; j<columnCount; j++) {

44242

if (columns [j].handle == column) {

44243

@@ -1293,8 +1293,8 @@

44244

return order;

44245

}

44246

44247

-int /*long*/[] getColumnTypes (int columnCount) {

44248

- int /*long*/[] types = new int /*long*/ [FIRST_COLUMN + (columnCount * CELL_TYPES)];

44249

+long /*int*/[] getColumnTypes (int columnCount) {

44250

+ long /*int*/[] types = new long /*int*/ [FIRST_COLUMN + (columnCount * CELL_TYPES)];

44251

// per row data

44252

types [ID_COLUMN] = OS.G_TYPE_INT ();

44253

types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();

44254

@@ -1350,11 +1350,11 @@

44255

}

44256

44257

TreeItem getFocusItem () {

44258

- int /*long*/ [] path = new int /*long*/ [1];

44259

+ long /*int*/ [] path = new long /*int*/ [1];

44260

OS.gtk_tree_view_get_cursor (handle, path, null);

44261

if (path [0] == 0) return null;

44262

TreeItem item = null;

44263

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44264

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44265

if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {

44266

int [] index = new int [1];

44267

OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);

44268

@@ -1405,7 +1405,7 @@

44269

GtkRequisition requisition = new GtkRequisition ();

44270

int height = 0;

44271

for (int i=0; i<columnCount; i++) {

44272

- int /*long*/ buttonHandle = columns [i].buttonHandle;

44273

+ long /*int*/ buttonHandle = columns [i].buttonHandle;

44274

if (buttonHandle != 0) {

44275

OS.gtk_widget_size_request (buttonHandle, requisition);

44276

height = Math.max (height, requisition.height);

44277

@@ -1414,8 +1414,8 @@

44278

return height;

44279

}

44280

OS.gtk_widget_realize (handle);

44281

- int /*long*/ fixedWindow = OS.GTK_WIDGET_WINDOW (fixedHandle);

44282

- int /*long*/ binWindow = OS.gtk_tree_view_get_bin_window (handle);

44283

+ long /*int*/ fixedWindow = OS.GTK_WIDGET_WINDOW (fixedHandle);

44284

+ long /*int*/ binWindow = OS.gtk_tree_view_get_bin_window (handle);

44285

int [] binY = new int [1];

44286

OS.gdk_window_get_origin (binWindow, null, binY);

44287

int [] fixedY = new int [1];

44288

@@ -1498,13 +1498,13 @@

44289

public TreeItem getItem (Point point) {

44290

checkWidget ();

44291

if (point == null) error (SWT.ERROR_NULL_ARGUMENT);

44292

- int /*long*/ [] path = new int /*long*/ [1];

44293

+ long /*int*/ [] path = new long /*int*/ [1];

44294

OS.gtk_widget_realize (handle);

44295

- int /*long*/ [] columnHandle = new int /*long*/ [1];

44296

+ long /*int*/ [] columnHandle = new long /*int*/ [1];

44297

if (!OS.gtk_tree_view_get_path_at_pos (handle, point.x, point.y, path, columnHandle, null, null)) return null;

44298

if (path [0] == 0) return null;

44299

TreeItem item = null;

44300

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44301

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44302

if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {

44303

boolean overExpander = false;

44304

if (OS.gtk_tree_view_get_expander_column (handle) == columnHandle [0]) {

44305

@@ -1561,7 +1561,7 @@

44306

checkWidget ();

44307

int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);

44308

if (itemCount == 0) {

44309

- int /*long*/ column = OS.gtk_tree_view_get_column (handle, 0);

44310

+ long /*int*/ column = OS.gtk_tree_view_get_column (handle, 0);

44311

int [] w = new int [1], h = new int [1];

44312

ignoreSize = true;

44313

OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);

44314

@@ -1569,11 +1569,11 @@

44315

return h [0];

44316

} else {

44317

int height = 0;

44318

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44319

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44320

OS.gtk_tree_model_get_iter_first (modelHandle, iter);

44321

int columnCount = Math.max (1, this.columnCount);

44322

for (int i=0; i<columnCount; i++) {

44323

- int /*long*/ column = OS.gtk_tree_view_get_column (handle, i);

44324

+ long /*int*/ column = OS.gtk_tree_view_get_column (handle, i);

44325

OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);

44326

int [] w = new int [1], h = new int [1];

44327

OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);

44328

@@ -1606,7 +1606,7 @@

44329

return getItems (0);

44330

}

44331

44332

-TreeItem [] getItems (int /*long*/ parent) {

44333

+TreeItem [] getItems (long /*int*/ parent) {

44334

int length = OS.gtk_tree_model_iter_n_children (modelHandle, parent);

44335

TreeItem[] result = new TreeItem [length];

44336

if (length == 0) return result;

44337

@@ -1617,7 +1617,7 @@

44338

} else {

44339

int i = 0;

44340

int[] index = new int [1];

44341

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44342

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44343

boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parent);

44344

while (valid) {

44345

OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);

44346

@@ -1671,14 +1671,14 @@

44347

return null;

44348

}

44349

44350

-int /*long*/ getPixbufRenderer (int /*long*/ column) {

44351

- int /*long*/ list = OS.gtk_tree_view_column_get_cell_renderers (column);

44352

+long /*int*/ getPixbufRenderer (long /*int*/ column) {

44353

+ long /*int*/ list = OS.gtk_tree_view_column_get_cell_renderers (column);

44354

if (list == 0) return 0;

44355

int count = OS.g_list_length (list);

44356

- int /*long*/ pixbufRenderer = 0;

44357

+ long /*int*/ pixbufRenderer = 0;

44358

int i = 0;

44359

while (i < count) {

44360

- int /*long*/ renderer = OS.g_list_nth_data (list, i);

44361

+ long /*int*/ renderer = OS.g_list_nth_data (list, i);

44362

if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {

44363

pixbufRenderer = renderer;

44364

break;

44365

@@ -1707,7 +1707,7 @@

44366

*/

44367

public TreeItem[] getSelection () {

44368

checkWidget();

44369

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

44370

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

44371

if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {

44372

display.treeSelectionLength = 0;

44373

display.treeSelection = new int [items.length];

44374

@@ -1721,15 +1721,15 @@

44375

* in versions smaller than 2.2.4 if the model is NULL. The fix is

44376

* to give a valid pointer instead.

44377

*/

44378

- int /*long*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new int /*long*/ [1] : null;

44379

- int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

44380

+ long /*int*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new long /*int*/ [1] : null;

44381

+ long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);

44382

if (list != 0) {

44383

int count = OS.g_list_length (list);

44384

TreeItem [] treeSelection = new TreeItem [count];

44385

int length = 0;

44386

for (int i=0; i<count; i++) {

44387

- int /*long*/ data = OS.g_list_nth_data (list, i);

44388

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44389

+ long /*int*/ data = OS.g_list_nth_data (list, i);

44390

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44391

if (OS.gtk_tree_model_get_iter (modelHandle, iter, data)) {

44392

treeSelection [length] = _getItem (iter);

44393

length++;

44394

@@ -1759,7 +1759,7 @@

44395

*/

44396

public int getSelectionCount () {

44397

checkWidget();

44398

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

44399

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

44400

if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {

44401

display.treeSelectionLength = 0;

44402

display.treeSelection = null;

44403

@@ -1811,14 +1811,14 @@

44404

return sortDirection;

44405

}

44406

44407

-int /*long*/ getTextRenderer (int /*long*/ column) {

44408

- int /*long*/ list = OS.gtk_tree_view_column_get_cell_renderers (column);

44409

+long /*int*/ getTextRenderer (long /*int*/ column) {

44410

+ long /*int*/ list = OS.gtk_tree_view_column_get_cell_renderers (column);

44411

if (list == 0) return 0;

44412

int count = OS.g_list_length (list);

44413

- int /*long*/ textRenderer = 0;

44414

+ long /*int*/ textRenderer = 0;

44415

int i = 0;

44416

while (i < count) {

44417

- int /*long*/ renderer = OS.g_list_nth_data (list, i);

44418

+ long /*int*/ renderer = OS.g_list_nth_data (list, i);

44419

if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {

44420

textRenderer = renderer;

44421

break;

44422

@@ -1845,12 +1845,12 @@

44423

*/

44424

public TreeItem getTopItem () {

44425

checkWidget ();

44426

- int /*long*/ [] path = new int /*long*/ [1];

44427

+ long /*int*/ [] path = new long /*int*/ [1];

44428

OS.gtk_widget_realize (handle);

44429

if (!OS.gtk_tree_view_get_path_at_pos (handle, 1, 1, path, null, null, null)) return null;

44430

if (path [0] == 0) return null;

44431

TreeItem item = null;

44432

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof());

44433

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof());

44434

if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {

44435

item = _getItem (iter);

44436

}

44437

@@ -1859,11 +1859,11 @@

44438

return item;

44439

}

44440

44441

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

44442

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

44443

GdkEventButton gdkEvent = new GdkEventButton ();

44444

OS.memmove (gdkEvent, event, GdkEventButton.sizeof);

44445

if (gdkEvent.window != OS.gtk_tree_view_get_bin_window (handle)) return 0;

44446

- int /*long*/ result = super.gtk_button_press_event (widget, event);

44447

+ long /*int*/ result = super.gtk_button_press_event (widget, event);

44448

if (result != 0) return result;

44449

/*

44450

* Feature in GTK. In a multi-select tree view, when multiple items are already

44451

@@ -1875,10 +1875,10 @@

44452

*/

44453

int button = gdkEvent.button;

44454

if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {

44455

- int /*long*/ [] path = new int /*long*/ [1];

44456

+ long /*int*/ [] path = new long /*int*/ [1];

44457

if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {

44458

if (path [0] != 0) {

44459

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

44460

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

44461

if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;

44462

OS.gtk_tree_path_free (path [0]);

44463

}

44464

@@ -1893,10 +1893,10 @@

44465

* widget from automatically selecting the first item.

44466

*/

44467

if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {

44468

- int /*long*/ [] path = new int /*long*/ [1];

44469

+ long /*int*/ [] path = new long /*int*/ [1];

44470

if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {

44471

if (path [0] != 0) {

44472

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

44473

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

44474

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

44475

OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);

44476

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

44477

@@ -1916,13 +1916,13 @@

44478

return result;

44479

}

44480

44481

-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) {

44482

- int /*long*/ window = OS.GDK_EVENT_WINDOW (event);

44483

+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {

44484

+ long /*int*/ window = OS.GDK_EVENT_WINDOW (event);

44485

if (window != OS.gtk_tree_view_get_bin_window (handle)) return 0;

44486

return super.gtk_button_release_event (widget, event);

44487

}

44488

44489

-int /*long*/ gtk_changed (int /*long*/ widget) {

44490

+long /*int*/ gtk_changed (long /*int*/ widget) {

44491

TreeItem item = getFocusItem ();

44492

if (item != null) {

44493

Event event = new Event ();

44494

@@ -1932,14 +1932,14 @@

44495

return 0;

44496

}

44497

44498

-int /*long*/ gtk_expand_collapse_cursor_row (int /*long*/ widget, int /*long*/ logical, int /*long*/ expand, int /*long*/ open_all) {

44499

+long /*int*/ gtk_expand_collapse_cursor_row (long /*int*/ widget, long /*int*/ logical, long /*int*/ expand, long /*int*/ open_all) {

44500

// FIXME - this flag is never cleared. It should be cleared when the expand all operation completes.

44501

if (expand != 0 && open_all != 0) expandAll = true;

44502

return 0;

44503

}

44504

44505

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {

44506

- int /*long*/ result = super.gtk_key_press_event (widget, eventPtr);

44507

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) {

44508

+ long /*int*/ result = super.gtk_key_press_event (widget, eventPtr);

44509

if (result != 0) return result;

44510

if (OS.GTK_VERSION < OS.VERSION (2, 2 ,0)) {

44511

/*

44512

@@ -1963,14 +1963,14 @@

44513

return result;

44514

}

44515

44516

-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {

44517

- int /*long*/ window = OS.GDK_EVENT_WINDOW (event);

44518

+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {

44519

+ long /*int*/ window = OS.GDK_EVENT_WINDOW (event);

44520

if (window != OS.gtk_tree_view_get_bin_window (handle)) return 0;

44521

return super.gtk_motion_notify_event (widget, event);

44522

}

44523

44524

-int /*long*/ gtk_popup_menu (int /*long*/ widget) {

44525

- int /*long*/ result = super.gtk_popup_menu (widget);

44526

+long /*int*/ gtk_popup_menu (long /*int*/ widget) {

44527

+ long /*int*/ result = super.gtk_popup_menu (widget);

44528

/*

44529

* Bug in GTK. The context menu for the typeahead in GtkTreeViewer

44530

* opens in the bottom right corner of the screen when Shift+F10

44531

@@ -1983,10 +1983,10 @@

44532

return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;

44533

}

44534

44535

-int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long*/ column) {

44536

+long /*int*/ gtk_row_activated (long /*int*/ tree, long /*int*/ path, long /*int*/ column) {

44537

if (path == 0) return 0;

44538

TreeItem item = null;

44539

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44540

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44541

if (OS.gtk_tree_model_get_iter (modelHandle, iter, path)) {

44542

int [] index = new int [1];

44543

OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);

44544

@@ -2013,7 +2013,7 @@

44545

return 0;

44546

}

44547

44548

-int /*long*/ gtk_test_collapse_row (int /*long*/ tree, int /*long*/ iter, int /*long*/ path) {

44549

+long /*int*/ gtk_test_collapse_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) {

44550

int [] index = new int [1];

44551

OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);

44552

TreeItem item = items [index [0]];

44553

@@ -2051,7 +2051,7 @@

44554

return 0;

44555

}

44556

44557

-int /*long*/ gtk_test_expand_row (int /*long*/ tree, int /*long*/ iter, int /*long*/ path) {

44558

+long /*int*/ gtk_test_expand_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) {

44559

int [] index = new int [1];

44560

OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);

44561

TreeItem item = items [index [0]];

44562

@@ -2093,11 +2093,11 @@

44563

return 0;

44564

}

44565

44566

-int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {

44567

- int /*long*/ path = OS.gtk_tree_path_new_from_string (pathStr);

44568

+long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) {

44569

+ long /*int*/ path = OS.gtk_tree_path_new_from_string (pathStr);

44570

if (path == 0) return 0;

44571

TreeItem item = null;

44572

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof());

44573

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof());

44574

if (OS.gtk_tree_model_get_iter (modelHandle, iter, path)) {

44575

item = _getItem (iter);

44576

}

44577

@@ -2113,7 +2113,7 @@

44578

return 0;

44579

}

44580

44581

-void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {

44582

+void gtk_widget_size_request (long /*int*/ widget, GtkRequisition requisition) {

44583

/*

44584

* Bug in GTK. For some reason, gtk_widget_size_request() fails

44585

* to include the height of the tree view items when there are

44586

@@ -2124,17 +2124,17 @@

44587

super.gtk_widget_size_request (widget, requisition);

44588

return;

44589

}

44590

- int /*long*/ columns = OS.gtk_tree_view_get_columns (handle), list = columns;

44591

+ long /*int*/ columns = OS.gtk_tree_view_get_columns (handle), list = columns;

44592

boolean fixVisible = columns != 0;

44593

while (list != 0) {

44594

- int /*long*/ column = OS.g_list_data (list);

44595

+ long /*int*/ column = OS.g_list_data (list);

44596

if (OS.gtk_tree_view_column_get_visible (column)) {

44597

fixVisible = false;

44598

break;

44599

}

44600

list = OS.g_list_next (list);

44601

}

44602

- int /*long*/ columnHandle = 0;

44603

+ long /*int*/ columnHandle = 0;

44604

if (fixVisible) {

44605

columnHandle = OS.g_list_data (columns);

44606

OS.gtk_tree_view_column_set_visible (columnHandle, true);

44607

@@ -2147,13 +2147,13 @@

44608

}

44609

44610

void hideFirstColumn () {

44611

- int /*long*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);

44612

+ long /*int*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);

44613

OS.gtk_tree_view_column_set_visible (firstColumn, false);

44614

}

44615

44616

void hookEvents () {

44617

super.hookEvents ();

44618

- int /*long*/ selection = OS.gtk_tree_view_get_selection(handle);

44619

+ long /*int*/ selection = OS.gtk_tree_view_get_selection(handle);

44620

OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false);

44621

OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false);

44622

OS.g_signal_connect_closure (handle, OS.test_expand_row, display.closures [TEST_EXPAND_ROW], false);

44623

@@ -2221,10 +2221,10 @@

44624

if (item == null) error (SWT.ERROR_NULL_ARGUMENT);

44625

if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);

44626

int index = -1;

44627

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

44628

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

44629

int depth = OS.gtk_tree_path_get_depth (path);

44630

if (depth == 1) {

44631

- int /*long*/ indices = OS.gtk_tree_path_get_indices (path);

44632

+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path);

44633

if (indices != 0) {

44634

int[] temp = new int[1];

44635

OS.memmove (temp, indices, 4);

44636

@@ -2237,7 +2237,7 @@

44637

44638

boolean mnemonicHit (char key) {

44639

for (int i=0; i<columnCount; i++) {

44640

- int /*long*/ labelHandle = columns [i].labelHandle;

44641

+ long /*int*/ labelHandle = columns [i].labelHandle;

44642

if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;

44643

}

44644

return false;

44645

@@ -2245,13 +2245,13 @@

44646

44647

boolean mnemonicMatch (char key) {

44648

for (int i=0; i<columnCount; i++) {

44649

- int /*long*/ labelHandle = columns [i].labelHandle;

44650

+ long /*int*/ labelHandle = columns [i].labelHandle;

44651

if (labelHandle != 0 && mnemonicMatch (labelHandle, key)) return true;

44652

}

44653

return false;

44654

}

44655

44656

-int /*long*/ paintWindow () {

44657

+long /*int*/ paintWindow () {

44658

OS.gtk_widget_realize (handle);

44659

return OS.gtk_tree_view_get_bin_window (handle);

44660

}

44661

@@ -2298,9 +2298,9 @@

44662

items [index [0]] = null;

44663

}

44664

44665

-void releaseItems (int /*long*/ parentIter) {

44666

+void releaseItems (long /*int*/ parentIter) {

44667

int[] index = new int [1];

44668

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44669

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44670

boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parentIter);

44671

while (valid) {

44672

releaseItems (iter);

44673

@@ -2350,14 +2350,14 @@

44674

currentItem = null;

44675

}

44676

44677

-void remove (int /*long*/ parentIter, int start, int end) {

44678

+void remove (long /*int*/ parentIter, int start, int end) {

44679

if (start > end) return;

44680

int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);

44681

if (!(0 <= start && start <= end && end < itemCount)) {

44682

error (SWT.ERROR_INVALID_RANGE);

44683

}

44684

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

44685

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44686

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

44687

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44688

if (iter == 0) error (SWT.ERROR_NO_HANDLES);

44689

if (fixAccessibility ()) {

44690

ignoreAccessibility = true;

44691

@@ -2397,7 +2397,7 @@

44692

if (item != null && !item.isDisposed ()) item.release (false);

44693

}

44694

items = new TreeItem[4];

44695

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

44696

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

44697

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

44698

if (fixAccessibility ()) {

44699

ignoreAccessibility = true;

44700

@@ -2482,19 +2482,19 @@

44701

eventTable.unhook (SWT.Collapse, listener);

44702

}

44703

44704

-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) {

44705

- int /*long*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));

44706

+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) {

44707

+ long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));

44708

GtkCellRendererClass klass = new GtkCellRendererClass ();

44709

OS.memmove (klass, g_class);

44710

- int /*long*/ result = OS.call (klass.get_size, cell, handle, cell_area, x_offset, y_offset, width, height);

44711

+ long /*int*/ result = OS.call (klass.get_size, cell, handle, cell_area, x_offset, y_offset, width, height);

44712

if (!ignoreSize && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {

44713

- int /*long*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);

44714

+ long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);

44715

TreeItem item = null;

44716

if (iter != 0) item = _getItem (iter);

44717

if (item != null) {

44718

int columnIndex = 0;

44719

if (columnCount > 0) {

44720

- int /*long*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);

44721

+ long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);

44722

for (int i = 0; i < columnCount; i++) {

44723

if (columns [i].handle == columnHandle) {

44724

columnIndex = i;

44725

@@ -2533,11 +2533,11 @@

44726

return result;

44727

}

44728

44729

-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) {

44730

+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) {

44731

TreeItem item = null;

44732

- int /*long*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);

44733

+ long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);

44734

if (iter != 0) item = _getItem (iter);

44735

- int /*long*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);

44736

+ long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);

44737

int columnIndex = 0;

44738

if (columnCount > 0) {

44739

for (int i = 0; i < columnCount; i++) {

44740

@@ -2551,7 +2551,7 @@

44741

if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) || (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {

44742

drawFlags = (int)/*64*/flags;

44743

drawState = SWT.FOREGROUND;

44744

- int /*long*/ [] ptr = new int /*long*/ [1];

44745

+ long /*int*/ [] ptr = new long /*int*/ [1];

44746

OS.gtk_tree_model_get (modelHandle, item.handle, Tree.BACKGROUND_COLUMN, ptr, -1);

44747

if (ptr [0] == 0) {

44748

int modelIndex = columnCount == 0 ? Tree.FIRST_COLUMN : columns [columnIndex].modelIndex;

44749

@@ -2562,7 +2562,7 @@

44750

if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;

44751

44752

GdkRectangle rect = new GdkRectangle ();

44753

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

44754

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

44755

OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);

44756

OS.gtk_tree_path_free (path);

44757

44758

@@ -2606,7 +2606,7 @@

44759

if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED;

44760

if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED;

44761

if ((drawState & SWT.SELECTED) != 0) {

44762

- int /*long*/ style = OS.gtk_widget_get_style (widget);

44763

+ long /*int*/ style = OS.gtk_widget_get_style (widget);

44764

//TODO - parity and sorted

44765

byte[] detail = Converter.wcsToMbcs (null, "cell_odd", true);

44766

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);

44767

@@ -2617,7 +2617,7 @@

44768

}

44769

}

44770

}

44771

- int /*long*/ result = 0;

44772

+ long /*int*/ result = 0;

44773

if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) {

44774

GC gc = new GC (this);

44775

gc.setBackground (item.getBackground (columnIndex));

44776

@@ -2627,7 +2627,7 @@

44777

gc.dispose ();

44778

}

44779

if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {

44780

- int /*long*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));

44781

+ long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));

44782

GtkCellRendererClass klass = new GtkCellRendererClass ();

44783

OS.memmove (klass, g_class);

44784

if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {

44785

@@ -2640,7 +2640,7 @@

44786

if (hooks (SWT.PaintItem)) {

44787

GdkRectangle rect = new GdkRectangle ();

44788

GdkRectangle clipRect = new GdkRectangle ();

44789

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

44790

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);

44791

OS.gtk_tree_view_get_cell_area (handle, path, columnHandle, rect);

44792

OS.gtk_tree_view_get_background_area (handle, path, columnHandle, clipRect);

44793

OS.gtk_tree_path_free (path);

44794

@@ -2704,8 +2704,8 @@

44795

for (int i=0; i<end; i++) {

44796

boolean customDraw = columnCount != 0 ? columns [i].customDraw : firstCustomDraw;

44797

if (customDraw) {

44798

- int /*long*/ column = OS.gtk_tree_view_get_column (handle, i);

44799

- int /*long*/ textRenderer = getTextRenderer (column);

44800

+ long /*int*/ column = OS.gtk_tree_view_get_column (handle, i);

44801

+ long /*int*/ textRenderer = getTextRenderer (column);

44802

OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, 0, 0, 0);

44803

if (columnCount != 0) columns [i].customDraw = false;

44804

}

44805

@@ -2739,7 +2739,7 @@

44806

if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);

44807

if (item.parent != this) return;

44808

Rectangle rect = item.getBounds();

44809

- int /*long*/ [] path = new int /*long*/ [1];

44810

+ long /*int*/ [] path = new long /*int*/ [1];

44811

OS.gtk_widget_realize (handle);

44812

if (!OS.gtk_tree_view_get_path_at_pos(handle, rect.x, rect.y, path, null, null, null)) return;

44813

if (path [0] == 0) return;

44814

@@ -2748,7 +2748,7 @@

44815

OS.gtk_tree_path_free (path [0]);

44816

}

44817

44818

-void setItemCount (int /*long*/ parentIter, int count) {

44819

+void setItemCount (long /*int*/ parentIter, int count) {

44820

int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);

44821

if (count == itemCount) return;

44822

boolean isVirtual = (style & SWT.VIRTUAL) != 0;

44823

@@ -2759,7 +2759,7 @@

44824

ignoreAccessibility = true;

44825

}

44826

for (int i=itemCount; i<count; i++) {

44827

- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44828

+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

44829

if (iter == 0) error (SWT.ERROR_NO_HANDLES);

44830

OS.gtk_tree_store_append (modelHandle, iter, parentIter);

44831

OS.gtk_tree_store_set (modelHandle, iter, ID_COLUMN, -1, -1);

44832

@@ -2818,7 +2818,7 @@

44833

if (item == null) error (SWT.ERROR_NULL_ARGUMENT);

44834

if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);

44835

boolean fixColumn = showFirstColumn ();

44836

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

44837

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

44838

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

44839

OS.gtk_tree_selection_select_iter (selection, item.handle);

44840

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

44841

@@ -2840,7 +2840,7 @@

44842

checkWidget();

44843

if ((style & SWT.SINGLE) != 0) return;

44844

boolean fixColumn = showFirstColumn ();

44845

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

44846

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

44847

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

44848

OS.gtk_tree_selection_select_all (selection);

44849

OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

44850

@@ -2852,9 +2852,9 @@

44851

OS.gtk_widget_modify_base (handle, 0, color);

44852

}

44853

44854

-void setBackgroundPixmap (int /*long*/ pixmap) {

44855

+void setBackgroundPixmap (long /*int*/ pixmap) {

44856

super.setBackgroundPixmap (pixmap);

44857

- int /*long*/ window = paintWindow ();

44858

+ long /*int*/ window = paintWindow ();

44859

if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, true);

44860

}

44861

44862

@@ -2919,15 +2919,15 @@

44863

if (seen [index]) error (SWT.ERROR_INVALID_ARGUMENT);

44864

seen [index] = true;

44865

}

44866

- int /*long*/ baseColumn = 0;

44867

+ long /*int*/ baseColumn = 0;

44868

for (int i=0; i<order.length; i++) {

44869

- int /*long*/ column = columns [order [i]].handle;

44870

+ long /*int*/ column = columns [order [i]].handle;

44871

OS.gtk_tree_view_move_column_after (handle, column, baseColumn);

44872

baseColumn = column;

44873

}

44874

}

44875

44876

-void setFontDescription (int /*long*/ font) {

44877

+void setFontDescription (long /*int*/ font) {

44878

super.setFontDescription (font);

44879

TreeColumn[] columns = getColumns ();

44880

for (int i = 0; i < columns.length; i++) {

44881

@@ -2989,16 +2989,16 @@

44882

44883

void setParentBackground () {

44884

super.setParentBackground ();

44885

- int /*long*/ window = paintWindow ();

44886

+ long /*int*/ window = paintWindow ();

44887

if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, true);

44888

}

44889

44890

-void setParentWindow (int /*long*/ widget) {

44891

- int /*long*/ window = eventWindow ();

44892

+void setParentWindow (long /*int*/ widget) {

44893

+ long /*int*/ window = eventWindow ();

44894

OS.gtk_widget_set_parent_window (widget, window);

44895

}

44896

44897

-void setScrollWidth (int /*long*/ column, TreeItem item) {

44898

+void setScrollWidth (long /*int*/ column, TreeItem item) {

44899

if (columnCount != 0 || currentItem == item) return;

44900

/*

44901

* Use GTK_TREE_VIEW_COLUMN_GROW_ONLY on GTK versions < 2.3.2

44902

@@ -3067,7 +3067,7 @@

44903

int length = items.length;

44904

if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;

44905

boolean fixColumn = showFirstColumn ();

44906

- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);

44907

+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);

44908

OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

44909

boolean first = true;

44910

for (int i = 0; i < length; i++) {

44911

@@ -3075,7 +3075,7 @@

44912

if (item == null) continue;

44913

if (item.isDisposed ()) break;

44914

if (item.parent != this) continue;

44915

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

44916

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

44917

showItem (path, false);

44918

if (first) {

44919

OS.gtk_tree_view_set_cursor (handle, path, 0, false);

44920

@@ -3168,7 +3168,7 @@

44921

if (item == null) error (SWT.ERROR_NULL_ARGUMENT);

44922

if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);

44923

if (item.parent != this) return;

44924

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

44925

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

44926

showItem (path, false);

44927

OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f);

44928

if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {

44929

@@ -3243,10 +3243,10 @@

44930

*/

44931

int columnCount = Math.max (1, this.columnCount);

44932

for (int i=0; i<columnCount; i++) {

44933

- int /*long*/ column = OS.gtk_tree_view_get_column (handle, i);

44934

+ long /*int*/ column = OS.gtk_tree_view_get_column (handle, i);

44935

if (OS.gtk_tree_view_column_get_visible (column)) return false;

44936

}

44937

- int /*long*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);

44938

+ long /*int*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);

44939

OS.gtk_tree_view_column_set_visible (firstColumn, true);

44940

return true;

44941

}

44942

@@ -3269,13 +3269,13 @@

44943

if (items.length != 0 && items [0] != null) showItem (items [0]);

44944

}

44945

44946

-void showItem (int /*long*/ path, boolean scroll) {

44947

+void showItem (long /*int*/ path, boolean scroll) {

44948

int depth = OS.gtk_tree_path_get_depth (path);

44949

if (depth > 1) {

44950

int [] indices = new int [depth - 1];

44951

- int /*long*/ indicesPtr = OS.gtk_tree_path_get_indices (path);

44952

+ long /*int*/ indicesPtr = OS.gtk_tree_path_get_indices (path);

44953

OS.memmove (indices, indicesPtr, indices.length * 4);

44954

- int /*long*/ tempPath = OS.gtk_tree_path_new ();

44955

+ long /*int*/ tempPath = OS.gtk_tree_path_new ();

44956

for (int i=0; i<indices.length; i++) {

44957

OS.gtk_tree_path_append_index (tempPath, indices [i]);

44958

OS.gtk_tree_view_expand_row (handle, tempPath, false);

44959

@@ -3347,12 +3347,12 @@

44960

if (item == null) error (SWT.ERROR_NULL_ARGUMENT);

44961

if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);

44962

if (item.parent != this) return;

44963

- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

44964

+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);

44965

showItem (path, true);

44966

OS.gtk_tree_path_free (path);

44967

}

44968

44969

-int /*long*/ treeSelectionProc (int /*long*/ model, int /*long*/ path, int /*long*/ iter, int[] selection, int length) {

44970

+long /*int*/ treeSelectionProc (long /*int*/ model, long /*int*/ path, long /*int*/ iter, int[] selection, int length) {

44971

if (selection != null) {

44972

int [] index = new int [1];

44973

OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);

44974

@@ -3370,12 +3370,12 @@

44975

* The fix is to queue a resize event for each child to

44976

* force the position to be corrected.

44977

*/

44978

- int /*long*/ parentHandle = parentingHandle ();

44979

- int /*long*/ list = OS.gtk_container_get_children (parentHandle);

44980

+ long /*int*/ parentHandle = parentingHandle ();

44981

+ long /*int*/ list = OS.gtk_container_get_children (parentHandle);

44982

if (list == 0) return;

44983

- int /*long*/ temp = list;

44984

+ long /*int*/ temp = list;

44985

while (temp != 0) {

44986

- int /*long*/ widget = OS.g_list_data (temp);

44987

+ long /*int*/ widget = OS.g_list_data (temp);

44988

if (widget != 0) OS.gtk_widget_queue_resize (widget);

44989

temp = OS.g_list_next (temp);

44990

}

44991

diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/Widget.java

44992

--- x86/org/eclipse/swt/widgets/Widget.java 2009-05-29 17:30:04.000000000 -0400

44993

+++ x86_64/org/eclipse/swt/widgets/Widget.java 2009-09-17 08:48:24.000000000 -0400

44994

@@ -54,7 +54,7 @@

44995

* platforms and should never be accessed from application code.

44996

*

44997

*/

44998

- public int /*long*/ handle;

44999

+ public long /*int*/ handle;

45000

int style, state;

45001

Display display;

45002

EventTable eventTable;

45003

@@ -269,7 +269,7 @@

45004

addListener (SWT.Dispose, typedListener);

45005

}

45006

45007

-int /*long*/ paintWindow () {

45008

+long /*int*/ paintWindow () {

45009

return 0;

45010

}

45011

45012

@@ -285,7 +285,7 @@

45013

return style;

45014

}

45015

45016

-int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*long*/ tree_model, int /*long*/ iter, int /*long*/ data) {

45017

+long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) {

45018

return 0;

45019

}

45020

45021

@@ -406,7 +406,7 @@

45022

}

45023

45024

void destroyWidget () {

45025

- int /*long*/ topHandle = topHandle ();

45026

+ long /*int*/ topHandle = topHandle ();

45027

releaseHandle ();

45028

if (topHandle != 0 && (state & HANDLE) != 0) {

45029

OS.gtk_widget_destroy (topHandle);

45030

@@ -600,269 +600,269 @@

45031

}

45032

45033

45034

-int /*long*/ gtk_activate (int /*long*/ widget) {

45035

+long /*int*/ gtk_activate (long /*int*/ widget) {

45036

return 0;

45037

}

45038

45039

-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {

45040

+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {

45041

return 0;

45042

}

45043

45044

-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) {

45045

+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {

45046

return 0;

45047

}

45048

45049

-int /*long*/ gtk_changed (int /*long*/ widget) {

45050

+long /*int*/ gtk_changed (long /*int*/ widget) {

45051

return 0;

45052

}

45053

45054

-int /*long*/ gtk_change_value (int /*long*/ widget, int /*long*/ scroll, int /*long*/ value1, int /*long*/ value2) {

45055

+long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*int*/ value1, long /*int*/ value2) {

45056

return 0;

45057

}

45058

45059

-int /*long*/ gtk_clicked (int /*long*/ widget) {

45060

+long /*int*/ gtk_clicked (long /*int*/ widget) {

45061

return 0;

45062

}

45063

45064

-int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ text) {

45065

+long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ text) {

45066

return 0;

45067

}

45068

45069

-int /*long*/ gtk_configure_event (int /*long*/ widget, int /*long*/ event) {

45070

+long /*int*/ gtk_configure_event (long /*int*/ widget, long /*int*/ event) {

45071

return 0;

45072

}

45073

45074

-int /*long*/ gtk_day_selected (int /*long*/ widget) {

45075

+long /*int*/ gtk_day_selected (long /*int*/ widget) {

45076

return 0;

45077

}

45078

45079

-int /*long*/ gtk_day_selected_double_click (int /*long*/ widget) {

45080

+long /*int*/ gtk_day_selected_double_click (long /*int*/ widget) {

45081

return 0;

45082

}

45083

45084

-int /*long*/ gtk_delete_event (int /*long*/ widget, int /*long*/ event) {

45085

+long /*int*/ gtk_delete_event (long /*int*/ widget, long /*int*/ event) {

45086

return 0;

45087

}

45088

45089

-int /*long*/ gtk_delete_range (int /*long*/ widget, int /*long*/ iter1, int /*long*/ iter2) {

45090

+long /*int*/ gtk_delete_range (long /*int*/ widget, long /*int*/ iter1, long /*int*/ iter2) {

45091

return 0;

45092

}

45093

45094

-int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /*long*/ end_pos) {

45095

+long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) {

45096

return 0;

45097

}

45098

45099

-int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {

45100

+long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {

45101

return 0;

45102

}

45103

45104

-int /*long*/ gtk_event (int /*long*/ widget, int /*long*/ event) {

45105

+long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) {

45106

return 0;

45107

}

45108

45109

-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ event) {

45110

+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ event) {

45111

return 0;

45112

}

45113

45114

-int /*long*/ gtk_expand_collapse_cursor_row (int /*long*/ widget, int /*long*/ logical, int /*long*/ expand, int /*long*/ open_all) {

45115

+long /*int*/ gtk_expand_collapse_cursor_row (long /*int*/ widget, long /*int*/ logical, long /*int*/ expand, long /*int*/ open_all) {

45116

return 0;

45117

}

45118

45119

-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) {

45120

+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) {

45121

return 0;

45122

}

45123

45124

-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ event) {

45125

+long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ event) {

45126

return 0;

45127

}

45128

45129

-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {

45130

+long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {

45131

return 0;

45132

}

45133

45134

-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {

45135

+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {

45136

return 0;

45137

}

45138

45139

-int /*long*/ gtk_grab_focus (int /*long*/ widget) {

45140

+long /*int*/ gtk_grab_focus (long /*int*/ widget) {

45141

return 0;

45142

}

45143

45144

-int /*long*/ gtk_hide (int /*long*/ widget) {

45145

+long /*int*/ gtk_hide (long /*int*/ widget) {

45146

return 0;

45147

}

45148

45149

-int /*long*/ gtk_input (int /*long*/ widget, int /*long*/ arg1) {

45150

+long /*int*/ gtk_input (long /*int*/ widget, long /*int*/ arg1) {

45151

return 0;

45152

}

45153

45154

-int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*long*/ new_text_length, int /*long*/ position) {

45155

+long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /*int*/ new_text_length, long /*int*/ position) {

45156

return 0;

45157

}

45158

45159

-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {

45160

+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {

45161

GdkEventKey gdkEvent = new GdkEventKey ();

45162

OS.memmove (gdkEvent, event, GdkEventKey.sizeof);

45163

return sendKeyEvent (SWT.KeyDown, gdkEvent) ? 0 : 1;

45164

}

45165

45166

-int /*long*/ gtk_key_release_event (int /*long*/ widget, int /*long*/ event) {

45167

+long /*int*/ gtk_key_release_event (long /*int*/ widget, long /*int*/ event) {

45168

GdkEventKey gdkEvent = new GdkEventKey ();

45169

OS.memmove (gdkEvent, event, GdkEventKey.sizeof);

45170

return sendKeyEvent (SWT.KeyUp, gdkEvent) ? 0 : 1;

45171

}

45172

45173

-int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {

45174

+long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) {

45175

return 0;

45176

}

45177

45178

-int /*long*/ gtk_map (int /*long*/ widget) {

45179

+long /*int*/ gtk_map (long /*int*/ widget) {

45180

return 0;

45181

}

45182

45183

-int /*long*/ gtk_map_event (int /*long*/ widget, int /*long*/ event) {

45184

+long /*int*/ gtk_map_event (long /*int*/ widget, long /*int*/ event) {

45185

return 0;

45186

}

45187

45188

-int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {

45189

+long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {

45190

return 0;

45191

}

45192

45193

-int /*long*/ gtk_month_changed (int /*long*/ widget) {

45194

+long /*int*/ gtk_month_changed (long /*int*/ widget) {

45195

return 0;

45196

}

45197

45198

-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {

45199

+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {

45200

return 0;

45201

}

45202

45203

-int /*long*/ gtk_move_focus (int /*long*/ widget, int /*long*/ event) {

45204

+long /*int*/ gtk_move_focus (long /*int*/ widget, long /*int*/ event) {

45205

return 0;

45206

}

45207

45208

-int /*long*/ gtk_output (int /*long*/ widget) {

45209

+long /*int*/ gtk_output (long /*int*/ widget) {

45210

return 0;

45211

}

45212

45213

-int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) {

45214

+long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) {

45215

return 0;

45216

}

45217

45218

-int /*long*/ gtk_popup_menu (int /*long*/ widget) {

45219

+long /*int*/ gtk_popup_menu (long /*int*/ widget) {

45220

return 0;

45221

}

45222

45223

-int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {

45224

+long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) {

45225

return 0;

45226

}

45227

45228

-int /*long*/ gtk_realize (int /*long*/ widget) {

45229

+long /*int*/ gtk_realize (long /*int*/ widget) {

45230

return 0;

45231

}

45232

45233

-int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long*/ column) {

45234

+long /*int*/ gtk_row_activated (long /*int*/ tree, long /*int*/ path, long /*int*/ column) {

45235

return 0;

45236

}

45237

45238

-int /*long*/ gtk_row_deleted (int /*long*/ model, int /*long*/ path) {

45239

+long /*int*/ gtk_row_deleted (long /*int*/ model, long /*int*/ path) {

45240

return 0;

45241

}

45242

45243

-int /*long*/ gtk_row_inserted (int /*long*/ model, int /*long*/ path, int /*long*/ iter) {

45244

+long /*int*/ gtk_row_inserted (long /*int*/ model, long /*int*/ path, long /*int*/ iter) {

45245

return 0;

45246

}

45247

45248

-int /*long*/ gtk_scroll_child (int /*long*/ widget, int /*long*/ scrollType, int /*long*/ horizontal) {

45249

+long /*int*/ gtk_scroll_child (long /*int*/ widget, long /*int*/ scrollType, long /*int*/ horizontal) {

45250

return 0;

45251

}

45252

45253

-int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ event) {

45254

+long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ event) {

45255

return 0;

45256

}

45257

45258

-int /*long*/ gtk_select (int /*long*/ item) {

45259

+long /*int*/ gtk_select (long /*int*/ item) {

45260

return 0;

45261

}

45262

45263

-int /*long*/ gtk_show (int /*long*/ widget) {

45264

+long /*int*/ gtk_show (long /*int*/ widget) {

45265

return 0;

45266

}

45267

45268

-int /*long*/ gtk_show_help (int /*long*/ widget, int /*long*/ helpType) {

45269

+long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) {

45270

return 0;

45271

}

45272

45273

-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {

45274

+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {

45275

return 0;

45276

}

45277

45278

-int /*long*/ gtk_status_icon_popup_menu (int /*long*/ handle, int /*long*/ button, int /*long*/ activate_time) {

45279

+long /*int*/ gtk_status_icon_popup_menu (long /*int*/ handle, long /*int*/ button, long /*int*/ activate_time) {

45280

return 0;

45281

}

45282

45283

-int /*long*/ gtk_style_set (int /*long*/ widget, int /*long*/ previousStyle) {

45284

+long /*int*/ gtk_style_set (long /*int*/ widget, long /*int*/ previousStyle) {

45285

return 0;

45286

}

45287

45288

-int /*long*/ gtk_switch_page (int /*long*/ widget, int /*long*/ page, int /*long*/ page_num) {

45289

+long /*int*/ gtk_switch_page (long /*int*/ widget, long /*int*/ page, long /*int*/ page_num) {

45290

return 0;

45291

}

45292

45293

-int /*long*/ gtk_test_collapse_row (int /*long*/ tree, int /*long*/ iter, int /*long*/ path) {

45294

+long /*int*/ gtk_test_collapse_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) {

45295

return 0;

45296

}

45297

45298

-int /*long*/ gtk_test_expand_row (int /*long*/ tree, int /*long*/ iter, int /*long*/ path) {

45299

+long /*int*/ gtk_test_expand_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) {

45300

return 0;

45301

}

45302

45303

-int /*long*/ gtk_text_buffer_insert_text (int /*long*/ widget, int /*long*/ iter, int /*long*/ text, int /*long*/ length) {

45304

+long /*int*/ gtk_text_buffer_insert_text (long /*int*/ widget, long /*int*/ iter, long /*int*/ text, long /*int*/ length) {

45305

return 0;

45306

}

45307

45308

-int /*long*/ gtk_timer () {

45309

+long /*int*/ gtk_timer () {

45310

return 0;

45311

}

45312

45313

-int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {

45314

+long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) {

45315

return 0;

45316

}

45317

45318

-int /*long*/ gtk_unmap (int /*long*/ widget) {

45319

+long /*int*/ gtk_unmap (long /*int*/ widget) {

45320

return 0;

45321

}

45322

45323

-int /*long*/ gtk_unmap_event (int /*long*/ widget, int /*long*/ event) {

45324

+long /*int*/ gtk_unmap_event (long /*int*/ widget, long /*int*/ event) {

45325

return 0;

45326

}

45327

45328

-int /*long*/ gtk_unrealize (int /*long*/ widget) {

45329

+long /*int*/ gtk_unrealize (long /*int*/ widget) {

45330

return 0;

45331

}

45332

45333

-int /*long*/ gtk_value_changed (int /*long*/ adjustment) {

45334

+long /*int*/ gtk_value_changed (long /*int*/ adjustment) {

45335

return 0;

45336

}

45337

45338

-int /*long*/ gtk_visibility_notify_event (int /*long*/ widget, int /*long*/ event) {

45339

+long /*int*/ gtk_visibility_notify_event (long /*int*/ widget, long /*int*/ event) {

45340

return 0;

45341

}

45342

45343

-int /*long*/ gtk_window_state_event (int /*long*/ widget, int /*long*/ event) {

45344

+long /*int*/ gtk_window_state_event (long /*int*/ widget, long /*int*/ event) {

45345

return 0;

45346

}

45347

45348

-int fontHeight (int /*long*/ font, int /*long*/ widgetHandle) {

45349

- int /*long*/ context = OS.gtk_widget_get_pango_context (widgetHandle);

45350

- int /*long*/ lang = OS.pango_context_get_language (context);

45351

- int /*long*/ metrics = OS.pango_context_get_metrics (context, font, lang);

45352

+int fontHeight (long /*int*/ font, long /*int*/ widgetHandle) {

45353

+ long /*int*/ context = OS.gtk_widget_get_pango_context (widgetHandle);

45354

+ long /*int*/ lang = OS.pango_context_get_language (context);

45355

+ long /*int*/ metrics = OS.pango_context_get_metrics (context, font, lang);

45356

int ascent = OS.pango_font_metrics_get_ascent (metrics);

45357

int descent = OS.pango_font_metrics_get_descent (metrics);

45358

OS.pango_font_metrics_unref (metrics);

45359

return OS.PANGO_PIXELS (ascent + descent);

45360

}

45361

45362

-int /*long*/ filterProc(int /*long*/ xEvent, int /*long*/ gdkEvent, int /*long*/ data2) {

45363

+long /*int*/ filterProc(long /*int*/ xEvent, long /*int*/ gdkEvent, long /*int*/ data2) {

45364

return 0;

45365

}

45366

45367

@@ -870,11 +870,11 @@

45368

return display.filters (eventType);

45369

}

45370

45371

-int /*long*/ fixedMapProc (int /*long*/ widget) {

45372

+long /*int*/ fixedMapProc (long /*int*/ widget) {

45373

return 0;

45374

}

45375

45376

-int /*long*/ fixedSizeAllocateProc(int /*long*/ widget, int /*long*/ allocationPtr) {

45377

+long /*int*/ fixedSizeAllocateProc(long /*int*/ widget, long /*int*/ allocationPtr) {

45378

return OS.Call (Display.oldFixedSizeAllocateProc, widget, allocationPtr);

45379

}

45380

45381

@@ -973,15 +973,15 @@

45382

return eventTable.hooks (eventType);

45383

}

45384

45385

-int /*long*/ hoverProc (int /*long*/ widget) {

45386

+long /*int*/ hoverProc (long /*int*/ widget) {

45387

return 0;

45388

}

45389

45390

-int /*long*/ menuPositionProc (int /*long*/ menu, int /*long*/ x, int /*long*/ y, int /*long*/ push_in, int /*long*/ user_data) {

45391

+long /*int*/ menuPositionProc (long /*int*/ menu, long /*int*/ x, long /*int*/ y, long /*int*/ push_in, long /*int*/ user_data) {

45392

return 0;

45393

}

45394

45395

-boolean mnemonicHit (int /*long*/ mnemonicHandle, char key) {

45396

+boolean mnemonicHit (long /*int*/ mnemonicHandle, char key) {

45397

if (!mnemonicMatch (mnemonicHandle, key)) return false;

45398

OS.g_signal_handlers_block_matched (mnemonicHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, MNEMONIC_ACTIVATE);

45399

boolean result = OS.gtk_widget_mnemonic_activate (mnemonicHandle, false);

45400

@@ -989,13 +989,13 @@

45401

return result;

45402

}

45403

45404

-boolean mnemonicMatch (int /*long*/ mnemonicHandle, char key) {

45405

+boolean mnemonicMatch (long /*int*/ mnemonicHandle, char key) {

45406

int keyval1 = OS.gdk_keyval_to_lower (OS.gdk_unicode_to_keyval (key));

45407

int keyval2 = OS.gdk_keyval_to_lower (OS.gtk_label_get_mnemonic_keyval (mnemonicHandle));

45408

return keyval1 == keyval2;

45409

}

45410

45411

-void modifyStyle (int /*long*/ handle, int /*long*/ style) {

45412

+void modifyStyle (long /*int*/ handle, long /*int*/ style) {

45413

OS.gtk_widget_modify_style (handle, style);

45414

}

45415

45416

@@ -1138,11 +1138,11 @@

45417

eventTable.unhook (eventType, handler);

45418

}

45419

45420

-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) {

45421

+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) {

45422

return 0;

45423

}

45424

45425

-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) {

45426

+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) {

45427

return 0;

45428

}

45429

45430

@@ -1229,7 +1229,7 @@

45431

45432

char [] sendIMKeyEvent (int type, GdkEventKey keyEvent, char [] chars) {

45433

int index = 0, count = 0, state = 0;

45434

- int /*long*/ ptr = 0;

45435

+ long /*int*/ ptr = 0;

45436

if (keyEvent == null) {

45437

ptr = OS.gtk_get_current_event ();

45438

if (ptr != 0) {

45439

@@ -1384,8 +1384,8 @@

45440

}

45441

}

45442

45443

-void setForegroundColor (int /*long*/ handle, GdkColor color) {

45444

- int /*long*/ style = OS.gtk_widget_get_modifier_style (handle);

45445

+void setForegroundColor (long /*int*/ handle, GdkColor color) {

45446

+ long /*int*/ style = OS.gtk_widget_get_modifier_style (handle);

45447

OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_NORMAL, color);

45448

OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_ACTIVE, color);

45449

OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_PRELIGHT, color);

45450

@@ -1473,15 +1473,15 @@

45451

return false;

45452

}

45453

45454

-int /*long*/ shellMapProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {

45455

+long /*int*/ shellMapProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {

45456

return 0;

45457

}

45458

45459

-int /*long*/ sizeAllocateProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {

45460

+long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {

45461

return 0;

45462

}

45463

45464

-int /*long*/ sizeRequestProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {

45465

+long /*int*/ sizeRequestProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {

45466

return 0;

45467

}

45468

45469

@@ -1500,15 +1500,15 @@

45470

return getName () + " {" + string + "}";

45471

}

45472

45473

-int /*long*/ topHandle () {

45474

+long /*int*/ topHandle () {

45475

return handle;

45476

}

45477

45478

-int /*long*/ timerProc (int /*long*/ widget) {

45479

+long /*int*/ timerProc (long /*int*/ widget) {

45480

return 0;

45481

}

45482

45483

-int /*long*/ treeSelectionProc (int /*long*/ model, int /*long*/ path, int /*long*/ iter, int [] selection, int length) {

45484

+long /*int*/ treeSelectionProc (long /*int*/ model, long /*int*/ path, long /*int*/ iter, int [] selection, int length) {

45485

return 0;

45486

}

45487

45488

@@ -1516,7 +1516,7 @@

45489

return false;

45490

}

45491

45492

-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {

45493

+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) {

45494

switch ((int)/*64*/user_data) {

45495

case ACTIVATE: return gtk_activate (handle);

45496

case CHANGED: return gtk_changed (handle);

45497

@@ -1540,13 +1540,13 @@

45498

}

45499

}

45500

45501

-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {

45502

+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {

45503

switch ((int)/*64*/user_data) {

45504

case EXPOSE_EVENT_INVERSE: {

45505

GdkEventExpose gdkEvent = new GdkEventExpose ();

45506

OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);

45507

- int /*long*/ paintWindow = paintWindow();

45508

- int /*long*/ window = gdkEvent.window;

45509

+ long /*int*/ paintWindow = paintWindow();

45510

+ long /*int*/ window = gdkEvent.window;

45511

if (window != paintWindow) return 0;

45512

return (state & OBSCURED) != 0 ? 1 : 0;

45513

}

45514

@@ -1589,7 +1589,7 @@

45515

}

45516

}

45517

45518

-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) {

45519

+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) {

45520

switch ((int)/*64*/user_data) {

45521

case DELETE_RANGE: return gtk_delete_range (handle, arg0, arg1);

45522

case DELETE_TEXT: return gtk_delete_text (handle, arg0, arg1);

45523

@@ -1604,7 +1604,7 @@

45524

}

45525

}

45526

45527

-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) {

45528

+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) {

45529

switch ((int)/*64*/user_data) {

45530

case CHANGE_VALUE: return gtk_change_value (handle, arg0, arg1, arg2);

45531

case EXPAND_COLLAPSE_CURSOR_ROW: return gtk_expand_collapse_cursor_row (handle, arg0, arg1, arg2);