From: Michael Koch Date: Thu, 22 Apr 2004 18:02:54 +0000 (+0000) Subject: [multiple changes] X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=838a4849fab52af1c5d54703b4591d403544dd7f;p=gcc.git [multiple changes] 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. From-SVN: r81042 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 61010f00465..1359677dd64 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 99cd841386e..1d56c5cfe2c 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 94ebc7f1cfa..889cc3b4c71 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 4bc697320dd..97213c45db2 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.