From b9760919e12a434f2e96d53d58fdfcf39646dd40 Mon Sep 17 00:00:00 2001 From: mkoch Date: Thu, 22 Apr 2004 18:02:54 +0000 Subject: [PATCH] 2004-04-22 Mark Wielaard * 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 * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c: Merged copyright year with GNU classpath. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81042 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 12 ++++++++++++ .../jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c | 2 +- libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c | 4 ++-- .../jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 61010f0..1359677 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,15 @@ +2004-04-22 Mark Wielaard + + * 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 + + * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c: + Merged copyright year with GNU classpath. + 2004-04-22 Dalibor Topic * 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 99cd841..1d56c5c 100644 --- 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 94ebc7f..889cc3b 100644 --- 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 4bc6973..97213c4 100644 --- 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. -- 2.7.4