31e632d3e4
2004-04-09 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkPanelPeer.java (connectSignals): Remove method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c: Remove unused code. 2004-04-02 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/ImageIcon.java: (ImageIcon(file)): set description of the icon to the file name * javax/swing/JCheckBoxMenuItem.java: Mostly Implemented. Work in progress. * javax/swing/JRadioButtonMenuItem.java: Reimplement constructors to use JToggleButtonModel. * javax/swing/plaf/basic/BasicIconFactory.java: (getCheckBoxMenuItemIcon): return check box icon. * javax/swing/plaf/basic/BasicMenuItemUI.java: paint menu item selected only when it is armed and pressed. 2004-04-02 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkMenuItemPeer.java (GtkMenuItemPeer): Only connect signals if this isn't a Menu peer. * java/awt/Component.java (add): Set the parent of the popup as this component. * java/awt/PopupMenu.java (addNotify): Create popup menu when peer is null. (show): Call addNotify() if peer is null. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c (Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show): Set the button argument for gtk_menu_popup() as zero. This causes the popup menu to respond to any mouse button. 2004-03-31 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/JRadioButtonMenuItem.java: Implemented. * javax/swing/plaf/basic/BasicIconFactory.java: (getRadioButtonMenuItemIcon): Return radio button icon. * javax/swing/plaf/basic/BasicMenuItemUI.java: (getPreferredSize): Add size of checkIcon if it exists. (installDefaults): Don't initialize checkIcon. It's value will be set in subclasses. (uninstallDefaults): remove uninstallation of checkIcon. (paint): Moved code to paintMenuItem(). (paintMenuItem): Implemented. * javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java: UI delegate for JRadioButtonMenuItem. 2004-03-29 Olga Rodimina <rodimina@redhat.com> * javax/swing/plaf/basic/BasicMenuItemUI.java: Corrected position of the accelerator. 2004-03-29 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/JMenuItem.java: Partly implemented. Work in progress * javax/swing/plaf/basic/BasicLookAndFeel.java: Changed default value of acceleratorDelimiter. * javax/swing/plaf/basic/BasicMenuItemUI.java: New class. Partly implemented. 2004-03-26 Mark Wielaard <mark@klomp.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c (item_activate): Declare label before use. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkSetFont): Removed unused variable label. (addExposeFilter): Declare variables before use. (removeExposeFilter): Likewise. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (ok_clicked): Declare str_fileName before use. 2004-03-26 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkMenuPeer.java (addSeparator): Remove. * java/awt/Menu.java (separator): Remove static final MenuItem field. (separatorLabel): New static final String field. (addSeparator): Do not use peer method; use add(MenuItem) instead. Use separatorLabel to denote that it is a separator. (insertSeparator): Create a new MenuItem with separatorLabel, instead of reusing the static separator instance, because a MenuItem instance can't be added more than once without being cloned. * java/awt/peer/MenuPeer.java (addSeparator): Remove from interface. 2004-03-26 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkMenuItemPeer.java (connectSignals): New native method declaration. (GtkMenuItemPeer): Connect signals if the parent is a Menu. * java/awt/MenuItem.java (getActionCommand): Return the label if the action command is not set. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c (Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_addMenu): Use gtk_menu_shell_append(). * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c (item_activate): Fix argument type. (Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create): Do not connect signal here. (Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_connectSignals): New method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c (Java_gnu_java_awt_peer_gtk_GtkMenuPeer_create): Check if a label is given. Add the menu widget's top-level GtkWindow to the global window group, so it can grab the pointer. (Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addItem): Use gtk_menu_shell_append(). 2004-03-23 Graydon Hoare <graydon@redhat.com> * java/text/AttributedString.java (addAttribute): Fix off-by-one. (getIterator): Likewise. * java/text/AttributedStringIterator.java (getRunLimit): Correct logic. (getRunStart): Likewise. (getAttribute): Fix inequality. (getAttributes): Likewise. * testsuite/libjava.mauve/xfails: Remove AttributedString xfail. 2004-03-23 Kim Ho <kho@redhat.com> * javax/swing/plaf/basic/BasicTabbedPaneUI.java: (calculateSizes): Return real width and height. 2004-03-23 Kim Ho <kho@redhat.com> * javax/swing/plaf/basic/BasicTabbedPaneUI.java (calculateTabRects): Set the selectedRun before trying to rotate tabs. 2004-03-23 Kim Ho <kho@redhat.com> * Makefile.am: New file * Makefile.in: Regenerate * java/awt/Graphics.java: (drawRect): Draw to the correct point. * javax/swing/DefaultSingleSelectionModel.java (isSelected): Return true if the selected index is not -1. * javax/swing/JLabel.java: Do not change mnemonic index if text is null. * javax/swing/JProgressBar.java: Use JComponent's EventListenerList. * javax/swing/JScrollBar.java: Ditto. * javax/swing/JSlider.java: Ditto. * javax/swing/JTabbedPane.java: Reimplement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Add defaults for TabbedPane. * javax/swing/plaf/basic/BasicArrowButton.java: Implement * javax/swing/plaf/basic/BasicProgressBarUI.java: (paintDeterminate): Don't paint String if it's empty. (paintIndeterminate): ditto. * javax/swing/plaf/basic/BasicTabbedPaneUI.java: Reimplement. 2004-03-19 Michael Koch <konqueror@gmx.de> * java/awt/image/AffineTransformOp.java (AffineTransformOp): Made public. * javax/swing/JComponent.java (listenerList): Made protected. (accessibleContext): Likewise. * javax/swing/JList.java (valueChanged): Dont use internal fields of ListSelectionEvent. * javax/swing/JViewport.java (getView): Dont use internal fields of Component. (addImpl): Likewise. * javax/swing/Timer.java (isRunning): Made public. (start): Likewise. (stop): Likewise. * javax/swing/UIDefaults.java (getInt): Made public. * javax/swing/plaf/basic/BasicListUI.java (mousePressed): Dont use internal fields of MouseEvent. (propertyChanged): Dont use internal fields of PropertyChangeEvent. * javax/swing/plaf/basic/BasicScrollBarUI.java (arrowIcon): Made static. * javax/swing/plaf/basic/BasicViewportUI.java (stateChanged): Dont use internal field on ChangeEvent. * javax/swing/text/JTextComponent.java (getUI): Call UIManager.getUI(). (updateUI): Use getUI(). 2004-03-19 Graydon Hoare <graydon@redhat.com> * javax/swing/JComponent.java: Turn off double buffer by default. * javax/swing/plaf/basic/BasicViewportUI.java: Clear rects before painting. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable): Use cairo to copy areas. (Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoClip): Initialize and set clip region. 2004-03-15 Thomas Fitzsimmons <fitzsim@redhat.com> * java/applet/Applet.java (preferredSize): Override deprecated variant of getPreferredSize. (minimumSize): Override deprecated variant of getMinimumSize. 2004-03-15 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (drawImage(img,xform,bgcolor,obs)): New Method. Helper function that every drawImage method will use. (drawRaster): Added new parameter, bgcolor. All transparent pixels are changed to bgcolor before image is drawn. (drawRenderedImage): Fixed to use changed drawRaster(). (drawImage(image,xform,obs): Fixed to use new helper function (drawImage(image,op,x,y)): Ditto. (drawImage (img,x,y,observer)): Ditto. ((PainterThread) bgcolor): New Field. ((PainterThread) (setPixels)): Changed all transparent pixels to bgcolor. (drawImage(img,x,y,width,height,bgcolor,observer)): Fixed FIXME - all the transparent pixels are changed to the specified bgcolor. (drawImage(img, x, y, width, height, observer): Changed to use function above. (drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,bgcolor,observer)): Fixed FIXME- changed all transparent pixels to bgcolor. (drawImage (img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, observer)): Changed to use function above. 2004-03-14 Thomas Fitzsimmons <fitzsim@redhat.com> * java/applet/Applet.java (dimensions): New field. (getDimensions): New method. (getPreferredSize): Call getDimensions. (getMinimumSize): Likewise. 2004-03-13 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/classpath/jcl.c: Include stdlib.h, not malloc.h. * jni/classpath/jnilink.c: Likewise. * java/applet/Applet.java (getPreferredSize): New method. (getMinimumSize): New method. From-SVN: r80762
426 lines
10 KiB
Java
426 lines
10 KiB
Java
/* Menu.java -- A Java AWT Menu
|
|
Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package java.awt;
|
|
|
|
import java.awt.peer.MenuPeer;
|
|
import java.io.Serializable;
|
|
import java.util.Vector;
|
|
import java.util.Enumeration;
|
|
|
|
/**
|
|
* This class represents a pull down or tear off menu in Java's AWT.
|
|
*
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
*/
|
|
public class Menu extends MenuItem implements MenuContainer, Serializable
|
|
{
|
|
|
|
/*
|
|
* Static Variables
|
|
*/
|
|
|
|
// Serialization Constant
|
|
private static final long serialVersionUID = -8809584163345499784L;
|
|
|
|
/*************************************************************************/
|
|
|
|
/*
|
|
* Instance Variables
|
|
*/
|
|
|
|
/**
|
|
* @serial The actual items in the menu
|
|
*/
|
|
private Vector items = new Vector();
|
|
|
|
/**
|
|
* @serial Flag indicating whether or not this menu is a tear off
|
|
*/
|
|
private boolean isTearOff;
|
|
|
|
/**
|
|
* @serial Indicates whether or not this is a help menu.
|
|
*/
|
|
private boolean isHelpMenu;
|
|
|
|
// From the serialization spec. FIXME: what should it be?
|
|
private int menuSerializedDataVersion;
|
|
|
|
static final String separatorLabel = "-";
|
|
|
|
/*************************************************************************/
|
|
|
|
/*
|
|
* Constructors
|
|
*/
|
|
|
|
/**
|
|
* Initializes a new instance of <code>Menu</code> with no label and that
|
|
* is not a tearoff;
|
|
*
|
|
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
|
|
*/
|
|
public
|
|
Menu()
|
|
{
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Initializes a new instance of <code>Menu</code> that is not a tearoff and
|
|
* that has the specified label.
|
|
*
|
|
* @param label The menu label.
|
|
*
|
|
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
|
|
*/
|
|
public
|
|
Menu(String label)
|
|
{
|
|
this(label, false);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Initializes a new instance of <code>Menu</code> with the specified
|
|
* label and tearoff status.
|
|
*
|
|
* @param label The label for this menu
|
|
* @param isTearOff <code>true</code> if this menu is a tear off menu,
|
|
* <code>false</code> otherwise.
|
|
*
|
|
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
|
|
*/
|
|
public
|
|
Menu(String label, boolean isTearOff)
|
|
{
|
|
super(label);
|
|
|
|
this.isTearOff = isTearOff;
|
|
|
|
if (label.equals("Help"))
|
|
isHelpMenu = true;
|
|
|
|
if (GraphicsEnvironment.isHeadless())
|
|
throw new HeadlessException ();
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/*
|
|
* Instance Methods
|
|
*/
|
|
|
|
/**
|
|
* Tests whether or not this menu is a tearoff.
|
|
*
|
|
* @return <code>true</code> if this menu is a tearoff, <code>false</code>
|
|
* otherwise.
|
|
*/
|
|
public boolean
|
|
isTearOff()
|
|
{
|
|
return(isTearOff);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns the number of items in this menu.
|
|
*
|
|
* @return The number of items in this menu.
|
|
*/
|
|
public int
|
|
getItemCount()
|
|
{
|
|
return countItems ();
|
|
}
|
|
|
|
/**
|
|
* Returns the number of items in this menu.
|
|
*
|
|
* @return The number of items in this menu.
|
|
*
|
|
* @deprecated As of JDK 1.1, replaced by getItemCount().
|
|
*/
|
|
public int countItems ()
|
|
{
|
|
return items.size ();
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns the item at the specified index.
|
|
*
|
|
* @return The item at the specified index.
|
|
*
|
|
* @exception ArrayIndexOutOfBoundsException If the index value is not valid.
|
|
*/
|
|
public MenuItem
|
|
getItem(int index)
|
|
{
|
|
return((MenuItem)items.elementAt(index));
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Adds the specified item to this menu. If it was previously part of
|
|
* another menu, it is first removed from that menu.
|
|
*
|
|
* @param item The new item to add.
|
|
*
|
|
* @return The item that was added.
|
|
*/
|
|
public MenuItem
|
|
add(MenuItem item)
|
|
{
|
|
items.addElement(item);
|
|
if (item.parent != null)
|
|
{
|
|
item.parent.remove(item);
|
|
}
|
|
item.parent = this;
|
|
|
|
if (peer != null)
|
|
{
|
|
MenuPeer mp = (MenuPeer) peer;
|
|
mp.addItem(item);
|
|
}
|
|
|
|
return item;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Add an item with the specified label to this menu.
|
|
*
|
|
* @param label The label of the menu item to add.
|
|
*/
|
|
public void
|
|
add(String label)
|
|
{
|
|
add(new MenuItem(label));
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Inserts the specified menu item into this menu at the specified index.
|
|
*
|
|
* @param item The menu item to add.
|
|
* @param index The index of the menu item.
|
|
*
|
|
* XXX: FIXME
|
|
*
|
|
* @exception IllegalArgumentException If the index is less than zero.
|
|
* @exception ArrayIndexOutOfBoundsException If the index is otherwise invalid.
|
|
*/
|
|
public void
|
|
insert(MenuItem item, int index)
|
|
{
|
|
if (index < 0)
|
|
throw new IllegalArgumentException("Index is less than zero");
|
|
|
|
items.insertElementAt(item, index);
|
|
|
|
MenuPeer mp = (MenuPeer)getPeer();
|
|
// FIXME: Need to add a peer method here.
|
|
// if (mp != null)
|
|
// mp.insertItem(item, index);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Inserts an item with the specified label into this menu at the specified index.
|
|
*
|
|
* @param label The label of the item to add.
|
|
* @param index The index of the menu item.
|
|
*
|
|
* @exception IllegalArgumentException If the index is less than zero.
|
|
* @exception ArrayIndexOutOfBoundsException If the index is otherwise invalid.
|
|
*/
|
|
public void
|
|
insert(String label, int index)
|
|
{
|
|
insert(new MenuItem(label), index);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Adds a separator bar at the current menu location.
|
|
*/
|
|
public void
|
|
addSeparator()
|
|
{
|
|
add(new MenuItem(separatorLabel));
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Inserts a separator bar at the specified index value.
|
|
*
|
|
* @param index The index at which to insert a separator bar.
|
|
*
|
|
* XXX: FIXME
|
|
*
|
|
* @exception IllegalArgumentException If the index is less than zero.
|
|
* @exception ArrayIndexOutOfBoundsException If the index is otherwise invalid.
|
|
*/
|
|
public void
|
|
insertSeparator(int index)
|
|
{
|
|
insert(new MenuItem(separatorLabel), index);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Deletes the item at the specified index from this menu.
|
|
*
|
|
* @param index The index of the item to remove.
|
|
*
|
|
* @exception ArrayIndexOutOfBoundsException If the index is otherwise invalid.
|
|
*/
|
|
public synchronized void
|
|
remove(int index)
|
|
{
|
|
items.removeElementAt(index);
|
|
|
|
MenuPeer mp = (MenuPeer)getPeer();
|
|
if (mp != null)
|
|
mp.delItem(index);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Removes the specifed item from the menu. If the specified component
|
|
* does not exist, this method does nothing. // FIXME: Right?
|
|
*
|
|
* @param item The component to remove.
|
|
*/
|
|
public void
|
|
remove(MenuComponent item)
|
|
{
|
|
int index = items.indexOf(item);
|
|
if (index == -1)
|
|
return;
|
|
|
|
remove(index);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Removes all the elements from this menu.
|
|
*/
|
|
public synchronized void
|
|
removeAll()
|
|
{
|
|
int count = getItemCount();
|
|
for(int i = 0; i < count; i++)
|
|
{
|
|
// We must always remove item 0.
|
|
remove(0);
|
|
}
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Creates the native peer for this object.
|
|
*/
|
|
public void
|
|
addNotify()
|
|
{
|
|
if (peer == null)
|
|
peer = getToolkit().createMenu(this);
|
|
Enumeration e = items.elements();
|
|
while (e.hasMoreElements())
|
|
{
|
|
MenuItem mi = (MenuItem)e.nextElement();
|
|
mi.addNotify();
|
|
}
|
|
super.addNotify ();
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Destroys the native peer for this object.
|
|
*/
|
|
public void
|
|
removeNotify()
|
|
{
|
|
Enumeration e = items.elements();
|
|
while (e.hasMoreElements())
|
|
{
|
|
MenuItem mi = (MenuItem) e.nextElement();
|
|
mi.removeNotify();
|
|
}
|
|
super.removeNotify();
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns a debugging string for this menu.
|
|
*
|
|
* @return A debugging string for this menu.
|
|
*/
|
|
public String
|
|
paramString()
|
|
{
|
|
return (",isTearOff=" + isTearOff + ",isHelpMenu=" + isHelpMenu
|
|
+ super.paramString());
|
|
}
|
|
|
|
// Accessibility API not yet implemented.
|
|
// public AccessibleContext getAccessibleContext()
|
|
|
|
} // class Menu
|