Fix smoketest blocker bug 70683 by making some changes blake missed with his fix for bug 60703. r=mao sr=alecf a=kysmith

layout/forms/nsFileControlFrame.cpp

@@ -253,7 +253,7 @@ nsFileControlFrame::MouseClick(nsIDOMEvent* aMouseEvent)
   if (mouseEvent) {
     PRUint16 whichButton;
     if (NS_SUCCEEDED(mouseEvent->GetButton(&whichButton))) {
-      if (whichButton != 1) {
+      if (whichButton != 0) {
         return NS_OK;
       }
     }

layout/forms/nsListControlFrame.cpp

@@ -3051,7 +3051,7 @@ nsListControlFrame::IsLeftButton(nsIDOMEvent* aMouseEvent)
   if (mouseEvent) {
     PRUint16 whichButton;
     if (NS_SUCCEEDED(mouseEvent->GetButton(&whichButton))) {
-      return whichButton != 1?PR_FALSE:PR_TRUE;
+      return whichButton != 0?PR_FALSE:PR_TRUE;
     }
   }
   return PR_FALSE;

layout/html/forms/src/nsFileControlFrame.cpp

@@ -253,7 +253,7 @@ nsFileControlFrame::MouseClick(nsIDOMEvent* aMouseEvent)
   if (mouseEvent) {
     PRUint16 whichButton;
     if (NS_SUCCEEDED(mouseEvent->GetButton(&whichButton))) {
-      if (whichButton != 1) {
+      if (whichButton != 0) {
         return NS_OK;
       }
     }

layout/html/forms/src/nsGfxListControlFrame.cpp

@@ -3016,7 +3016,7 @@ nsGfxListControlFrame::IsLeftButton(nsIDOMEvent* aMouseEvent)
   if (mouseEvent) {
     PRUint16 whichButton;
     if (NS_SUCCEEDED(mouseEvent->GetButton(&whichButton))) {
-      return whichButton != 1?PR_FALSE:PR_TRUE;
+      return whichButton != 0?PR_FALSE:PR_TRUE;
     }
   }
   return PR_FALSE;

layout/html/forms/src/nsGfxTextControlFrame.cpp

@@ -4271,10 +4271,10 @@ nsEnderEventListener::MouseDown(nsIDOMEvent* aEvent)
     PRInt32 eventType;
     switch(button)
     {
-      case 1: //XXX: I can't believe there isn't a symbol for this!
+      case 0: //XXX: I can't believe there isn't a symbol for this!
         eventType = NS_MOUSE_LEFT_BUTTON_DOWN;
         break;
-      case 2: //XXX: I can't believe there isn't a symbol for this!
+      case 1: //XXX: I can't believe there isn't a symbol for this!
         eventType = NS_MOUSE_MIDDLE_BUTTON_DOWN;
         // XXX See bug 23336: the ender event listener is superfluous,
         // causing double mouse click events to get through.
@@ -4282,7 +4282,7 @@ nsEnderEventListener::MouseDown(nsIDOMEvent* aEvent)
         // Arguably, the whole event listener should be disabled,
         // or at least rewritten; we'll look into that post-M14.
         return NS_OK;
-      case 3: //XXX: I can't believe there isn't a symbol for this!
+      case 2: //XXX: I can't believe there isn't a symbol for this!
         // XXX See bug 27827 -- we need to disable right clicks
         // just like we disabled middle clicks.
         eventType = NS_MOUSE_RIGHT_BUTTON_DOWN;
@@ -4315,13 +4315,13 @@ nsEnderEventListener::MouseUp(nsIDOMEvent* aEvent)
     PRInt32 eventType;
     switch(button)
     {
-      case 1:
+      case 0:
         eventType = NS_MOUSE_LEFT_BUTTON_UP;
         break;
-      case 2:
+      case 1:
         eventType = NS_MOUSE_MIDDLE_BUTTON_UP;
         break;
-      case 3:
+      case 2:
         eventType = NS_MOUSE_RIGHT_BUTTON_UP;
         break;
       default:
@@ -4352,13 +4352,13 @@ nsEnderEventListener::MouseClick(nsIDOMEvent* aEvent)
     PRInt32 eventType;
     switch(button)
     {
-      case 1:
+      case 0:
         eventType = NS_MOUSE_LEFT_CLICK;
         break;
-      case 2:
+      case 1:
         eventType = NS_MOUSE_MIDDLE_CLICK;
         break;
-      case 3:
+      case 2:
         eventType = NS_MOUSE_RIGHT_CLICK;
         break;
       default:
@@ -4389,13 +4389,13 @@ nsEnderEventListener::MouseDblClick(nsIDOMEvent* aEvent)
     PRInt32 eventType;
     switch(button)
     {
-      case 1:
+      case 0:
         eventType = NS_MOUSE_LEFT_DOUBLECLICK;
         break;
-      case 2:
+      case 1:
         eventType = NS_MOUSE_MIDDLE_DOUBLECLICK;
         break;
-      case 3:
+      case 2:
         eventType = NS_MOUSE_RIGHT_DOUBLECLICK;
         break;
       default:

layout/html/forms/src/nsListControlFrame.cpp

@@ -3051,7 +3051,7 @@ nsListControlFrame::IsLeftButton(nsIDOMEvent* aMouseEvent)
   if (mouseEvent) {
     PRUint16 whichButton;
     if (NS_SUCCEEDED(mouseEvent->GetButton(&whichButton))) {
-      return whichButton != 1?PR_FALSE:PR_TRUE;
+      return whichButton != 0?PR_FALSE:PR_TRUE;
     }
   }
   return PR_FALSE;