PatchSet 5055
Date: 2004/08/11 00:18:29
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: PixBuf fixes
2004-08-10 Dalibor Topic <[EMAIL PROTECTED]>
*
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c,
libraries/clib/awt/classpath-gtk/gtk-peer/gtkpeer.h,
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
Resynced with GNU Classpath.
2004-08-09 Andreas Tobler <[EMAIL PROTECTED]>
Thomas Fitzsimmons <[EMAIL PROTECTED]>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c:
Move NSA_PB macros to gtkpeer.h. Include gtkpeer.h.
* native/jni/gtk-peer/gtkpeer.h: Move NSA_PB macros here.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(nativeSetIconImageFromDecoder): Use NSA_GET_PB_PTR macro.
Members:
ChangeLog:1.2613->1.2614
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c:1.2->1.3
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.4->1.5
libraries/clib/awt/classpath-gtk/gtk-peer/gtkpeer.h:1.2->1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2613 kaffe/ChangeLog:1.2614
--- kaffe/ChangeLog:1.2613 Tue Aug 10 16:41:14 2004
+++ kaffe/ChangeLog Wed Aug 11 00:18:29 2004
@@ -1,5 +1,21 @@
2004-08-10 Dalibor Topic <[EMAIL PROTECTED]>
+ *
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c,
+ libraries/clib/awt/classpath-gtk/gtk-peer/gtkpeer.h,
+
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
+ Resynced with GNU Classpath.
+
+ 2004-08-09 Andreas Tobler <[EMAIL PROTECTED]>
+ Thomas Fitzsimmons <[EMAIL PROTECTED]>
+
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c:
+ Move NSA_PB macros to gtkpeer.h. Include gtkpeer.h.
+ * native/jni/gtk-peer/gtkpeer.h: Move NSA_PB macros here.
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+ (nativeSetIconImageFromDecoder): Use NSA_GET_PB_PTR macro.
+
+2004-08-10 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/javax/swing/JMenuItem.java:
Resynced with GNU Classpath.
Index:
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
diff -u
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c:1.2
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c:1.3
---
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c:1.2
Mon Aug 9 13:31:53 2004
+++
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
Wed Aug 11 00:18:32 2004
@@ -35,6 +35,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+#include <gtkpeer.h>
#include <gdk/gdk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk-pixbuf/gdk-pixbuf-loader.h>
@@ -47,18 +48,6 @@
#include <stdlib.h>
struct state_table *native_pixbufdecoder_state_table;
-
-#define NSA_PB_INIT(env, clazz) \
- native_pixbufdecoder_state_table = init_state_table (env, clazz)
-
-#define NSA_GET_PB_PTR(env, obj) \
- get_state (env, obj, native_pixbufdecoder_state_table)
-
-#define NSA_SET_PB_PTR(env, obj, ptr) \
- set_state (env, obj, native_pixbufdecoder_state_table, (void *)ptr)
-
-#define NSA_DEL_PB_PTR(env, obj) \
- remove_state_slot (env, obj, native_pixbufdecoder_state_table)
/* Union used for type punning. */
union env_union
Index:
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
diff -u
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.4
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.5
---
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.4
Mon Aug 9 12:16:57 2004
+++
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
Wed Aug 11 00:18:32 2004
@@ -44,8 +44,6 @@
#include <gdk/gdkx.h>
#include <X11/Xatom.h>
-struct state_table *native_pixbufdecoder_state_table;
-
/* FIXME: we're currently seeing the double-activation that occurs
with metacity and GTK. See
http://bugzilla.gnome.org/show_bug.cgi?id=140977 for details. */
@@ -547,7 +545,7 @@
ptr = NSA_GET_PTR (env, obj);
- loader = get_state (env, decoder, native_pixbufdecoder_state_table);
+ loader = NSA_GET_PB_PTR (env, decoder);
g_assert (loader != NULL);
gdk_threads_enter ();
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gtkpeer.h
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gtkpeer.h:1.2
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gtkpeer.h:1.3
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gtkpeer.h:1.2 Sun Aug 8
19:45:48 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gtkpeer.h Wed Aug 11 00:18:32
2004
@@ -91,6 +91,20 @@
(*env)->DeleteGlobalRef (env, *globRefPtr); \
free (globRefPtr);} while (0)
+extern struct state_table *native_pixbufdecoder_state_table;
+
+#define NSA_PB_INIT(env, clazz) \
+ native_pixbufdecoder_state_table = init_state_table (env, clazz)
+
+#define NSA_GET_PB_PTR(env, obj) \
+ get_state (env, obj, native_pixbufdecoder_state_table)
+
+#define NSA_SET_PB_PTR(env, obj, ptr) \
+ set_state (env, obj, native_pixbufdecoder_state_table, (void *)ptr)
+
+#define NSA_DEL_PB_PTR(env, obj) \
+ remove_state_slot (env, obj, native_pixbufdecoder_state_table)
+
#endif /* JVM_SUN */
struct graphics
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
