diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-12-01 23:27:06 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-12-01 23:27:06 +0000 |
| commit | 1a821ba124bfc62da58f60895bfe098e8bc6262f (patch) | |
| tree | 8a7545fe64ae4d6770cccce7985ada370781ff0b | |
| parent | 6d83476ed6be2d3d12befd8b153d775601145423 (diff) | |
| download | gcc-1a821ba124bfc62da58f60895bfe098e8bc6262f.tar.gz | |
2003-12-01 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
(awt_event_handler): Hard-code inset values.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74136 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 3 | ||||
| -rw-r--r-- | libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c | 21 |
2 files changed, 8 insertions, 16 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 663bd05510b..e05f47d414b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,8 @@ 2003-12-01 Thomas Fitzsimmons <fitzsim@redhat.com> + * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c + (awt_event_handler): Hard-code inset values. + * gnu/java/awt/peer/gtk/GdkFontMetrics.java (GdkFontMetrics): Pass font name, not XLFD, to initState. (stringWidth(String, int, String)): New method. diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c index 563492a3627..74939f8eca5 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c @@ -1022,8 +1022,6 @@ awt_event_handler (GdkEvent *event) if (widget && GTK_WIDGET_TOPLEVEL (widget)) { gint top, left, right, bottom; - gint x, y, w, h, d; - GdkRectangle r; /* Configure events are not posted to the AWT event queue, and as such, the gdk/gtk peer functions will @@ -1031,20 +1029,11 @@ awt_event_handler (GdkEvent *event) returns. */ gdk_threads_leave (); - /* Calculate our insets. */ - - /* When called from within the gdk_threads critical - section these functions seem to return strange - results, so we call them after - gdk_threads_leave. */ - gdk_window_get_geometry (event->any.window, - &x, &y, &w, &h, &d); - gdk_window_get_frame_extents (event->any.window, &r); - - top = y; - left = x; - bottom = r.height - h - y; - right = r.width - w - x; + /* FIXME: hard-code these values for now. */ + top = 20; + left = 6; + bottom = 6; + right = 6; (*gdk_env)->CallVoidMethod (gdk_env, *event_obj_ptr, postConfigureEventID, |