* gnu/java/awt/ClasspathToolkit.java: * gnu/java/awt/peer/gtk/AsyncImage.java, * gnu/java/awt/peer/gtk/BufferedImageGraphics.java, * gnu/java/awt/peer/gtk/CairoGraphics2D.java, * gnu/java/awt/peer/gtk/CairoSurface.java, * gnu/java/awt/peer/gtk/ComponentGraphics.java, * gnu/java/awt/peer/gtk/FreetypeGlyphVector.java, * gnu/java/awt/peer/gtk/GdkFontPeer.java, * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java, * gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java, * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java, * gnu/java/awt/peer/gtk/GtkChoicePeer.java, * gnu/java/awt/peer/gtk/GtkClipboard.java, * gnu/java/awt/peer/gtk/GtkClipboardNotifier.java, * gnu/java/awt/peer/gtk/GtkComponentPeer.java, * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java, * gnu/java/awt/peer/gtk/GtkFramePeer.java, * gnu/java/awt/peer/gtk/GtkImage.java, * gnu/java/awt/peer/gtk/GtkImageConsumer.java, * gnu/java/awt/peer/gtk/GtkLabelPeer.java, * gnu/java/awt/peer/gtk/GtkListPeer.java, * gnu/java/awt/peer/gtk/GtkMainThread.java, * gnu/java/awt/peer/gtk/GtkMenuBarPeer.java, * gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java, * gnu/java/awt/peer/gtk/GtkMenuPeer.java, * gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java, * gnu/java/awt/peer/gtk/GtkScrollbarPeer.java, * gnu/java/awt/peer/gtk/GtkScrollPanePeer.java, * gnu/java/awt/peer/gtk/GtkSelection.java, * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java, * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java, * gnu/java/awt/peer/gtk/GtkToolkit.java, * gnu/java/awt/peer/gtk/GtkWindowPeer.java, * gnu/java/awt/peer/gtk/VolatileImageGraphics.java, * java/awt/RenderingHints.java, * java/awt/image/BufferedImage.java: Reformatted and added generics.
* gnu/java/awt/peer/gtk/BufferedImageGraphics.java: Remove unneeded imports. * gnu/java/awt/peer/gtk/CairoSurface.java: Likewise. * gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java: Likewise. * gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java: Likewise. * gnu/java/awt/peer/gtk/GdkFontPeer.java: Likewise. * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Likewise. * gnu/java/awt/peer/gtk/GtkButtonPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkClipboardNotifier.java: Likewise. * gnu/java/awt/peer/gtk/GtkComponentPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkContainerPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkDialogPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkFramePeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkImage.java: Likewise. * gnu/java/awt/peer/gtk/GtkImageConsumer.java: Likewise. * gnu/java/awt/peer/gtk/GtkMenuBarPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkMenuItemPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkPanelPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkScrollbarPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkWindowPeer.java: Likewise. * gnu/java/awt/peer/gtk/VolatileImageGraphics.java: Likewise.
parent field.
(insert): Likewise.
(addNotify): Add the item after addNotifying it.
* java/awt/MenuBar.java (setHelpMenu): Only call removeNotify() when
there is a peer. Use getParent() and setParent() to manipulate parent
field.
(add(Menu)): Use getParent() and setParent() to manipulate parent
field. Call addNotify() and addMenu() when there is a peer.
(remove(int)): Call removeNotify() and delMenu() when there is a peer.
(addNotify): Use getPeer()/setPeer(). Call addMenu() and addHelpMenu()
when there is a peer.
* gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java (create): Document.
(GtkMenuComponentPeer): Document. Take MenuComponent as argument.
(setFont): Call setFont(Font).
(setFont(Font)): Document. Only set font when not null.
* gnu/java/awt/peer/gtk/GtkMenuItemPeer.java (create): Document. Made
protected.
(connectSignals): Likewise.
(GtkMenuItemPeer): Document. Don't try to add item. Always call
connectSignals().
* gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java (create): Make
protected.
(postMenuActionEvent): Document.
* gnu/java/awt/peer/gtk/GtkMenuPeer.java (create): Document. Made
protected.
(addItem): Document. Made private.
(addTearOff): Made private.
(connectSignals): New protected overridden method.
(GtkMenuPeer): Correctly cast setupAccelGroup() arguments.
* gnu/java/awt/peer/gtk/GtkMenuBarPeer.java (hasHelpMenu): New field.
(create): Document.
(addMenu): Made private, take GtkMenuPeer as argument and document.
(GtkMenuBarPeer): Document.
(nativeSetHelpMenu): Removed.
(addHelpMenu): Implement.
(delMenu): Document.
(addMenu): Implement.
* gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java (setParent): Removed.
* include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h: Regenerated.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c
(Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_nativeSetHelpMenu):
Removed.
final.
(gtkWidgetModifyFont(Font)): New protected helper method.
(gtkWidgetModifyFont(String,int,int)): Made protected and document.
* gnu/java/awt/peer/gtk/GtkButtonPeer.java (gtkWidgetModifyFont): Made
protected and document.
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java (gtkWidgetModifyFont):
Likewise.
* gnu/java/awt/peer/gtk/GtkLabelPeer.java (gtkWidgetModifyFont):
Likewise.
* gnu/java/awt/peer/gtk/GtkListPeer.java (gtkWidgetModifyFont):
Likewise.
* gnu/java/awt/peer/gtk/GtkMenuBarPeer.java (create): Made protected.
(setFont): Removed method. Done in GtkMenuComponent.
* gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java (create): Made
abstract and protected.
(setFont): Made private, add implementation.
(setFont(Font)): Implemented.
* gnu/java/awt/peer/gtk/GtkMenuItemPeer.java (gtkWidgetModifyFont):
Made protected and document.
(create): Made protected.
(setFont): Removed method. Done in GtkMenuComponent.
* gnu/java/awt/peer/gtk/GtkTextAreaPeer.java
(gtkWidgetModifyFont): Made protected and document.
* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java (gtkWidgetModifyFont):
Removed, similar to GtkGenericPeer super class implementation.
* include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h: Regenerated.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
(Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkWidgetModifyFont):
Removed.
* gnu/java/awt/peer/gtk/GtkMenuBarPeer.java (addMenu(Menu)): New method. * gnu/java/awt/peer/gtk/GtkMenuPeer.java (addSeparator): Likewise. * java/awt/peer/MenuBarPeer.java (addMenu): New method declaration. * java/awt/peer/MenuPeer.java (addSeparator): New method declaration.
* gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java, gnu/java/awt/peer/gtk/GdkFontPeer.java, gnu/java/awt/peer/gtk/GdkGlyphVector.java, gnu/java/awt/peer/gtk/GdkGraphics.java, gnu/java/awt/peer/gtk/GdkGraphics2D.java, gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java, gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java, gnu/java/awt/peer/gtk/GdkPixbufDecoder.java, gnu/java/awt/peer/gtk/GdkRobotPeer.java, gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java, gnu/java/awt/peer/gtk/GdkTextLayout.java, gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java, gnu/java/awt/peer/gtk/GtkChoicePeer.java, gnu/java/awt/peer/gtk/GtkClipboard.java, gnu/java/awt/peer/gtk/GtkComponentPeer.java, gnu/java/awt/peer/gtk/GtkFileDialogPeer.java, gnu/java/awt/peer/gtk/GtkFontPeer.java, gnu/java/awt/peer/gtk/GtkLabelPeer.java, gnu/java/awt/peer/gtk/GtkMenuBarPeer.java, gnu/java/awt/peer/gtk/GtkMenuItemPeer.java, gnu/java/awt/peer/gtk/GtkMenuPeer.java, gnu/java/awt/peer/gtk/GtkScrollPanePeer.java, gnu/java/awt/peer/gtk/GtkScrollbarPeer.java, gnu/java/awt/peer/gtk/GtkToolkit.java, gnu/java/awt/peer/gtk/GtkWindowPeer.java: Made checkstyle clean. * gnu/java/awt/peer/gtk/package.html: New file.
* examples/gnu/classpath/examples/awt/Demo.java: Add help menu
example.
* include/gnu_java_awt_peer_gtk_GtkButtonPeer.h: Regenerate with gcjh
from CVS.
* include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h: Likewise.
* include/gnu_java_awt_peer_gtk_GtkComponentPeer.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_GtkLabelPeer.h: Likewise.
* include/gnu_java_awt_peer_gtk_GtkListPeer.h: Likewise.
* include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h: Likewise.
* include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h: Likewise.
* include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h: Likewise.
* include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h: Likewise.
2004-09-23 David Jee <djee@redhat.com>
PR AWT/17059
* gnu/java/awt/peer/gtk/GtkMenuBarPeer.java
(nativeSetHelpMenu): New native method declaration.
(addHelpMenu): Call nativeSetHelpMenu().
(addMenu): Remove.
* java/awt/MenuBar.java
(setHelpMenu): Call addNotify() on the new help menu.
(add): Call addNotify() on the new menu.
(addNotify): Set the help menu if one exists.
* java/awt/peer/MenuBarPeer.java
(addMenu): Remove.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c
(nativeSetHelpMenu): New method.
* gnu/java/awt/peer/gtk/GtkFramePeer.java (setMenuBar): Set menu bar's width. * gnu/java/awt/peer/gtk/GtkMenuBarPeer.java (nativeSetHelpMenu): Add FIXME comment. (addHelpMenu): Elide call to nativeSetHelpMenu. * java/awt/Menu.java (isTearOff): Rename to tearOff. (menuSerializedDataVersion): Initialize to 1. (separatorLabel): Mark transient. (insert(MenuItem,int)): Implement. * java/awt/MenuBar.java (setHelpMenu): Call getPeer to retrieve peer. (countMenus): Count help menu. * java/awt/MenuItem.java: Remove event mask FIXME. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c (gtkWidgetModifyFont): Only set font if label is non-NULL. (setLabel): Don't treat "-" specially.
* gnu/java/awt/peer/gtk/GtkButtonPeer.java (gtkWidgetSetFont): Rename ... (gtkWidgetModifyFont): New method. * gnu/java/awt/peer/gtk/GtkFramePeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c (setMenuBarWidth): New method. (setBounds): Set the menu bar width. (postConfigureEvent): Set the menu bar width if the window's width has changed. * gnu/java/awt/peer/gtk/GtkMenuBarPeer.java (GtkMenuBarPeer): Don't call create. (setFont): New method. * gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java (create): New method. (setFont): Likewise. (GtkMenuComponentPeer): Call create and setFont. * gnu/java/awt/peer/gtk/GtkMenuItemPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c (connectSignals): Make package private. (gtkWidgetModifyFont): New method. (create): Likewise. (GtkMenuItemPeer): Don't call create. (setFont): New method. * java/awt/CheckboxMenuItem.java (addNotify): Fix peer == null condition. * java/awt/Container.java (validateTree): Fix comment typos. * java/awt/MenuComponent.java (getFont): Return parent's font if our font is null. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c (create): Remove call to deprecated gtk_check_menu_item_set_show_toggle function.