procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GtkListPeer.java (handleEvent): Fix generation of ActionEvents.

Browse source 
2003-12-02  Fernando Nasser  <fnasser@redhat.com>

        * gnu/java/awt/peer/gtk/GtkListPeer.java (handleEvent): Fix generation
        of ActionEvents.

From-SVN: r74248
This commit is contained in:
Fernando Nasser 2003-12-03 22:29:31 +00:00 • committed by Fernando Nasser
parent b7e0ff4538
commit 26d86d940e
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

@ -1,3 +1,8 @@
2003-12-02 Fernando Nasser <fnasser@redhat.com>
* gnu/java/awt/peer/gtk/GtkListPeer.java (handleEvent): Fix generation
of ActionEvents.
2003-12-03 Michael Koch <konqueror@gmx.de> 2003-12-03 Michael Koch <konqueror@gmx.de>
* java/lang/Class.h (hack_signers): Renamed signers to hack_signers. * java/lang/Class.h (hack_signers): Renamed signers to hack_signers.

13
libjava/gnu/java/awt/peer/gtk/GtkListPeer.java
View file

@ -128,10 +128,12 @@ public class GtkListPeer extends GtkComponentPeer
{ {
if (e.getID () == MouseEvent.MOUSE_CLICKED && isEnabled ()) if (e.getID () == MouseEvent.MOUSE_CLICKED && isEnabled ())
{ {
/* Only generate the ActionEvent on the second click of
a multiple click */
MouseEvent me = (MouseEvent) e; MouseEvent me = (MouseEvent) e;
if (!me.isConsumed () if (!me.isConsumed ()
&& (me.getModifiers () & MouseEvent.BUTTON1_MASK) != 0 && (me.getModifiers () & MouseEvent.BUTTON1_MASK) != 0
&& me.getClickCount() > 1) && me.getClickCount() == 2)
postActionEvent (((List)awtComponent).getSelectedItem (), postActionEvent (((List)awtComponent).getSelectedItem (),
me.getModifiers ()); me.getModifiers ());
} }
@ -140,8 +142,13 @@ public class GtkListPeer extends GtkComponentPeer
{ {
KeyEvent ke = (KeyEvent) e; KeyEvent ke = (KeyEvent) e;
if (!ke.isConsumed () && ke.getKeyCode () == KeyEvent.VK_ENTER) if (!ke.isConsumed () && ke.getKeyCode () == KeyEvent.VK_ENTER)
postActionEvent (((List)awtComponent).getSelectedItem (), {
ke.getModifiers ()); String selectedItem = ((List)awtComponent).getSelectedItem ();
/* Enter only generates an Action event if something is selected */
if (selectedItem != null)
postActionEvent (selectedItem, ke.getModifiers ());
}
} }
super.handleEvent (e); super.handleEvent (e);