diff options
| author | Mark Wielaard <mark@klomp.org> | 2006-02-20 09:15:02 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2006-02-20 09:15:02 +0000 |
| commit | c77c2ec6551c2f2a71dc67ada0ca734f3326e38f (patch) | |
| tree | 34f9604ce02ef6aa122505b841cd3a252802a510 /include | |
| parent | 95bd57d4bff6cd6ab6e16038e3cdfeacd5842ba9 (diff) | |
| download | classpath-c77c2ec6551c2f2a71dc67ada0ca734f3326e38f.tar.gz | |
* java/awt/Menu.java (add(MenuItem)): Use item.getParent() to get
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h b/include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h index 6d855be66..61a4641e6 100644 --- a/include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h +++ b/include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h @@ -12,7 +12,6 @@ extern "C" JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_create (JNIEnv *env, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_addMenu (JNIEnv *env, jobject, jobject); -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_nativeSetHelpMenu (JNIEnv *env, jobject, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_delMenu (JNIEnv *env, jobject, jint); #ifdef __cplusplus |