[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath

Kaffe CVS cvs-commits at kaffe.org
Sun Aug 8 14:38:59 PDT 2004


PatchSet 5042 
Date: 2004/08/08 19:45:44
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU  Classpath

Members: 
	ChangeLog:1.2600->1.2601 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c:1.1->1.2 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:1.1->1.2 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c:1.1->1.2 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c:1.1->1.2 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c:1.1->1.2 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:1.2->1.3 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c:1.1->1.2 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c:1.3->1.4 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c:1.1->1.2 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c:1.1->1.2 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c:1.1->1.2 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.2->1.3 
	libraries/clib/awt/classpath-gtk/gtk-peer/gthread-jni.c:1.1->1.2 
	libraries/clib/awt/classpath-gtk/gtk-peer/gtkpeer.h:1.1->1.2 
	libraries/javalib/Makefile.am:1.215->1.216 
	libraries/javalib/Makefile.in:1.291->1.292 
	libraries/javalib/all.files:1.11->1.12 
	libraries/javalib/gnu/java/awt/ClasspathToolkit.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/EmbeddedWindow.java:1.2->1.3 
	libraries/javalib/gnu/java/awt/image/ImageDecoder.java:1.2->1.3 
	libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkArg.java:1.1->1.2(DEAD) 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkArgList.java:1.1->1.2(DEAD) 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkButtonPeer.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkChoicePeer.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.2->1.3 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkDialogPeer.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java:1.2->1.3 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkFramePeer.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkListPeer.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkOffScreenImage.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.2->1.3 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkWindowPeer.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/peer/gtk/Test.java:1.1->1.2(DEAD) 
	libraries/javalib/gnu/java/awt/peer/gtk/TestAWT.java:1.1->1.2(DEAD) 
	libraries/javalib/gnu/java/net/protocol/http/Connection.java:1.11->1.12 
	libraries/javalib/gnu/java/security/action/GetPropertyAction.java:INITIAL->1.1 
	libraries/javalib/gnu/java/security/action/SetAccessibleAction.java:1.1->1.2 
	libraries/javalib/gnu/javax/rmi/CORBA/StubDelegateImpl.java:1.2->1.3 
	libraries/javalib/java/awt/AWTKeyStroke.java:1.1->1.2 
	libraries/javalib/java/awt/Component.java:1.33->1.34 
	libraries/javalib/java/awt/Container.java:1.19->1.20 
	libraries/javalib/java/awt/DefaultKeyboardFocusManager.java:1.2->1.3 
	libraries/javalib/java/awt/Font.java:1.17->1.18 
	libraries/javalib/java/awt/Frame.java:1.17->1.18 
	libraries/javalib/java/awt/Graphics.java:1.9->1.10 
	libraries/javalib/java/awt/im/InputContext.java:1.1->1.2 
	libraries/javalib/java/awt/image/Kernel.java:1.1->1.2 
	libraries/javalib/java/io/VMFile.java:1.1->1.2 
	libraries/javalib/java/net/DatagramSocket.java:1.24->1.25 
	libraries/javalib/java/sql/Timestamp.java:1.8->1.9 
	libraries/javalib/java/util/Collection.java:1.4->1.5 
	libraries/javalib/java/util/List.java:1.5->1.6 
	libraries/javalib/java/util/Map.java:1.8->1.9 
	libraries/javalib/java/util/Set.java:1.6->1.7 
	libraries/javalib/java/util/SortedMap.java:1.5->1.6 
	libraries/javalib/java/util/SortedSet.java:1.4->1.5 
	libraries/javalib/javax/swing/AbstractButton.java:1.2->1.3 
	libraries/javalib/javax/swing/ActionMap.java:1.2->1.3 
	libraries/javalib/javax/swing/Box.java:1.1->1.2 
	libraries/javalib/javax/swing/BoxLayout.java:1.1->1.2 
	libraries/javalib/javax/swing/ComponentInputMap.java:1.2->1.3 
	libraries/javalib/javax/swing/DefaultDesktopManager.java:1.2->1.3 
	libraries/javalib/javax/swing/ImageIcon.java:1.2->1.3 
	libraries/javalib/javax/swing/InputMap.java:1.2->1.3 
	libraries/javalib/javax/swing/JButton.java:1.2->1.3 
	libraries/javalib/javax/swing/JCheckBox.java:1.2->1.3 
	libraries/javalib/javax/swing/JCheckBoxMenuItem.java:1.2->1.3 
	libraries/javalib/javax/swing/JComponent.java:1.2->1.3 
	libraries/javalib/javax/swing/JEditorPane.java:1.2->1.3 
	libraries/javalib/javax/swing/JFormattedTextField.java:1.2->1.3 
	libraries/javalib/javax/swing/JInternalFrame.java:1.1->1.2 
	libraries/javalib/javax/swing/JMenu.java:1.2->1.3 
	libraries/javalib/javax/swing/JMenuBar.java:1.2->1.3 
	libraries/javalib/javax/swing/JMenuItem.java:1.2->1.3 
	libraries/javalib/javax/swing/JOptionPane.java:1.2->1.3 
	libraries/javalib/javax/swing/JPopupMenu.java:1.2->1.3 
	libraries/javalib/javax/swing/JRootPane.java:1.2->1.3 
	libraries/javalib/javax/swing/JScrollPane.java:1.2->1.3 
	libraries/javalib/javax/swing/JTable.java:1.2->1.3 
	libraries/javalib/javax/swing/JTextField.java:1.2->1.3 
	libraries/javalib/javax/swing/JToolBar.java:1.2->1.3 
	libraries/javalib/javax/swing/JToolTip.java:1.1->1.2 
	libraries/javalib/javax/swing/KeyStroke.java:1.1->1.2 
	libraries/javalib/javax/swing/MenuSelectionManager.java:1.2->1.3 
	libraries/javalib/javax/swing/RepaintManager.java:1.2->1.3 
	libraries/javalib/javax/swing/ScrollPaneLayout.java:1.2->1.3 
	libraries/javalib/javax/swing/SwingUtilities.java:1.2->1.3 
	libraries/javalib/javax/swing/Timer.java:1.2->1.3 
	libraries/javalib/javax/swing/ToolTipManager.java:1.2->1.3 
	libraries/javalib/javax/swing/UIDefaults.java:1.2->1.3 
	libraries/javalib/javax/swing/UIManager.java:1.2->1.3 
	libraries/javalib/javax/swing/ViewportLayout.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicArrowButton.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicButtonListener.java:1.1->1.2 
	libraries/javalib/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicInternalFrameUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicLabelUI.java:1.1->1.2 
	libraries/javalib/javax/swing/plaf/basic/BasicListUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicLookAndFeel.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicMenuItemUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicMenuUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicOptionPaneUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicPopupMenuUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicRootPaneUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicScrollPaneUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicSliderUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneDivider.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicTextUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicToolBarUI.java:1.2->1.3 
	libraries/javalib/javax/swing/plaf/basic/BasicToolTipUI.java:INITIAL->1.1 
	libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.2->1.3 
	libraries/javalib/javax/swing/table/JTableHeader.java:1.1->1.2 
	libraries/javalib/javax/swing/table/TableColumn.java:1.2->1.3 
	libraries/javalib/javax/swing/text/AbstractDocument.java:1.2->1.3 
	libraries/javalib/javax/swing/text/AttributeSet.java:1.3->1.4 
	libraries/javalib/javax/swing/text/DefaultEditorKit.java:1.2->1.3 
	libraries/javalib/javax/swing/text/EditorKit.java:1.2->1.3 
	libraries/javalib/javax/swing/text/Position.java:1.2->1.3 
	libraries/javalib/javax/swing/text/Segment.java:1.2->1.3 
	libraries/javalib/javax/swing/text/StyledEditorKit.java:1.2->1.3 
	libraries/javalib/javax/swing/text/TextAction.java:1.2->1.3 
	libraries/javalib/javax/swing/text/View.java:1.2->1.3 
	libraries/javalib/javax/swing/text/ViewFactory.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2600 kaffe/ChangeLog:1.2601
--- kaffe/ChangeLog:1.2600	Thu Aug  5 09:55:20 2004
+++ kaffe/ChangeLog	Sun Aug  8 19:45:44 2004
@@ -1,3 +1,392 @@
+2004-08-07  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+	
+	2004-08-06  Tom Tromey  <tromey at redhat.com>
+
+	* java/net/DatagramSocket.java: Fixed typo.
+
+	* java/awt/image/Kernel.java (clone): Use super.clone().
+
+	2004-08-02  Bryce McKinlay  <mckinlay at redhat.com>
+
+	* java/sql/Timestamp.java (valueOf): Synchronize access to dateFormat.
+
+	2004-07-31  Michael Koch  <konqueror at gmx.de>
+
+	* javax/swing/table/DefaultTableColumnModel.java
+	(serialVersionUID): Made private.
+	(listenerList): Initialize.
+	(changeEvent): Initialize.
+	* javax/swing/table/JTableHeader.java
+	(JTableHeader): New constructors.
+	(createDefaultColumnModel): New method.
+	* javax/swing/table/TableColumn.java
+	(setHeaderRenderer): Simplified code.
+	(setCellRenderer): Likewise.
+	(setWidth): Likewise.
+
+	2004-07-31  Mark Wielaard  <mark at klomp.org>
+
+	* javax/swing/text/AbstractDocument.java: Reindent.
+	* javax/swing/text/AttributeSet.java: Reindent.
+	* javax/swing/text/DefaultEditorKit.java: Reindent.
+	* javax/swing/text/EditorKit.java: Reindent.
+	* javax/swing/text/Position.java: Reindent.
+	* javax/swing/text/StyledEditorKit.java: Reindent.
+	* javax/swing/text/TextAction.java: Reindent.
+	* javax/swing/text/ViewFactory.java: Reindent.
+
+	2004-07-31  Michael Koch  <konqueror at gmx.de>
+
+	* javax/swing/JFormattedTextField.java
+	(JFormattedTextField): Implemented.
+	* javax/swing/text/DefaultEditorKit.java
+	(BeepAction): New inner class.
+	* javax/swing/text/Segment.java
+	(partialReturn): New field.
+	(setPartialReturn): New method.
+	(isPartialReturn): Likewise.
+	* javax/swing/text/View.java
+	(createFragment): Fixed typo.
+	(getStartOffset): New method.
+	(getEndOffset): Likewise.
+
+	2004-07-31  Mark Wielaard  <mark at klomp.org>
+
+	* javax/swing/plaf/basic/BasicArrowButton.java: Reindent.
+	* javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicInternalFrameUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicLabelUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicListUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicMenuItemUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicMenuUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicOptionPaneUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicPopupMenuUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicRootPaneUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicScrollBarUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicScrollPaneUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicSliderUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicSplitPaneDivider.java: Reindent.
+	* javax/swing/plaf/basic/BasicTabbedPaneUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicTextUI.java: Reindent.
+	* javax/swing/plaf/basic/BasicToolBarUI.java: Reindent.
+
+	2004-07-31  Roman Kennke  <roman at ontographics.com>
+
+	* javax/swing/Box.java:
+	(createGlue): Implemented
+	(createHorizontalGlue): Implemented
+	(createHorizontalStrut): Implemented
+	(createVerticalGlue): Implemented
+	(createVerticalStrut): Implemented
+
+	2004-07-31  Roman Kennke  <roman at ontographics.com>
+
+	* javax/swing/BoxLayout.java: Reimplement.
+
+	2004-07-31  Mark Wielaard  <mark at klomp.org>
+
+	* java/awt/Component.java: Reindent.
+	* java/awt/im/InputContext.java: Reindent.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c:
+	Reindent.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c: Reindent.
+
+	2004-07-31  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+	* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java (create): Use tf
+	variable in setEditable call.
+
+	* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
+	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
+	(gtkWidgetSetBackground): New method.
+	(gtkWidgetSetForeground): Likewise.
+	(create): Set peer's editable state based on awtComponent's.
+
+	2004-07-31  David Jee  <djee at redhat.com>
+
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
+	(gtkWidgetGetPreferredDimensions): For widgets extending GtkWindow,
+	use their default sizes rather than their natural requisitions.
+
+	2004-07-31  Mark Wielaard  <mark at klomp.org>
+
+	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
+	(gtkWidgetSetSensitive): Removed.
+	(gtkWidgetSetParent): Removed.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
+	(gtkWidgetSetSensitive): New method.
+	(gtkWidgetSetParent): Likewise.
+	Remove all set methods.
+
+	2004-07-31  David Jee  <djee at redhat.com>
+
+	* gnu/java/awt/peer/gtk/GtkChoicePeer.java
+	(GtkChoicePeer): Do not automatically select first item.
+	(getHistory): Remove.
+	(nativeGetSelected): New method.
+	(nativeRemoveAll): New method.
+	(add): Use nativeGetSelected() instead of getHistory().
+	(remove): Likewise.
+	(removeAll): Call nativeRemoveAll().
+	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
+	(create): Migrate to GtkComboBox.
+	(append): Likewise.
+	(nativeAdd): Likewise.
+	(nativeRemove): Likewise.
+	(select): Likewise.
+	(nativeRemoveAll): New method.
+	(nativeGetSelected): New method.
+	(selection_changed): New method.
+	(getHistory): Remove.
+	(item_activate): Remove.
+	(item_removed): Remove.
+	(connect_choice_item_selectable_hook): Remove.
+
+	2004-07-31  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+	* java/awt/Component.java: Document AWT 1.0 event handler
+	methods.
+
+	2004-07-31  David Jee  <djee at redhat.com>
+
+	* java/awt/DefaultKeyboardFocusManager.java
+	(postProcessKeyEvent): Only activate MenuShortcuts on KEY_PRESSED
+	event.  Fix shift modifier checking.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
+	(accel_attach): Remove.
+	(setupAccelGroup): Remove calls to accel_attach.
+
+	2004-07-31  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+	PR AWT/16040
+	* gnu/java/awt/peer/gtk/GtkButtonPeer.java: Likewise.
+	* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
+	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise.
+	* gnu/java/awt/peer/gtk/GtkListPeer.java: Likewise.
+	* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Likewise.
+	* java/awt/AWTKeyStroke.java: Remove old modifier masks.
+	* java/awt/Component.java: Replace old modifier masks with new
+	ones.
+	* java/awt/Container.java: Call getModifiersEx, not
+	getModifiers.
+	* java/awt/DefaultKeyboardFocusManager.java: Likewise.  Remove
+	old modifier masks.
+	* javax/swing/JMenuItem.java: Replace old button masks with new
+	ones.
+	* javax/swing/KeyStroke.java: Call getModifiersEx, not
+	getModifiers.
+	* javax/swing/SwingUtilities.java: Likewise.
+	* javax/swing/plaf/basic/BasicButtonListener.java: Likewise.
+	* javax/swing/plaf/basic/BasicInternalFrameUI.java: Likewise.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Replace old
+	mask macros with new ones.
+	* native/jni/gtk-peer/gtkpeer.h: Replace old button and modifier mask
+	macros with new ones representing new masks.
+
+	2004-07-31  Mark Wielaard  <mark at klomp.org>
+
+	* gnu/java/awt/EmbeddedWindow.java: Reindent.
+	* gnu/java/awt/image/ImageDecoder.java: Reindent.
+	* gnu/java/awt/peer/gtk/GtkComponentPeer.java: Reindent.
+	* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java: Reindent.
+	* java/awt/DefaultKeyboardFocusManager.java: Reindent.
+	* java/awt/Frame.java: Reindent.
+	* javax/swing/JCheckBox.java: Reindent.
+	* javax/swing/JCheckBoxMenuItem.java: Reindent.
+	* javax/swing/UIDefaults.java: Reindent.
+	* javax/swing/UIManager.java: Reindent.
+
+	2004-07-31  Kim Ho  <kho at redhat.com>
+
+	* java/awt/Container.java:
+	(acquireComponentForMouseEvent): Respect
+	the event mask when looking for candidate.
+	* javax/swing/JComponent.java:
+	Remove toolTip field.
+	(createToolTip): Create a tooltip on demand.
+	(setToolTipText): Register with the ToolTipManager.
+	(getToolTipText(MouseEvent)): Return getToolTipText().
+	* javax/swing/JToolTip.java: Implement.
+	* javax/swing/Timer.java: Jalopy.
+	(restart): Call stop, then start.
+	(stop): Interrupt the timer rather than wait for
+	the timer to come to a stop naturally.
+	* javax/swing/ToolTipManager.java: Implement.
+	* javax/swing/plaf/basic/BasicLookAndFeel.java:
+	Change ToolTip.background color.
+	* javax/swing/plaf/basic/BasicToolTipUI.java:
+	Implement.
+
+	2004-07-31  Mark Wielaard  <mark at klomp.org>
+
+	* native/jni/gtk-peer/gthread-jni.c: Define MIN_, MAX_ and NORM_
+	PRIORITY when not already defined in header file.
+
+	2004-07-30  Mark Wielaard  <mark at klomp.org>
+
+	* javax/swing/AbstractButton.java: Reformat.
+	* javax/swing/ActionMap.java: Likewise.
+	* javax/swing/ComponentInputMap.java: Likewise.
+	* javax/swing/DefaultDesktopManager.java: Likewise.
+	* javax/swing/ImageIcon.java: Likewise.
+	* javax/swing/InputMap.java: Likewise.
+	* javax/swing/JButton.java: Likewise.
+	* javax/swing/JEditorPane.java: Likewise.
+	* javax/swing/JInternalFrame.java: Likewise.
+	* javax/swing/JMenu.java: Likewise.
+	* javax/swing/JMenuBar.java: Likewise.
+	* javax/swing/JMenuItem.java: Likewise.
+	* javax/swing/JOptionPane.java: Likewise.
+	* javax/swing/JPopupMenu.java: Likewise.
+	* javax/swing/JRootPane.java: Likewise.
+	* javax/swing/JScrollPane.java: Likewise.
+	* javax/swing/JTable.java: Likewise.
+	* javax/swing/JTextField.java: Likewise.
+	* javax/swing/JToolBar.java: Likewise.
+	* javax/swing/MenuSelectionManager.java: Likewise.
+	* javax/swing/RepaintManager.java: Likewise.
+	* javax/swing/ScrollPaneLayout.java: Likewise.
+	* javax/swing/UIManager.java: Likewise.
+	* javax/swing/ViewportLayout.java: Likewise.
+
+	2004-07-30  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+	* gnu/java/awt/peer/gtk/GtkArg.java: Remove file.
+	* gnu/java/awt/peer/gtk/GtkArgList.java: Remove file.
+
+	* gnu/java/awt/peer/gtk/GtkButtonPeer.java,
+	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
+	(create(String)): New method.
+	(create): Call new create method.
+	(getArgs): Remove method.
+	* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
+	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c 
+	(nativeCreate): Rename to create.
+	(gtkSetLabel): Rename to gtkButtonSetLabel.
+	(gtkToggleButtonSetActive): New method.
+	(create): Call gtkToggleButtonSetActive and gtkButtonSetLabel.
+	(setState): Replace set call with gtkToggleButtonSetActive.
+	(setLabel): Replace gtkSetLabel call with gtkButtonSetLabel.
+	(getArgs): Remove method.
+	* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
+	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
+	(gtkWidgetSetSensitive): New method.
+	(gtkWidgetSetParent): Likewise.
+	(GtkComponentPeer): Call setParent, setComponentBounds and
+	setVisibleAndEnabled.
+	(setParent): New method.
+	(setComponentBounds): New method.
+	(setVisibleAndEnabled): New method.
+	(setEnabled): Call gtkWidgetSetSensitive.
+	(getArgs): Remove method.
+	Remove all set methods.
+	* gnu/java/awt/peer/gtk/GtkDialogPeer.java (create): Call
+	gtkWindowSetModal, setTitle and setResizable.
+	(getArgs): Remove method.
+	* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
+	(setComponentBounds): New method.
+	* gnu/java/awt/peer/gtk/GtkFramePeer.java (setResizable):
+	Replace set call with gtkWindowSetResizable.
+	(getArgs): Remove method.
+	(create): Call setTitle and setResizable.
+	* gnu/java/awt/peer/gtk/GtkWindowPeer.java,
+	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+	(gtkWindowSetTitle): New method.
+	(gtkWindowSetResizable): New method.
+	(gtkWindowSetModal): New method.
+	(setParent): New method.
+	(setVisibleAndEnabled): New method.
+	(getArgs): Remove method.
+	(setTitle): Call gtkWindowSetTitle.
+	(setResizable): Call gtkWindowSetResizable.
+	* native/jni/gtk-peer/gtkpeer.h [DEBUG_LOCKING]: New define to turn on
+	and off locking instrumentation.
+
+	2004-07-30  Craig Black  <craig.black at aonix.com>
+
+	* gnu/java/awt/peer/gtk/GdkGraphics.java 
+	(drawRoundRect): Implemented.
+	(fillRoundRect): Implemented.
+	* gnu/java/awt/peer/gtk/GdkGraphics2D.java 
+	(drawRoundRect): Reimplemented to match GdkGraphics.
+	(fillRoundRect): Reimplemented to match GdkGraphics.
+
+	2004-07-30  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+	* gnu/java/awt/peer/gtk/GdkGraphics.java,
+	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
+	(initState(GtkComponentPeer)): Don't return array of colour
+	values.
+	(GdkGraphics(int,int)): Set default font to size 12.
+	(GdkGraphics(GtkComponentPeer)): Set graphics colour to
+	component's foreground colour.
+	* gnu/java/awt/peer/gtk/GdkGraphics2D.java,
+	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
+	(initState(GtkComponentPeer)): Don't return array of colour
+	values.
+	(GdkGraphics2D(GtkComponentPeer)): Set foreground and background
+	colours to component's colours.
+	(current_colors_of_widget): Remove function.
+	* gnu/java/awt/peer/gtk/GtkOffScreenImage.java (getGraphics):
+	Return a new graphics object.
+	* java/awt/Font.java (toString): Fix format.
+	* java/awt/Graphics.java (toString): Likewise.
+
+	2004-07-30  Bryce McKinlay  <mckinlay at redhat.com>
+
+	* gnu/java/awt/ClasspathToolkit.java (createImageProducer): New.
+	Default implementation.
+	* gnu/java/awt/peer/gtk/GtkToolkit.java (createImageProducer): New.
+	Implement using GdkPixbufDecoder.
+
+	2004-07-29  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* java/util/Collection.java, java/util/List.java,
+	java/util/Map.java, java/util/Set.java,
+	java/util/SortedMap.java, java/util/SortedSet.java:
+	Added additional exceptions to documentation.
+
+	2004-07-29  Michael Koch  <konqueror at gmx.de>
+
+	* gnu/java/awt/EmbeddedWindow.java
+	(addNotify): Use AccessController to allow execution of privileged
+	code.
+
+	2004-07-28  Tom Tromey  <tromey at redhat.com>
+
+	* gnu/java/awt/peer/GLightweightPeer.java,
+	gnu/java/awt/peer/gtk/GdkGraphics2D.java,
+	gnu/java/awt/peer/gtk/GtkComponentPeer.java,
+	gnu/javax/rmi/CORBA/StubDelegateImpl.java,
+	javax/swing/JScrollPane.java: Removed
+	redundant imports.
+
+	2004-07-28  Bryce McKinlay  <mckinlay at redhat.com>
+
+	* gnu/java/security/action/GetPropertyAction.java (setParameters):
+	Renamed from 'setName'. New 2-argument form with default value.
+	(run): Pass default 'value' parameter to System.getProperty().
+	* gnu/java/security/action/SetAccessibleAction.java: Fix javadoc
+	typos.
+	* gnu/java/net/protocol/http/Connection.java: Use 'setParameters'
+	not 'setName'.
+
+	2004-07-28  Mark Wielaard  <mark at klomp.org>
+
+	* vm/reference/java/io/VMFile.java (toCanonicalForm): Made
+	static.
+
+	2004-07-27  Jeroen Frijters  <jeroen at frijters.net>
+
+	* vm/reference/java/io/VMFile.java (toCanonicalForm): New method.
+
+	2004-07-26  Archie Cobbs  <archie at dellroad.org>
+
+	* native/jni/gtk-peer/gthread-jni.c: don't #include nonexistent files
+
 2004-08-05  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* libraries/javalib/kjc.jar: Regenerated.
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c:1.1 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c:1.2
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c:1.1	Thu Jul 22 19:04:01 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c	Sun Aug  8 19:45:46 2004
@@ -94,15 +94,13 @@
 
 /* copy the native state of the peer (GtkWidget *) to the native state
    of the graphics object */
-JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2
   (JNIEnv *env, jobject obj, jobject peer)
 {
   struct graphics *g = (struct graphics *) malloc (sizeof (struct graphics));
   void *ptr;
   GtkWidget *widget;
   GdkColor color;
-  jintArray array;
-  jint *rgb;
 
   ptr = NSA_GET_PTR (env, peer);
   g->x_offset = g->y_offset = 0;
@@ -133,16 +131,7 @@
 
   gdk_threads_leave ();
 
-  array = (*env)->NewIntArray (env, 3);
-  rgb = (*env)->GetIntArrayElements (env, array, NULL);
-  rgb[0] = color.red >> 8;
-  rgb[1] = color.green >> 8;
-  rgb[2] = color.blue >> 8;
-  (*env)->ReleaseIntArrayElements (env, array, rgb, 0);
-
   NSA_SET_PTR (env, obj, g);
-
-  return array;
 }
 
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_dispose
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:1.1 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:1.2
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:1.1	Thu Jul 22 19:04:01 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c	Sun Aug  8 19:45:47 2004
@@ -443,41 +443,12 @@
   gdk_threads_leave();
 }
 
-static jintArray
-current_colors_of_widget (GtkWidget *widget, JNIEnv *env)
-{
-  GdkColor color;
-  jintArray array;
-  jint *rgb;
-
-  g_assert (widget != NULL);
-  g_assert (env != NULL);
-
-  color = widget->style->fg[GTK_STATE_NORMAL];
-  array = (*env)->NewIntArray (env, 6);
-
-  rgb = (*env)->GetIntArrayElements (env, array, NULL);
-  rgb[0] = color.red >> 8;
-  rgb[1] = color.green >> 8;
-  rgb[2] = color.blue >> 8;
-
-  color = widget->style->bg[GTK_STATE_NORMAL];
-  rgb[3] = color.red >> 8;
-  rgb[4] = color.green >> 8;
-  rgb[5] = color.blue >> 8;
-
-  (*env)->ReleaseIntArrayElements (env, array, rgb, 0);
-  
-  return array;
-}
-
-JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2
   (JNIEnv *env, jobject obj, jobject peer)
 {
   struct graphics2d *gr = NULL;
   GtkWidget *widget = NULL;
   void *ptr = NULL;
-  jintArray color;
 
   gdk_threads_enter();
   if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
@@ -504,11 +475,8 @@
   else
     init_graphics2d_as_pixbuf (gr);
 
-  color = current_colors_of_widget (widget, env);
-
   NSA_SET_G2D_PTR (env, obj, gr);
   gdk_threads_leave();
-  return color;
 }
 
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_dispose
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c:1.1 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c:1.2
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c:1.1	Thu Jul 22 19:04:01 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c	Sun Aug  8 19:45:47 2004
@@ -42,20 +42,23 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GtkButtonPeer_create
-  (JNIEnv *env, jobject obj)
+  (JNIEnv *env, jobject obj, jstring label)
 {
+  const char *c_label;
   GtkWidget *button;
 
-  /* Create global reference and save it for future use */
   NSA_SET_GLOBAL_REF (env, obj);
 
+  c_label = (*env)->GetStringUTFChars (env, label, NULL);
+
   gdk_threads_enter ();
-  
-  button = gtk_button_new();
+
+  button = gtk_button_new_with_label (c_label);
   gtk_widget_show (button);
 
   gdk_threads_leave ();
 
+  (*env)->ReleaseStringUTFChars (env, label, c_label);
   NSA_SET_PTR (env, obj, button);
 }
 
@@ -102,7 +105,7 @@
   gdk_threads_enter ();
 
   label = gtk_bin_get_child (GTK_BIN (ptr));
-  gtk_label_set_text (GTK_LABEL(label), text);
+  gtk_label_set_text (GTK_LABEL (label), text);
 
   gdk_threads_leave ();
 
@@ -126,9 +129,6 @@
 
   label = gtk_bin_get_child (GTK_BIN (ptr));
 
-  if (!label)
-    return;
-
   font_desc = pango_font_description_from_string (font_name);
   pango_font_description_set_size (font_desc, size * dpi_conversion_factor);
 
@@ -164,9 +164,6 @@
   gdk_threads_enter ();
 
   label = gtk_bin_get_child (GTK_BIN(ptr));
-
-  if (!label)
-      return;
 
   gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &color);
   gtk_widget_modify_fg (label, GTK_STATE_ACTIVE, &color);
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c:1.1 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c:1.2
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c:1.1	Thu Jul 22 19:04:01 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c	Sun Aug  8 19:45:47 2004
@@ -43,12 +43,11 @@
 static void item_toggled (GtkToggleButton *item, jobject peer);
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeCreate
-  (JNIEnv *env, jobject obj, jobject group, jboolean state)
+Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_create
+  (JNIEnv *env, jobject obj, jobject group)
 {
   GtkWidget *button;
 
-  /* Create global reference and save it for future use */
   NSA_SET_GLOBAL_REF (env, obj);
 
   gdk_threads_enter ();
@@ -66,7 +65,6 @@
 	  NSA_SET_PTR (env, group, button);
 	}
     }
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), state);
 
   gdk_threads_leave ();
 
@@ -131,6 +129,21 @@
 }
 
 JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkToggleButtonSetActive
+  (JNIEnv *env, jobject obj, jboolean is_active)
+{
+  void *ptr;
+
+  ptr = NSA_GET_PTR (env, obj);
+
+  gdk_threads_enter ();
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ptr), is_active);
+
+  gdk_threads_leave ();
+}
+
+JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont
   (JNIEnv *env, jobject obj, jstring name, jint style, jint size)
 {
@@ -171,26 +184,25 @@
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel
+Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkButtonSetLabel
   (JNIEnv *env, jobject obj, jstring label)
 {
-  const char *str;
-  void *ptr;
+  const char *c_label;
   GtkWidget *label_widget;
+  void *ptr;
 
   ptr = NSA_GET_PTR (env, obj);
 
-  label_widget = gtk_bin_get_child (GTK_BIN(ptr));
-
-  str = (*env)->GetStringUTFChars (env, label, 0);
+  c_label = (*env)->GetStringUTFChars (env, label, NULL);
 
   gdk_threads_enter ();
 
-  gtk_label_set_label (GTK_LABEL (label_widget), str);
+  label_widget = gtk_bin_get_child (GTK_BIN (ptr));
+  gtk_label_set_text (GTK_LABEL (label_widget), c_label);
 
   gdk_threads_leave ();
 
-  (*env)->ReleaseStringUTFChars (env, label, str);
+  (*env)->ReleaseStringUTFChars (env, label, c_label);
 }
 
 static void
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c:1.1 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c:1.2
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c:1.1	Thu Jul 22 19:04:01 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c	Sun Aug  8 19:45:47 2004
@@ -39,38 +39,27 @@
 #include "gtkpeer.h"
 #include "gnu_java_awt_peer_gtk_GtkChoicePeer.h"
 
-static void connect_choice_item_selectable_hook (JNIEnv *env, 
-						 jobject peer_obj, 
-						 GtkItem *menuitem, 
-						 const char *label);
+static void selection_changed (GtkComboBox *combobox, gpointer data);
 
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkChoicePeer_create 
   (JNIEnv *env, jobject obj)
 {
   GtkWidget *menu;
-  GtkOptionMenu *option_menu;
-  GtkRequisition child_requisition;
+  GtkComboBox *combobox;
 
-  /* Create global reference and save it for future use */
   NSA_SET_GLOBAL_REF (env, obj);
 
   gdk_threads_enter ();
   
-  option_menu = GTK_OPTION_MENU (gtk_option_menu_new ());
-  menu = gtk_menu_new ();
-  gtk_widget_show (menu);
+  combobox = gtk_combo_box_new_text ();
 
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
-
-  gtk_widget_size_request (gtk_menu_item_new_with_label (""), 
-			   &child_requisition);
-  option_menu->width = child_requisition.width;
-  option_menu->height = child_requisition.height;
+  g_signal_connect (combobox, "changed",
+                    G_CALLBACK (selection_changed), obj);
 
   gdk_threads_leave ();
 
-  NSA_SET_PTR (env, obj, option_menu);
+  NSA_SET_PTR (env, obj, combobox);
 }
 
 JNIEXPORT void JNICALL 
@@ -78,45 +67,27 @@
   (JNIEnv *env, jobject obj, jobjectArray items)
 {
   gpointer ptr;
-  GtkMenu *menu;
   jsize count, i;
-  int need_set_history = 0;
 
   ptr = NSA_GET_PTR (env, obj);
 
   gdk_threads_enter ();
 
-  menu = GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (ptr)));
-
-  /* Are we adding the first element? */
-  if (gtk_option_menu_get_history (GTK_OPTION_MENU (ptr)) < 0)
-      need_set_history = 1;
-
   count = (*env)->GetArrayLength (env, items);
 
   for (i = 0; i < count; i++) 
     {
       jobject item;
       const char *label;
-      GtkWidget *menuitem;
 
       item = (*env)->GetObjectArrayElement (env, items, i);
       label = (*env)->GetStringUTFChars (env, item, NULL);
 
-      menuitem = gtk_menu_item_new_with_label (label);
-      gtk_menu_append (menu, menuitem);
-      gtk_widget_show (menuitem);
-
-      connect_choice_item_selectable_hook (env, obj, 
-					   GTK_ITEM (menuitem), label);
+      gtk_combo_box_append_text (GTK_COMBO_BOX (ptr), label);
 
       (*env)->ReleaseStringUTFChars (env, item, label);
     }
 
-  /* If we just added the first element select it. */  
-  if (need_set_history)
-    gtk_option_menu_set_history (GTK_OPTION_MENU (ptr), 0);
-
   gdk_threads_leave ();
 }
 
@@ -126,36 +97,13 @@
 {
   void *ptr;
   const char *label;
-  GtkWidget *menu, *menuitem;
-  int current;
-  int need_set_history = 0;
 
   ptr = NSA_GET_PTR (env, obj);
   
   label = (*env)->GetStringUTFChars (env, item, 0);      
 
   gdk_threads_enter ();
-  
-  current = gtk_option_menu_get_history (GTK_OPTION_MENU (ptr));
-
-  /* Are we adding the first element or below or at the currently
-     selected one? */
-  if ((current < 0) || (current >= index))
-      need_set_history = 1;
-
-  menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (ptr));
-  menuitem = gtk_menu_item_new_with_label (label);
-  gtk_menu_insert (GTK_MENU (menu), menuitem, index);
-  gtk_widget_show (menuitem);
-
-  connect_choice_item_selectable_hook (env, obj, GTK_ITEM (menuitem), label);
-
-  /* If we just added the first element select it.
-     If we added at of below the currently selected position make
-     the first item the selected one. */  
-  if (need_set_history)
-    gtk_option_menu_set_history (GTK_OPTION_MENU (ptr), 0);
-
+  gtk_combo_box_insert_text (GTK_COMBO_BOX (ptr), index, label);
   gdk_threads_leave ();
 
   (*env)->ReleaseStringUTFChars (env, item, label);
@@ -166,50 +114,35 @@
   (JNIEnv *env, jobject obj, jint index)
 {
   void *ptr;
-  GtkContainer *menu;
-  GtkWidget *menuitem;
-  GList *children;
-  int need_set_history = 0;
-  int i, from, to;
 
   ptr = NSA_GET_PTR (env, obj);
 
   gdk_threads_enter ();
+  gtk_combo_box_remove_text (GTK_COMBO_BOX (ptr), index);
+  gdk_threads_leave ();
+}
 
-  menu = GTK_CONTAINER (gtk_option_menu_get_menu (GTK_OPTION_MENU (ptr)));
-  children = gtk_container_children (menu);
+JNIEXPORT void JNICALL 
+Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeRemoveAll 
+  (JNIEnv *env, jobject obj)
+{
+  void *ptr;
+  GtkTreeModel *model;
+  gint count, i;
 
-  if (index == -1)
-    {
-      /* Remove all elements (removeAll) */
-      from = g_list_length (children) - 1;
-      to = 0;
+  ptr = NSA_GET_PTR (env, obj);
 
-      /* Select the first item to prevent spurious activate signals */
-      gtk_option_menu_set_history (GTK_OPTION_MENU (ptr), 0);
-    }
-  else
-    {
-      /* Remove the specific index element */
-      from = index;
-      to = index;
-
-      /* Are we removing the currently selected element? */
-      if (gtk_option_menu_get_history (GTK_OPTION_MENU (ptr)) == index)
-        need_set_history = 1;
-    }
+  gdk_threads_enter ();
 
-  for (i = from; i >= to; i--)
-    {
-      menuitem = GTK_WIDGET (g_list_nth (children, i)->data);
-      gtk_container_remove (menu, menuitem);
-      gtk_widget_destroy (menuitem);
-    }
+  model = gtk_combo_box_get_model (GTK_COMBO_BOX (ptr));
+  count = gtk_tree_model_iter_n_children (model, NULL);
+
+  /* First, unselect everything, to avoid problems when removing items. */
+  gtk_combo_box_set_active (GTK_COMBO_BOX (ptr), -1);
 
-  /* If we just removed the currently selected element and there are
-     still elements left in the list, make the first item the selected one. */  
-  if (need_set_history && gtk_container_children (menu))
-    gtk_option_menu_set_history (GTK_OPTION_MENU (ptr), 0);
+  for (i = count - 1; i >= 0; i--) {
+    gtk_combo_box_remove_text (GTK_COMBO_BOX (ptr), i);
+  }
 
   gdk_threads_leave ();
 }
@@ -223,12 +156,12 @@
   ptr = NSA_GET_PTR (env, obj);
 
   gdk_threads_enter ();
-  gtk_option_menu_set_history (GTK_OPTION_MENU (ptr), index);
+  gtk_combo_box_set_active (GTK_COMBO_BOX (ptr), index);
   gdk_threads_leave ();
 }
 
 JNIEXPORT jint JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkChoicePeer_getHistory 
+Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeGetSelected 
   (JNIEnv *env, jobject obj)
 {
   void *ptr;

*** Patch too long, truncated ***



More information about the kaffe mailing list