--- a/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java	Thu Jul 09 15:18:50 2009 -0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java	Thu Jul 09 15:23:22 2009 -0400
@@ -1000,10 +1000,7 @@
         int buttonState = 0;
         final int buttonsNumber = ((SunToolkit)(Toolkit.getDefaultToolkit())).getNumberOfButtons();
         for (int i = 0; i<buttonsNumber; i++){
-            // A bug in WM implementation: extra buttons doesn't have state!=0 as they should on Release message.
-            if ((i != 4) && (i != 5)){
-                buttonState |= (xbe.get_state() & XConstants.buttonsMask[i]);
-            }
+            buttonState |= (xbe.get_state() & XConstants.buttonsMask[i]);
         }
         switch (xev.get_type()) {
         case XConstants.ButtonPress: