Re: Header file cleanup and small function prototype fixes

[Mark Wielaard]

Hi,

On Fri, 2004-05-21 at 15:52, Mark Wielaard wrote:
> When the GTK+ peers were merged into kaffe
> (http://www.kaffe.org/pipermail/kaffe/2004-May/046306.html)
> we noticed a couple of smaller issues with the header/include files.
> The following patch tries to address them all.
> 
> 2004-05-21  Mark Wielaard <address@hidden>
>   
>        * include/Makefile.am: Add java_lang_VMDouble.h. Remove
>        java.lang.VMRuntime.
> 
>        * include/gnu_java_awt_EmbeddedWindow.h: Regenerated.
>        * include/gnu_java_awt_peer_gtk_GdkFontMetrics.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GdkGraphics.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkButtonPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkChoicePeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkClipboard.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkComponentPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkFramePeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkGenericPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkImagePainter.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkLabelPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkListPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkMainThread.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkMenuPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkPanelPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkToolkit.h: Likewise.
>        * include/gnu_java_awt_peer_gtk_GtkWindowPeer.h: Likewise.
>        * include/gnu_java_net_PlainDatagramSocketImpl.h: Likewise.
>        * include/gnu_java_net_PlainSocketImpl.h: Likewise.
>        * include/gnu_java_nio_NIOServerSocket.h: Likewise.
>        * include/gnu_java_nio_PipeImpl.h: Likewise.
>        * include/gnu_java_nio_SelectorImpl.h: Likewise.
>        * include/gnu_java_nio_channels_FileChannelImpl.h: Likewise.
>        * include/java_io_ObjectInputStream.h: Likewise.
>        * include/java_io_VMFile.h: Likewise.
>        * include/java_io_VMObjectStreamClass.h: Likewise.
>        * include/java_lang_Double.h: Likewise.
>        * include/java_lang_Math.h: Likewise.
>        * include/java_lang_Object.h: Likewise.
>        * include/java_lang_VMDouble.h: Likewise.
>        * include/java_lang_VMFloat.h: Likewise.
>        * include/java_lang_VMProcess.h: Likewise.
>        * include/java_lang_VMSystem.h: Likewise.
>        * include/java_lang_reflect_Array.h: Likewise.
>        * include/java_net_InetAddress.h: Likewise.
>        * include/java_net_NetworkInterface.h: Likewise.
>        * include/java_nio_DirectByteBufferImpl.h: Likewise.
>        * include/java_nio_MappedByteBufferImpl.h: Likewise.
>        * include/java_nio_channels_Channels.h: Likewise.
>        * include/java_util_TimeZone.h: Likewise.
> 
>        * include/gnu_java_nio_MappedByteFileBuffer.h: Removed.
>        * include/java_lang_Thread.h: Removed.
>        * include/java_lang_VMClass.h: Removed.
>        * include/java_lang_VMRuntime.h: Removed.
>        * include/java_lang_reflect_Constructor.h: Removed.
>        * include/java_lang_reflect_Field.h: Removed.
>        * include/java_lang_reflect_Method.h: Removed.
>        * include/java_lang_reflect_Proxy.h: Removed.
> 
>        * gnu/java/awt/peer/gtk/GtkComponentPeer.java (requestFocus):
>        Implement by calling gtkRequestFocus.
>        (gtkRequestFocus): New native method.
>        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
>        (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus__):
>        Renamed to ...
>        (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkRequestFocus):
>        New function name.
>        (filter_expose_event_handler): Mark static.
>        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
>        (menu_pos): Mark static.
> 
> All header files are regenerated by the latest gcjh from CVS (which
> removes the extern modifier from the .h file). Unused header files have
> been removed. And some internal functions have been marked static. The
> native method in GtkComponentPeer requestFocus is now called
> gtkRequestFocus since to many JNI header generation programs had trouble
> with getting the overloaded signature right (known bug in gcjh at
> least).
> 
> No mauve regressions and test AWT programs still work.
> Any comments/objections?

Only Tom had a little remark (on irc) about the comment in
GtkComponentPeer.java. Which now reads:

+  // Called from requestFocus, we don't want to make requestFocus itself
+  // native since several JNI header generators have difficulties with
+  // overridden and/or miranda methods. (Bug in gcjh < 3.5.)

Except for that there was no change from the original patch.
Committed.

Cheers,

Mark

signature.asc
Description: This is a digitally signed message part