diff options
| author | Graydon Hoare <graydon@gcc.gnu.org> | 2004-04-16 18:44:45 +0000 |
|---|---|---|
| committer | Graydon Hoare <graydon@gcc.gnu.org> | 2004-04-16 18:44:45 +0000 |
| commit | 31e632d3e47f22d310f36709f6d983cb1a8dba92 (patch) | |
| tree | cb7d0902aeb41d7ea4b23d42752c1c7aec6a2729 /libjava/javax/swing/JCheckBoxMenuItem.java | |
| parent | 2d49ce67973aa150ad56b47c7f5dc71fa1e02680 (diff) | |
| download | gcc-31e632d3e47f22d310f36709f6d983cb1a8dba92.zip gcc-31e632d3e47f22d310f36709f6d983cb1a8dba92.tar.gz gcc-31e632d3e47f22d310f36709f6d983cb1a8dba92.tar.bz2 | |
[multiple changes]
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
Diffstat (limited to 'libjava/javax/swing/JCheckBoxMenuItem.java')
| -rw-r--r-- | libjava/javax/swing/JCheckBoxMenuItem.java | 323 |
1 files changed, 126 insertions, 197 deletions
diff --git a/libjava/javax/swing/JCheckBoxMenuItem.java b/libjava/javax/swing/JCheckBoxMenuItem.java index cce8ec1..968b25e 100644 --- a/libjava/javax/swing/JCheckBoxMenuItem.java +++ b/libjava/javax/swing/JCheckBoxMenuItem.java @@ -39,206 +39,135 @@ package javax.swing; import java.io.IOException; import java.io.ObjectOutputStream; + import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleRole; -/** - * JCheckBoxMenuItem - * @author Andrew Selkirk - * @version 1.0 - */ -public class JCheckBoxMenuItem extends JMenuItem implements SwingConstants, Accessible -{ - - //------------------------------------------------------------- - // Classes ---------------------------------------------------- - //------------------------------------------------------------- - - /** - * AccessibleJCheckBoxMenuItem - */ - protected class AccessibleJCheckBoxMenuItem extends AccessibleJMenuItem { - - //------------------------------------------------------------- - // Variables -------------------------------------------------- - //------------------------------------------------------------- - - - //------------------------------------------------------------- - // Initialization --------------------------------------------- - //------------------------------------------------------------- - - /** - * Constructor AccessibleJCheckBoxMenuItem - * @param component TODO - */ - protected AccessibleJCheckBoxMenuItem(JCheckBoxMenuItem component) { - super(component); - // TODO - } // AccessibleJCheckBoxMenuItem() - - - //------------------------------------------------------------- - // Methods ---------------------------------------------------- - //------------------------------------------------------------- - - /** - * getAccessibleRole - * @returns AccessibleRole - */ - public AccessibleRole getAccessibleRole() { - return AccessibleRole.CHECK_BOX; - } // getAccessibleRole() - - - } // AccessibleJCheckBoxMenuItem - - - //------------------------------------------------------------- - // Variables -------------------------------------------------- - //------------------------------------------------------------- - - /** - * uiClassID - */ - private static final String uiClassID = "CheckBoxMenuItemUI"; - - - //------------------------------------------------------------- - // Initialization --------------------------------------------- - //------------------------------------------------------------- - - /** - * Constructor JCheckBoxMenuItem - */ - public JCheckBoxMenuItem() { - // TODO - } // JCheckBoxMenuItem() - - /** - * Constructor JCheckBoxMenuItem - * @param icon TODO - */ - public JCheckBoxMenuItem(Icon icon) { - // TODO - } // JCheckBoxMenuItem() - - /** - * Constructor JCheckBoxMenuItem - * @param text TODO - */ - public JCheckBoxMenuItem(String text) { - // TODO - } // JCheckBoxMenuItem() - - /** - * Constructor JCheckBoxMenuItem - * @param action TODO - */ - public JCheckBoxMenuItem(Action action) { - // TODO - } // JCheckBoxMenuItem() - - /** - * Constructor JCheckBoxMenuItem - * @param text TODO - * @param icon TODO - */ - public JCheckBoxMenuItem(String text, Icon icon) { - // TODO - } // JCheckBoxMenuItem() - - /** - * Constructor JCheckBoxMenuItem - * @param text TODO - * @param state TODO - */ - public JCheckBoxMenuItem(String text, boolean state) { - // TODO - } // JCheckBoxMenuItem() - - /** - * Constructor JCheckBoxMenuItem - * @param text TODO - * @param icon TODO - * @param state TODO - */ - public JCheckBoxMenuItem(String text, Icon icon, boolean state) { - // TODO - } // JCheckBoxMenuItem() - - - //------------------------------------------------------------- - // Methods ---------------------------------------------------- - //------------------------------------------------------------- - - /** - * writeObject - * @param stream TODO - * @exception IOException TODO - */ - private void writeObject(ObjectOutputStream stream) throws IOException { - // TODO - } // writeObject() - - /** - * getUIClassID - * @returns String - */ - public String getUIClassID() { - return uiClassID; - } // getUIClassID() - - /** - * getState - * @returns boolean - */ - public boolean getState() { - return false; // TODO - } // getState() - - /** - * setState - * @param state TODO - */ - public synchronized void setState(boolean state) { - // TODO - } // setState() - - /** - * getSelectedObjects - * @returns Object[] - */ - public Object[] getSelectedObjects() { - return null; // TODO - } // getSelectedObjects() - - /** - * requestFocus - */ - public void requestFocus() { - // TODO - } // requestFocus() - - /** - * paramString - * @returns String - */ - protected String paramString() { - return null; // TODO - } // paramString() - - /** - * getAccessibleContext - * @returns AccessibleContext - */ - public AccessibleContext getAccessibleContext() { - if (accessibleContext == null) { - accessibleContext = new AccessibleJCheckBoxMenuItem(this); - } // if - return accessibleContext; - } // getAccessibleContext() - +public class JCheckBoxMenuItem extends JMenuItem implements SwingConstants, + Accessible +{ + //------------------------------------------------------------- + // Variables -------------------------------------------------- + //------------------------------------------------------------- + private static final String uiClassID = "CheckBoxMenuItemUI"; + private boolean state; + private Object[] selectedObjects; + + //------------------------------------------------------------- + // Initialization --------------------------------------------- + //------------------------------------------------------------- + public JCheckBoxMenuItem() + { + this(null, null); + } // JCheckBoxMenuItem() + + public JCheckBoxMenuItem(Icon icon) + { + this(null, icon); + } // JCheckBoxMenuItem() + + public JCheckBoxMenuItem(String text) + { + this(text, null); + } // JCheckBoxMenuItem() + + public JCheckBoxMenuItem(Action action) + { + this(); + setAction(action); + } // JCheckBoxMenuItem() + + public JCheckBoxMenuItem(String text, Icon icon) + { + this(text, icon, false); + } // JCheckBoxMenuItem() + + public JCheckBoxMenuItem(String text, boolean state) + { + this(text, null, state); + } // JCheckBoxMenuItem() + + public JCheckBoxMenuItem(String text, Icon icon, boolean state) + { + super(text, icon); + setModel(new JToggleButton.ToggleButtonModel()); + this.state = state; + } // JCheckBoxMenuItem() + + //------------------------------------------------------------- + // Methods ---------------------------------------------------- + //------------------------------------------------------------- + private void writeObject(ObjectOutputStream stream) throws IOException + { + // TODO + } // writeObject() + + public String getUIClassID() + { + return uiClassID; + } // getUIClassID() + + public boolean getState() + { + return state; + } // getState() + + public synchronized void setState(boolean state) + { + this.state = state; + } // setState() + + public Object[] getSelectedObjects() + { + return selectedObjects; + } // getSelectedObjects() + + public void requestFocus() + { + // TODO + } // requestFocus() + + protected String paramString() + { + return "JCheckBoxMenuItem"; + } // paramString() + + public AccessibleContext getAccessibleContext() + { + if (accessibleContext == null) + { + accessibleContext = new AccessibleJCheckBoxMenuItem(this); + } + + return accessibleContext; + } // getAccessibleContext() + + //------------------------------------------------------------- + // Classes ---------------------------------------------------- + //------------------------------------------------------------- + protected class AccessibleJCheckBoxMenuItem extends AccessibleJMenuItem + { + //------------------------------------------------------------- + // Variables -------------------------------------------------- + //------------------------------------------------------------- + //------------------------------------------------------------- + // Initialization --------------------------------------------- + //------------------------------------------------------------- + protected AccessibleJCheckBoxMenuItem(JCheckBoxMenuItem component) + { + super(component); + + // TODO + } // AccessibleJCheckBoxMenuItem() + + //------------------------------------------------------------- + // Methods ---------------------------------------------------- + //------------------------------------------------------------- + public AccessibleRole getAccessibleRole() + { + return AccessibleRole.CHECK_BOX; + } // getAccessibleRole() + } // AccessibleJCheckBoxMenuItem } // JCheckBoxMenuItem |