|
24 | 24 |
|
25 | 25 | package processing.opengl; |
26 | 26 |
|
27 | | -import java.awt.Component; |
28 | | -import java.awt.EventQueue; |
29 | | -import java.awt.FileDialog; |
30 | | -import java.awt.GraphicsDevice; |
31 | | -import java.awt.GraphicsEnvironment; |
32 | | -import java.awt.Point; |
33 | | -import java.awt.Rectangle; |
34 | | -import java.awt.image.BufferedImage; |
35 | | -import java.awt.image.DataBufferInt; |
36 | | -import java.io.File; |
37 | | -import java.io.FileInputStream; |
38 | | -import java.io.IOException; |
39 | | -import java.io.InputStream; |
40 | | -import java.net.URL; |
41 | | -import java.nio.ByteBuffer; |
42 | | -import java.util.ArrayList; |
43 | | -import java.util.HashMap; |
44 | | -import java.util.Map; |
45 | | - |
46 | | -import javax.swing.ImageIcon; |
47 | | - |
48 | 27 | import com.jogamp.common.util.IOUtil; |
49 | 28 | import com.jogamp.common.util.IOUtil.ClassResources; |
| 29 | +import com.jogamp.nativewindow.MutableGraphicsConfiguration; |
50 | 30 | import com.jogamp.nativewindow.NativeSurface; |
51 | 31 | import com.jogamp.nativewindow.ScalableSurface; |
| 32 | +import com.jogamp.nativewindow.WindowClosingProtocol; |
52 | 33 | import com.jogamp.nativewindow.util.Dimension; |
53 | 34 | import com.jogamp.nativewindow.util.PixelFormat; |
54 | 35 | import com.jogamp.nativewindow.util.PixelRectangle; |
55 | | -import com.jogamp.opengl.GLAutoDrawable; |
56 | | -import com.jogamp.opengl.GLCapabilities; |
57 | | -import com.jogamp.opengl.GLEventListener; |
58 | | -import com.jogamp.opengl.GLException; |
59 | | -import com.jogamp.opengl.GLProfile; |
60 | | -import com.jogamp.opengl.GLDrawableFactory; |
61 | | -import com.jogamp.nativewindow.MutableGraphicsConfiguration; |
62 | | -import com.jogamp.nativewindow.WindowClosingProtocol; |
63 | 36 | import com.jogamp.newt.Display; |
64 | 37 | import com.jogamp.newt.Display.PointerIcon; |
65 | 38 | import com.jogamp.newt.NewtFactory; |
66 | 39 | import com.jogamp.newt.Screen; |
67 | 40 | import com.jogamp.newt.awt.NewtCanvasAWT; |
68 | 41 | import com.jogamp.newt.opengl.GLWindow; |
| 42 | +import com.jogamp.opengl.*; |
69 | 43 | import com.jogamp.opengl.util.FPSAnimator; |
70 | | - |
71 | | -import processing.core.PApplet; |
72 | | -import processing.core.PConstants; |
73 | | -import processing.core.PGraphics; |
74 | | -import processing.core.PImage; |
75 | | -import processing.core.PSurface; |
| 44 | +import processing.awt.PImageAWT; |
| 45 | +import processing.awt.ShimAWT; |
| 46 | +import processing.core.*; |
76 | 47 | import processing.event.KeyEvent; |
77 | 48 | import processing.event.MouseEvent; |
78 | | -import processing.awt.PImageAWT; |
79 | 49 |
|
80 | | -// have this removed by 4.0 final |
81 | | -import processing.awt.ShimAWT; |
| 50 | +import javax.swing.*; |
| 51 | +import java.awt.*; |
| 52 | +import java.awt.image.BufferedImage; |
| 53 | +import java.awt.image.DataBufferInt; |
| 54 | +import java.io.File; |
| 55 | +import java.io.FileInputStream; |
| 56 | +import java.io.IOException; |
| 57 | +import java.io.InputStream; |
| 58 | +import java.net.URL; |
| 59 | +import java.nio.ByteBuffer; |
| 60 | +import java.util.ArrayList; |
| 61 | +import java.util.HashMap; |
| 62 | +import java.util.Map; |
82 | 63 |
|
83 | 64 |
|
84 | 65 | public class PSurfaceJOGL implements PSurface { |
@@ -489,7 +470,7 @@ protected void initIcons() { |
489 | 470 | sketch.getClass().getClassLoader(), |
490 | 471 | sketch.getClass()); |
491 | 472 | } |
492 | | - NewtFactory.setWindowIcons(res); |
| 473 | + if (PApplet.platform == PConstants.WINDOWS) NewtFactory.setWindowIcons(res); |
493 | 474 | } |
494 | 475 |
|
495 | 476 |
|
|
0 commit comments