aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Nasser <fnasser@redhat.com>2003-12-17 18:02:56 +0000
committerFernando Nasser <fnasser@gcc.gnu.org>2003-12-17 18:02:56 +0000
commitf84241ba7d06d1af61147ef5e87c6c39f108be87 (patch)
tree942ca21b3f71333ba9985b68873a9fe42db3b7ab
parent310b075bd8e557cdf8ae07a44770d4bcba5772c0 (diff)
downloadgcc-f84241ba7d06d1af61147ef5e87c6c39f108be87.zip
gcc-f84241ba7d06d1af61147ef5e87c6c39f108be87.tar.gz
gcc-f84241ba7d06d1af61147ef5e87c6c39f108be87.tar.bz2
GtkListPeer.java (handleEvent): Fix generation of ActionEvents for mouse double-clicks.
2003-12-17 Fernando Nasser <fnasser@redhat.com> * gnu/java/awt/peer/gtk/GtkListPeer.java (handleEvent): Fix generation of ActionEvents for mouse double-clicks. From-SVN: r74745
-rw-r--r--libjava/ChangeLog7
-rw-r--r--libjava/gnu/java/awt/peer/gtk/GtkListPeer.java11
2 files changed, 15 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 32e4410..b384a29 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,4 +1,9 @@
-2003-12-16 Fernando Nasser <fnasser@redhat.com>
+2003-12-17 Fernando Nasser <fnasser@redhat.com>
+
+ * gnu/java/awt/peer/gtk/GtkListPeer.java (handleEvent): Fix generation
+ of ActionEvents for mouse double-clicks.
+
+2003-12-17 Fernando Nasser <fnasser@redhat.com>
* gnu/java/awt/peer/gtk/GtkContainerPeer.java (handleEvent): Check for
null Graphics pointer returned by FileDialogPeer.
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkListPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkListPeer.java
index e06e079..ac2c361 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkListPeer.java
+++ b/libjava/gnu/java/awt/peer/gtk/GtkListPeer.java
@@ -135,8 +135,15 @@ public class GtkListPeer extends GtkComponentPeer
if (!me.isConsumed ()
&& (me.getModifiers () & MouseEvent.BUTTON1_MASK) != 0
&& me.getClickCount() == 2)
- postActionEvent (((List)awtComponent).getSelectedItem (),
- me.getModifiers ());
+ {
+ String selectedItem = ((List)awtComponent).getSelectedItem ();
+
+ /* Double-click only generates an Action event
+ if something is selected */
+ if (selectedItem != null)
+ postActionEvent (((List)awtComponent).getSelectedItem (),
+ me.getModifiers ());
+ }
}
if (e.getID () == KeyEvent.KEY_PRESSED)