[multiple changes]

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.

From-SVN: r81042

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 61010f0046569423b658d3198eaa6cac34db48b9..1359677dd64759038d0f3cb10e1a1c3cb1afede4 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,15 @@
+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.
+
 2004-04-22  Dalibor Topic  <robilad@kaffe.org>
 
        * javax/security/auth/x500/X500Principal.java:

diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
index 99cd841386e0880ca6259b9a71e3d62130941416..1d56c5cfe2c4e1cdffddbc390059499d0ea55914 100644 (file)
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
@@ -136,7 +136,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus
   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 ();
 }
 

diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
index 94ebc7f1cfa94c1879b6e5b9e69e915b15f03db1..889cc3b4c71a0d64acfc188da7f0a8ee735da0bd 100644 (file)
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
@@ -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 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_create
 
   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))
     {

diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
index 4bc697320ddad3730e594f874ed34bc7abef1927..97213c45db2cf16554b93c6ce45d71a1493b5673 100644 (file)
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
@@ -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.