diff options
author | Sven Gothel <[email protected]> | 2001-02-13 05:32:07 +0000 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2001-02-13 05:32:07 +0000 |
commit | 3e2b16a820bfe03f8f3837c3aaa615c8c4b7f18c (patch) | |
tree | d834a05eb37751b4c95045c3021589f2e22fcd9f /gl4java/jau/awt | |
parent | 91bc9d109b2d16e6d42f1fbcc9d3dbca51c40b69 (diff) |
JAWT Support JDK >=1.3
Diffstat (limited to 'gl4java/jau/awt')
-rw-r--r-- | gl4java/jau/awt/WinHandleAccess.java | 4 | ||||
-rw-r--r-- | gl4java/jau/awt/macintosh/MacHandleAccess.java | 8 | ||||
-rw-r--r-- | gl4java/jau/awt/motif/X11HandleAccess.java | 7 | ||||
-rw-r--r-- | gl4java/jau/awt/windows/MSWin32HandleAccess.java | 7 | ||||
-rw-r--r-- | gl4java/jau/awt/windows/Win32HandleAccess.java | 7 |
5 files changed, 18 insertions, 15 deletions
diff --git a/gl4java/jau/awt/WinHandleAccess.java b/gl4java/jau/awt/WinHandleAccess.java index b6e8c87..1a491ce 100644 --- a/gl4java/jau/awt/WinHandleAccess.java +++ b/gl4java/jau/awt/WinHandleAccess.java @@ -14,8 +14,8 @@ import java.awt.Graphics; */
public interface WinHandleAccess
{
- public abstract int getWinHandle(Component component, Graphics g);
+ public abstract long getWinHandle(Component component, Graphics g);
- public abstract int getWinDepth(Component component, Graphics g);
+ public abstract int getWinDepth(Component component, Graphics g);
}
diff --git a/gl4java/jau/awt/macintosh/MacHandleAccess.java b/gl4java/jau/awt/macintosh/MacHandleAccess.java index db1c3ef..853662d 100644 --- a/gl4java/jau/awt/macintosh/MacHandleAccess.java +++ b/gl4java/jau/awt/macintosh/MacHandleAccess.java @@ -29,8 +29,8 @@ public class MacHandleAccess implements gl4java.jau.awt.WinHandleAccess protected DrawingSurface ds; protected DrawingSurfaceInfo dsi; protected MacDrawingSurface mds; - protected int window, - depth; + protected long window; + protected int depth; protected void achieveData(java.awt.Component c, java.awt.Graphics g) @@ -55,7 +55,7 @@ public class MacHandleAccess implements gl4java.jau.awt.WinHandleAccess { dsi.lock(); - window = mds.getPort(); + window = (long) mds.getPort(); depth = c.getColorModel().getPixelSize(); dsi.unlock(); @@ -71,7 +71,7 @@ public class MacHandleAccess implements gl4java.jau.awt.WinHandleAccess * * gets some structure for windows, and drawable on Mac */ - public int getWinHandle(java.awt.Component c, java.awt.Graphics g) + public long getWinHandle(java.awt.Component c, java.awt.Graphics g) { achieveData(c, g); return window; diff --git a/gl4java/jau/awt/motif/X11HandleAccess.java b/gl4java/jau/awt/motif/X11HandleAccess.java index f07e111..8d6b27e 100644 --- a/gl4java/jau/awt/motif/X11HandleAccess.java +++ b/gl4java/jau/awt/motif/X11HandleAccess.java @@ -27,7 +27,8 @@ public class X11HandleAccess {
protected DrawingSurfaceInfo dsi;
protected X11DrawingSurface wds;
- protected int window, depth;
+ protected long window;
+ protected int depth;
protected void achieveData(java.awt.Component c, java.awt.Graphics g)
{
@@ -46,7 +47,7 @@ public class X11HandleAccess if(wds!=null)
{
dsi.lock();
- window = wds.getDrawable();
+ window = (long) wds.getDrawable();
depth = wds.getDepth();
/*
@@ -67,7 +68,7 @@ public class X11HandleAccess *
* gets some structure for windows, and drawable on X11
*/
- public int getWinHandle(java.awt.Component c, java.awt.Graphics g)
+ public long getWinHandle(java.awt.Component c, java.awt.Graphics g)
{
achieveData(c, g);
return window;
diff --git a/gl4java/jau/awt/windows/MSWin32HandleAccess.java b/gl4java/jau/awt/windows/MSWin32HandleAccess.java index 1dd4d93..76809f3 100644 --- a/gl4java/jau/awt/windows/MSWin32HandleAccess.java +++ b/gl4java/jau/awt/windows/MSWin32HandleAccess.java @@ -24,7 +24,8 @@ import com.ms.awt.GraphicsX; public class MSWin32HandleAccess
implements gl4java.jau.awt.WinHandleAccess
{
- protected int window, depth;
+ protected long window;
+ protected int depth;
/**
* @dll.import("USER32",auto)
@@ -33,7 +34,7 @@ public class MSWin32HandleAccess protected void achieveData(java.awt.Component c, java.awt.Graphics g)
{
- window = WindowFromDC(((GraphicsX)g).gdc.pGetDC());
+ window = (long) WindowFromDC(((GraphicsX)g).gdc.pGetDC());
depth = c.getColorModel().getPixelSize();
}
@@ -41,7 +42,7 @@ public class MSWin32HandleAccess *
* get the window handle
*/
- public int getWinHandle(java.awt.Component c, java.awt.Graphics g)
+ public long getWinHandle(java.awt.Component c, java.awt.Graphics g)
{
achieveData(c, g);
return window;
diff --git a/gl4java/jau/awt/windows/Win32HandleAccess.java b/gl4java/jau/awt/windows/Win32HandleAccess.java index 38b5c93..d4a698f 100644 --- a/gl4java/jau/awt/windows/Win32HandleAccess.java +++ b/gl4java/jau/awt/windows/Win32HandleAccess.java @@ -28,7 +28,8 @@ public class Win32HandleAccess protected DrawingSurfaceInfo dsi;
protected Win32DrawingSurface wds;
- protected int window, depth;
+ protected long window;
+ protected int depth;
protected void achieveData(java.awt.Component c, java.awt.Graphics g)
{
@@ -47,7 +48,7 @@ public class Win32HandleAccess if(wds!=null)
{
dsi.lock();
- window = wds.getHDC();
+ window = (long) wds.getHDC();
depth = wds.getDepth();
/*
System.out.println("wds ="+wds);
@@ -65,7 +66,7 @@ public class Win32HandleAccess *
* gets some structure for windows, and drawable on Win32
*/
- public int getWinHandle(java.awt.Component c, java.awt.Graphics g)
+ public long getWinHandle(java.awt.Component c, java.awt.Graphics g)
{
achieveData(c, g);
return window;
|