javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/org/eclipse/swt/graphics/Internal_GfxPackageSupport.java
--- a/javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/org/eclipse/swt/graphics/Internal_GfxPackageSupport.java Tue Jul 06 14:10:26 2010 +0300
+++ b/javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/org/eclipse/swt/graphics/Internal_GfxPackageSupport.java Wed Aug 18 09:43:15 2010 +0300
@@ -11,6 +11,8 @@
package org.eclipse.swt.graphics;
+import java.io.InputStream;
+
/**
* <p>
* <b>IMPORTANT:</b> This class is <em>not</em> part of the SWT public API. It
@@ -24,27 +26,48 @@
public static int getNullIconHandle() {
return Image.getNullIconHandle();
}
-public static Image new_Image(Device device, org.eclipse.swt.internal.qt.graphics.Image cgImage) {
- return Image.new_Image(device, cgImage);
+
+public static Image new_Image(Device device,
+ org.eclipse.swt.internal.qt.graphics.Image cgImage) {
+ return Image.qt_new(device, cgImage);
}
+
public static int getIconHandle(Image i) {
return i.getIconHandle();
}
+
public static org.eclipse.swt.internal.qt.graphics.Image getImage(Image i) {
return i.getImage();
}
+
public static int getImageHandle(Image i) {
return i.getImageHandle();
}
+
public static int getPixmapHandle(Image i) {
return i.getPixmapHandle();
}
+
+public static Image createImageWithoutSecurityCheck(Device device,
+ String filename) {
+ return Image.createImageWithoutSecurityCheck(device, filename);
+}
+
+public static Point getImageSize(Device device, String filename) {
+ return Image.getImageSize(device, filename);
+}
+
+public static Point getImageSize(InputStream stream) {
+ return Image.getImageSize(stream);
+}
+
/*
* From the class Device
*/
public static boolean internal(Device d) {
return d.internal;
}
+
public static boolean initialized() {
return Device.initialized;
}
@@ -52,15 +75,9 @@
public static Color newColor(Device device, int handle) {
return Color.qt_new(device, handle);
}
+
public static Font newFont(Device device, int handle) {
return Font.qt_new(device, handle);
}
-/*
- * From the class Image
- */
-public static Image createImageWithoutSecurityCheck(Device device,
- String filename) {
- return Image.createImageWithoutSecurityCheck(device, filename);
}
-}