@@ -293,7 +293,56 @@ $wt = org.eclipse.swt;
293293var path = ClazzLoader . getClasspathFor ( "org.eclipse.swt.*" ) ;
294294
295295// The core.z.js should already intialized
296- ClazzLoader . loadZJar ( path + "events.z.js" , "org.eclipse.swt.widgets.EventTable" ) ;
296+ ClazzLoader . loadZJar ( path + "events.z.js" , [
297+ "org.eclipse.swt.internal.SWTEventListener" ,
298+ "$.SWTEventObject" ,
299+ "org.eclipse.swt.widgets.Event" ,
300+ "org.eclipse.swt.events.TypedEvent" ,
301+ "$.ArmEvent" ,
302+ "$.ControlEvent" ,
303+ "$.DisposeEvent" ,
304+ "$.FocusEvent" ,
305+ "$.HelpEvent" ,
306+ "$.KeyEvent" ,
307+ "$.MenuEvent" ,
308+ "$.ModifyEvent" ,
309+ "$.MouseAdapter" ,
310+ "$.MouseEvent" ,
311+ "$.PaintEvent" ,
312+ "$.SelectionEvent" ,
313+ "$.ShellEvent" ,
314+ "$.TraverseEvent" ,
315+ "$.TreeEvent" ,
316+ "$.VerifyEvent" ,
317+ "org.eclipse.swt.widgets.Listener" ,
318+ "$.TypedListener" ,
319+ "org.eclipse.swt.events.ArmListener" ,
320+ "$.ControlListener" ,
321+ "$.ControlAdapter" ,
322+ "$.DisposeListener" ,
323+ "$.FocusListener" ,
324+ "$.FocusAdapter" ,
325+ "$.HelpListener" ,
326+ "$.KeyListener" ,
327+ "$.KeyAdapter" ,
328+ "$.MenuListener" ,
329+ "$.MenuAdapter" ,
330+ "$.ModifyListener" ,
331+ "$.MouseListener" ,
332+ "$.MouseMoveListener" ,
333+ "$.MouseTrackListener" ,
334+ "$.MouseTrackAdapter" ,
335+ "$.PaintListener" ,
336+ "$.SelectionListener" ,
337+ "$.SelectionAdapter" ,
338+ "$.ShellListener" ,
339+ "$.ShellAdapter" ,
340+ "$.TraverseListener" ,
341+ "$.TreeListener" ,
342+ "$.TreeAdapter" ,
343+ "$.VerifyListener" ,
344+ "org.eclipse.swt.widgets.EventTable"
345+ ] ) ;
297346
298347var isDebugging = ( window [ "swt.debugging" ] == true ) ;
299348if ( ! isDebugging ) {
@@ -323,6 +372,10 @@ if (!isDebugging) {
323372"$.Device" ,
324373"$.DeviceData" ,
325374
375+ "$.FontData" ,
376+ "$.FontMetrics" ,
377+ "$.Font" ,
378+
326379"$wt.widgets.Monitor"
327380] ) ;
328381ClazzLoader . jarClasspath ( path + "more.z.js" , [
@@ -334,12 +387,20 @@ if (!isDebugging) {
334387"$.ShellFrameDND" ,
335388
336389"$wt.internal.browser.OS" ,
390+ "$.Popup" ,
337391
338392"$wt.graphics.Image" ,
339393"$.ImageData" ,
340394"$wt.widgets.Item" ,
341395"$.Layout"
342396] ) ;
397+
398+ ClazzLoader . jarClasspath ( ClazzLoader . getClasspathFor ( "org.eclipse.swt.*" ) + "SWT.z.js" , [
399+ "$wt.SWT" ,
400+ "$.SWTError" ,
401+ "$.SWTException"
402+ ] ) ;
403+
343404var wPath = ClazzLoader . getClasspathFor ( "org.eclipse.swt.widgets.*" ) ;
344405ClazzLoader . jarClasspath ( wPath + "Shell.z.js" , [
345406"$wt.widgets.Display" ,
@@ -351,7 +412,8 @@ if (!isDebugging) {
351412"$.Canvas" ,
352413"$.Decorations" ,
353414"$.ShellManager" ,
354- "$.Shell"
415+ "$.Shell" ,
416+ "$.Dialog"
355417] ) ;
356418var w = "$wt.widgets." ;
357419ClazzLoader . jarClasspath ( wPath + "Tree.z.js" , [
@@ -414,11 +476,6 @@ if (!isDebugging) {
414476"$wt.internal.dnd.ScaleDND" ,
415477w + "Scale"
416478] ) ;
417- //if (false)
418- ClazzLoader . jarClasspath ( wPath + "TabFolder.z.js" , [
419- w + "TabItem" ,
420- "$.TabFolder"
421- ] ) ;
422479ClazzLoader . jarClasspath ( wPath + "Menu.z.js" , [
423480w + "MenuItem" ,
424481"$.Menu"
@@ -427,6 +484,14 @@ if (!isDebugging) {
427484w + "CoolItem" ,
428485"$.CoolBar"
429486] ) ;
487+ ClazzLoader . jarClasspath ( wPath + "Common.z.js" , [
488+ w + "Label" ,
489+ "$.Button" ,
490+ "$.Text" ,
491+ "$.Group" ,
492+ "$.TabItem" ,
493+ "$.TabFolder"
494+ ] ) ;
430495
431496var lPath = ClazzLoader . getClasspathFor ( "org.eclipse.swt.layout.*" ) ;
432497var l = "$wt.layout." ;
@@ -448,13 +513,6 @@ if (!isDebugging) {
448513"$.FormLayout"
449514] ) ;
450515
451- var gPath = ClazzLoader . getClasspathFor ( "org.eclipse.swt.graphics.*" ) ;
452- var g = "$wt.graphics." ;
453- ClazzLoader . jarClasspath ( gPath + "Font.z.js" , [
454- g + "FontData" ,
455- "$.FontMetrics" ,
456- "$.Font"
457- ] ) ;
458516/*
459517ClazzLoader.jarClasspath (path + "events.js", [
460518"java.util.AbstractList",