From 315e4f3422651f74f312e38493b58896306de2a8 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:04:39 +0000 Subject: [PATCH] 2003/09/04 07:16:17 darcs-hash:20040130070439-2ba56-0bb45b2efc1181ee0dc52b4fdadc41988baa57fe.gz --- src/org/xwt/plat/GCJ.cc | 13 ------------- src/org/xwt/plat/GCJ.java | 1 - src/org/xwt/plat/X11.cc | 4 ++-- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/org/xwt/plat/GCJ.cc b/src/org/xwt/plat/GCJ.cc index 030dfbe..c1333e4 100644 --- a/src/org/xwt/plat/GCJ.cc +++ b/src/org/xwt/plat/GCJ.cc @@ -19,19 +19,6 @@ extern "C" { -// builtin.xwar ///////////////////////////////////////////////////////// - -extern unsigned char builtin_xwar[]; -extern int builtin_xwar_length; - -java::io::InputStream* org::xwt::plat::GCJ::_getBuiltinInputStream() { - jbyteArray ret = JvNewByteArray(builtin_xwar_length); - memcpy(elements(ret), builtin_xwar, builtin_xwar_length); - return new java::io::ByteArrayInputStream(ret); -} - - - // JPEG //////////////////////////////////////////////////////////////// #define INPUT_BUF_SIZE (1024 * 16) diff --git a/src/org/xwt/plat/GCJ.java b/src/org/xwt/plat/GCJ.java index aec30f8..6f545c0 100644 --- a/src/org/xwt/plat/GCJ.java +++ b/src/org/xwt/plat/GCJ.java @@ -20,7 +20,6 @@ public abstract class GCJ extends Platform { private static Class c9 = gnu.java.locale.Calendar_en_US.class; protected org.xwt.Weak _getWeak(Object o) { return new Java2Weak(o); } - protected native InputStream _getBuiltinInputStream(); private static class Java2Weak extends java.lang.ref.WeakReference implements org.xwt.Weak { public Java2Weak(Object o) { super(o); } diff --git a/src/org/xwt/plat/X11.cc b/src/org/xwt/plat/X11.cc index 73d1541..876c9a8 100644 --- a/src/org/xwt/plat/X11.cc +++ b/src/org/xwt/plat/X11.cc @@ -577,8 +577,8 @@ void org::xwt::plat::X11$X11Surface::dispatchEvent(gnu::gcj::RawData* ev) { int x_out, y_out; XConfigureEvent* xce = (XConfigureEvent*)(e); XTranslateCoordinates(display, (*((Window*)window)), RootWindow(display, screen_num), 0, 0, &x_out, &y_out, &child); - if (xce->width != width || xce->height != height) SizeChange(xce->width, xce->height); - if (x_out != root->abs(0) || y_out != root->abs(1)) PosChange(x_out, y_out); + if (xce->width != root->width || xce->height != root->height) SizeChange(xce->width, xce->height); + if (x_out != root->x || y_out != root->y) PosChange(x_out, y_out); } } -- 1.7.10.4