Added events for left and right mouse button double clicks

widget/public/nsGUIEvent.h

@@ -140,6 +140,8 @@ struct nsKeyEvent : public nsGUIEvent {
 #define NS_MOUSE_RIGHT_BUTTON_DOWN      (NS_MOUSE_MESSAGE_START + 21)
 #define NS_MOUSE_ENTER                  (NS_MOUSE_MESSAGE_START + 22)
 #define NS_MOUSE_EXIT                   (NS_MOUSE_MESSAGE_START + 23)
+#define NS_MOUSE_LEFT_DOUBLECLICK       (NS_MOUSE_MESSAGE_START + 24)
+#define NS_MOUSE_RIGHT_DOUBLECLICK      (NS_MOUSE_MESSAGE_START + 25)
 
 #define NS_SCROLLBAR_MESSAGE_START      1000
 #define NS_SCROLLBAR_POS                (NS_SCROLLBAR_MESSAGE_START)

widget/src/windows/nsWindow.cpp

@@ -396,30 +396,6 @@ void nsWindow::Create(nsNativeWindow aParent,
     nsGUIEvent event;
     InitEvent(event, NS_CREATE);
     DispatchEvent(&event);
-#if 0
-    if (mEventCallback) {
-        nsGUIEvent event;
-        event.widget = this;
-
-        DWORD pos = ::GetMessagePos();
-        POINT cpos;
-
-        cpos.x = LOWORD(pos);
-        cpos.y = HIWORD(pos);
-
-        ::ScreenToClient(mWnd, &cpos);
-
-        event.point.x = cpos.x;
-        event.point.y = cpos.y;
-
-        event.time = ::GetMessageTime();
-
-        // 
-        event.message = NS_CREATE;
-        (*mEventCallback)(&event);
-    }
-#endif
-
     SubclassWindow(TRUE);
 }
 
@@ -1038,7 +1014,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
             InitEvent(event, NS_MOVE);
             event.point.x = (int)LOWORD(lParam); // horizontal position in screen coordinates
             event.point.y = (int)HIWORD(lParam); // vertical position in screen coordinates
-            DispatchEvent(&event);
+            result = DispatchEvent(&event);
           }
           break;
 
@@ -1080,11 +1056,11 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
 
         // say we've dealt with erase background if widget does
         // not need auto-erasing
-        case WM_ERASEBKGND:   
+        case WM_ERASEBKGND: 
               if (! AutoErase()) {
               *aRetValue = 1;
               result = PR_TRUE;
-            }
+            } 
             break;
 
         case WM_MOUSEMOVE:
@@ -1101,6 +1077,8 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
 
         case WM_LBUTTONDBLCLK:
             result = DispatchMouseEvent(NS_MOUSE_LEFT_BUTTON_DOWN);
+            if (result == PR_FALSE)
+              result = DispatchMouseEvent(NS_MOUSE_LEFT_DOUBLECLICK);
             break;
 
         case WM_MBUTTONDOWN:
@@ -1112,11 +1090,11 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
             break;
 
         case WM_MBUTTONDBLCLK:
-            result = DispatchMouseEvent(NS_MOUSE_MIDDLE_BUTTON_DOWN);
+            result = DispatchMouseEvent(NS_MOUSE_MIDDLE_BUTTON_DOWN);           
             break;
 
         case WM_RBUTTONDOWN:
-            result = DispatchMouseEvent(NS_MOUSE_RIGHT_BUTTON_DOWN);
+            result = DispatchMouseEvent(NS_MOUSE_RIGHT_BUTTON_DOWN);            
             break;
 
         case WM_RBUTTONUP:
@@ -1125,6 +1103,8 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
 
         case WM_RBUTTONDBLCLK:
             result = DispatchMouseEvent(NS_MOUSE_RIGHT_BUTTON_DOWN);
+            if (result == PR_FALSE)
+              result = DispatchMouseEvent(NS_MOUSE_RIGHT_DOUBLECLICK);                      
             break;
 
         case WM_HSCROLL:

widget/tests/windows/winmain.cpp

@@ -705,6 +705,14 @@ nsEventStatus PR_CALLBACK HandleEvent(nsGUIEvent *aEvent)
             statusText->SetText(str);
             break;
 
+        case NS_MOUSE_LEFT_DOUBLECLICK:
+            statusText->SetText("Left button double click");
+            break;
+
+        case NS_MOUSE_RIGHT_DOUBLECLICK:
+            statusText->SetText("Right button double click");
+            break;
+
         case NS_MOUSE_ENTER:
             if (DEBUG_MOUSE) printf("NS_MOUSE_ENTER 0x%X\n", aEvent->widget);
             break;