glib-2.0.m4: New file.
* glib-2.0.m4: New file. * gtk-2.0.m4: New file. * glib.m4: Remove. * gtk.m4: Remove. * configure.in: Update AM_PATH_GTK macro call to AM_PATH_GTK_2_0. Likewise for AM_PATH_GLIB. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c, jni/gtk-peer/gthread-jni.c, jni/gtk-peer/gthread-jni.h: New versions from classpath. * aclocal.m4: Regenerate. * configure: Regenerate. * Makefile.in: Regenerate. * gcj/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. From-SVN: r68746
This commit is contained in:
parent
884a757a31
commit
29e531ff29
23 changed files with 1653 additions and 1200 deletions
|
@ -56,6 +56,10 @@ jmethodID postItemEventID;
|
|||
jmethodID postListItemEventID;
|
||||
JNIEnv *gdk_env;
|
||||
|
||||
#ifdef PORTABLE_NATIVE_SYNC
|
||||
JavaVM *gdk_vm;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Call gtk_init. It is very important that this happen before any other
|
||||
* gtk calls.
|
||||
|
@ -81,7 +85,16 @@ Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit (JNIEnv *env, jclass clazz)
|
|||
|
||||
/* until we have JDK 1.2 JNI, assume we have a VM with threads that
|
||||
match what GLIB was compiled for */
|
||||
g_thread_init (NULL);
|
||||
#ifdef PORTABLE_NATIVE_SYNC
|
||||
(*env)->GetJavaVM( env, &gdk_vm );
|
||||
g_thread_init ( &g_thread_jni_functions );
|
||||
printf("called gthread init\n");
|
||||
#else
|
||||
g_thread_init ( NULL );
|
||||
#endif
|
||||
|
||||
/* From GDK 2.0 onwards we have to explicitly call gdk_threads_init */
|
||||
gdk_threads_init();
|
||||
|
||||
gtk_init (&argc, &argv);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue