summaryrefslogtreecommitdiff
path: root/libjava/jni/gtk-peer
diff options
context:
space:
mode:
authorgraydon <graydon@138bc75d-0d04-0410-961f-82ee72b054a4>2004-01-22 09:54:19 +0000
committergraydon <graydon@138bc75d-0d04-0410-961f-82ee72b054a4>2004-01-22 09:54:19 +0000
commiteced91210fd097e28da3221c00e99aaf89fb889d (patch)
tree0f7e79b1c6afb9ecf4b3d15908999b740f7cd2ef /libjava/jni/gtk-peer
parenta2f30e7a0116e3caac8eb7d66fe2f4ebbb765760 (diff)
downloadgcc-eced91210fd097e28da3221c00e99aaf89fb889d.tar.gz
2004-01-22 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java: * gnu/java/awt/peer/gtk/GdkGlyphVector.java: Predicate static initialization on GtkToolkit.useGraphics2D(). * java/awt/Component.java (processPaintEvent): Consume event. * javax/swing/AbstractButton.java: Reimplement, document. * javax/swing/DefaultButtonModel.java: Reimplement, document. * javax/swing/JComponent.java (paint): Use double buffer. (listenerList): Enable member. * javax/swing/ToggleButtonModel.java: Remove incorrect constructor. * javax/swing/JToggleButton.java (JToggleButton): Modify model constructor. * javax/swing/SwingUtilities.java (layoutCompoundLabel): Adjust arithmetic. * javax/swing/plaf/basic/BasicButtonUI.java: Reimplement, document. * javax/swing/plaf/basic/BasicGraphicsUtils.java (getPreferredButtonSize): Include margins in calculation. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals): Receive up events from subordinate layout component. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@76344 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/jni/gtk-peer')
-rw-r--r--libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
index 9a935b03477..742550f8ef2 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
@@ -228,12 +228,25 @@ Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals
{
void *ptr = NSA_GET_PTR (env, obj);
jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
+ GtkWidget* vbox, *layout;
+ GList* children;
g_assert (gref);
gdk_threads_enter ();
gtk_widget_realize (ptr);
+ /* Receive events from the GtkLayout too */
+ children = gtk_container_get_children(GTK_CONTAINER(ptr));
+ vbox = children->data;
+ g_assert(GTK_IS_VBOX(vbox));
+ children = gtk_container_get_children(GTK_CONTAINER(vbox));
+ layout = children->data;
+ g_assert(GTK_IS_LAYOUT(layout));
+
+ g_signal_connect (GTK_OBJECT (layout), "event",
+ G_CALLBACK (pre_event_handler), *gref);
+
/* Connect signals for window event support. */
g_signal_connect (G_OBJECT (ptr), "delete-event",
G_CALLBACK (window_delete_cb), *gref);