This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: native gtk peer
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 22 Apr 2004 20:03:26 +0200
- Subject: Patch: native gtk peer
Hi list,
I just commited the attached patch to merge with GNU classpath more.
Michael
2004-04-22 Mark Wielaard <mark@klomp.org>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:
Changed C++ comments into C comments.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c:
Likewise.
2004-04-22 Michael Koch <konqueror@gmx.de>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c:
Merged copyright year with GNU classpath.
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,v
retrieving revision 1.18
diff -u -r1.18 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c 21 Apr 2004 06:52:26 -0000 1.18
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c 22 Apr 2004 18:01:50 -0000
@@ -136,7 +136,7 @@
ptr = NSA_GET_PTR (env, obj);
gdk_threads_enter ();
- // gtk_widget_grab_focus (GTK_WIDGET (ptr));
+ /* XXX gtk_widget_grab_focus (GTK_WIDGET (ptr)); */
gdk_threads_leave ();
}
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,v
retrieving revision 1.5
diff -u -r1.5 gnu_java_awt_peer_gtk_GtkMenuPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c 16 Apr 2004 18:44:45 -0000 1.5
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c 22 Apr 2004 18:01:50 -0000
@@ -1,5 +1,5 @@
/* gtkmenupeer.c -- Native implementation of GtkMenuPeer
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -108,7 +108,7 @@
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_title), menu);
- // Allow this menu to grab the pointer.
+ /* Allow this menu to grab the pointer. */
GtkWidget *toplevel = gtk_widget_get_toplevel (menu);
if (GTK_IS_WINDOW (toplevel))
{
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c 16 Apr 2004 18:44:45 -0000 1.3
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c 22 Apr 2004 18:01:50 -0000
@@ -1,5 +1,5 @@
/* gtkpopupmenupeer.c -- Native implementation of GtkPopupMenuPeer
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.