--- a/javauis/eswt_qt/org.eclipse.swt/Eclipse SWT/qt/org/eclipse/swt/graphics/Image.java	Thu May 27 12:49:31 2010 +0300
+++ b/javauis/eswt_qt/org.eclipse.swt/Eclipse SWT/qt/org/eclipse/swt/graphics/Image.java	Fri Jun 11 13:33:44 2010 +0300
@@ -160,7 +160,6 @@
      * @param device Device
      */
     Image(Device device) {
-        if (device == null) device = Device.getDevice();
         if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
         this.device = device;
     }
@@ -450,7 +449,7 @@
 
         if (device == null) return;
         if (device.isDisposed()) return;
-        if (device.tracking) device.dispose_Object(this);
+        if (Device.tracking) device.dispose_Object(this);
         device = null;
     }
 
@@ -820,6 +819,6 @@
      * Call this only after dealing with all exceptions!
      */
     private void track() {
-        if (device.tracking) device.new_Object(this);
+        if (Device.tracking) device.new_Object(this);
     }
 }