diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-28 13:29:13 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-28 13:29:13 +0000 |
| commit | 1020ce5944edde4364baef4d371cd4f9b0dae721 (patch) | |
| tree | 602cd7aa7c947386134690d8e0f6b53abcdeacb9 /libjava/gnu/java/awt/peer/gtk | |
| parent | 9f41ce98ce6f4f7c8ac5e2c4b6e5d27e10201015 (diff) | |
| download | ppe42-gcc-1020ce5944edde4364baef4d371cd4f9b0dae721.tar.gz ppe42-gcc-1020ce5944edde4364baef4d371cd4f9b0dae721.zip | |
libjava/
2008-06-28 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (classpath-0_97_2-release).
* Regenerate class and header files.
* Regenerate auto* files.
* gcj/javaprims.h: Define jobjectRefType.
* jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
(_Jv_JNIFunctions): Initialize GetObjectRefType.
* gnu/classpath/jdwp/VMVirtualMachine.java,
java/security/VMSecureRandom.java: Merge from classpath.
* HACKING: Fix typo.
* ChangeLog-2007: New file.
* configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.
libjava/classpath/
2008-06-28 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Disable check for JAVAC, when
not configured with --enable-java-maintainer-mode.
* aclocal.m4, configure: Regenerate.
* native/jni/gstreamer-peer/Makefile.am: Do not link with
libclasspathnative.
* native/jni/gstreamer-peer/Makefile.in: Regenerate.
* tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
JCOMPILER, drop flags not understood by gcj.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137223 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/java/awt/peer/gtk')
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h | 2 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h index 9379c5ea611..a9b70e73bcb 100644 --- a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h +++ b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h @@ -76,7 +76,7 @@ private: void lock(); void unlock(); public: // actually protected - virtual jlong initFromVolatile(jlong, jint, jint); + virtual jlong initFromVolatile(jlong); private: void start_gdk_drawing(); void end_gdk_drawing(); diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h index fa35e2ad70b..78c7127c85d 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h +++ b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h @@ -87,7 +87,9 @@ public: // actually package-private virtual void gtkWidgetGetDimensions(JArray< jint > *); virtual void gtkWidgetGetPreferredDimensions(JArray< jint > *); virtual void gtkWindowGetLocationOnScreen(JArray< jint > *); + virtual void gtkWindowGetLocationOnScreenUnlocked(JArray< jint > *); virtual void gtkWidgetGetLocationOnScreen(JArray< jint > *); + virtual void gtkWidgetGetLocationOnScreenUnlocked(JArray< jint > *); virtual void gtkWidgetSetCursor(jint, ::gnu::java::awt::peer::gtk::GtkImage *, jint, jint); virtual void gtkWidgetSetCursorUnlocked(jint, ::gnu::java::awt::peer::gtk::GtkImage *, jint, jint); virtual void gtkWidgetSetBackground(jint, jint, jint); |
