diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2005-09-06 04:21:13 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2005-09-06 04:21:13 +0000 |
| commit | 6b950e2d1410ff64bc8e8c682ade19fc7083762b (patch) | |
| tree | 024a0593427f7124a952e5810fee1c4035e359f0 | |
| parent | b34eb4cedacdc50d5e13ae1b70582c93ee69de61 (diff) | |
| download | classpath-6b950e2d1410ff64bc8e8c682ade19fc7083762b.tar.gz | |
2005-09-06 Thomas Fitzsimmons <fitzsim@redhat.com>
* native/jni/gtk-peer/gtkpeer.h (SYNCHRONIZE_GDK): Define.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c (gtkInit)
[SYNCHRONIZE_GDK]: Make GDK synchronous.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c | 5 | ||||
| -rw-r--r-- | native/jni/gtk-peer/gtkpeer.h | 2 |
3 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2005-09-06 Thomas Fitzsimmons <fitzsim@redhat.com> + + * native/jni/gtk-peer/gtkpeer.h (SYNCHRONIZE_GDK): Define. + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c (gtkInit) + [SYNCHRONIZE_GDK]: Make GDK synchronous. + 2005-09-05 Thomas Fitzsimmons <fitzsim@redhat.com> PR awt/20720 diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c index 17cf63fff..040cc92ff 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c @@ -40,6 +40,7 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkToolkit.h" #include "gthread-jni.h" #include "jcl.h" +#include <gdk/gdkx.h> #define RC_FILE ".classpath-gtkrc" @@ -155,6 +156,10 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkInit (JNIEnv *env, gtk_init (&argc, &argv); +#if SYNCHRONIZE_GDK + XSynchronize (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), True); +#endif + gdk_rgb_init (); gtk_widget_set_default_colormap (gdk_rgb_get_cmap ()); gtk_widget_set_default_visual (gdk_rgb_get_visual ()); diff --git a/native/jni/gtk-peer/gtkpeer.h b/native/jni/gtk-peer/gtkpeer.h index 1297c3f1c..2b16d99b4 100644 --- a/native/jni/gtk-peer/gtkpeer.h +++ b/native/jni/gtk-peer/gtkpeer.h @@ -206,6 +206,8 @@ void cp_gtk_textcomponent_connect_signals (GObject *ptr, jobject *gref); /* Debugging */ void cp_gtk_print_current_thread (void); +#define SYNCHRONIZE_GDK 0 + #define DEBUG_LOCKING 0 #if DEBUG_LOCKING |