Changeset 181 for trunk/src/plugins/org.eclipse.swt

Timestamp:

Aug 21, 2009, 5:55:37 PM (16 years ago)

Author:

lpino

Message:

• More mouse control implementation and fixes

File:

• trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Control.java (modified) (5 diffs)

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Control.java

@@ -2949 +2949 @@
 //        case OS.WM_BUTTON2DBLCLK: result = WM_BUTTON2DBLCLK (mp1, mp2); break;
         case OS.WM_BUTTON1DOWN: result = WM_BUTTON1DOWN (mp1, mp2); break;
-//        case OS.WM_BUTTON1UP: result = WM_BUTTON1UP (mp1, mp2); break;
+        case OS.WM_BUTTON1UP: result = WM_BUTTON1UP (mp1, mp2); break;
 //        case OS.WM_BUTTON1CLICK: result = WM_BUTTON1CLICK (mp1, mp2); break;
         case OS.WM_CALCVALIDRECTS: result = WM_CALCVALIDRECTS (mp1, mp2); break;
@@ -3341 +3341 @@
       * fix is to send a mouse down event.
       */
-//      sendMouseEvent (SWT.MouseDown, 1, OS.WM_LBUTTONDOWN, wParam, lParam);
       sendMouseEvent (SWT.MouseDoubleClick, 1, OS.WM_BUTTON1DBLCLK, mp1, mp2);
       int result = callWindowProc (OS.WM_BUTTON1DBLCLK, mp1, mp2);
@@ -3368 +3367 @@
 //      }
       sendMouseEvent (SWT.MouseDown, 1, OS.WM_BUTTON1DOWN, mp1, mp2);
-//      int result = callWindowProc (OS.WM_BUTTON1DOWN, mp1, mp2);
-      int result = 0;
+      int result = callWindowProc (OS.WM_BUTTON1DOWN, mp1, mp2);
+//      int result = 0;
       if (mouseDown) {
           int hwnd = OS.WinQueryCapture (OS.HWND_DESKTOP);
@@ -3381 +3380 @@
                   System.out.println("Control::WM_BUTTON1DOWN");
               }
-//              OS.WinSetActiveWindow (OS.HWND_DESKTOP, handle);
+              OS.WinSetActiveWindow (OS.HWND_DESKTOP, handle);
       }
 //      if (dragging) {
@@ -3415 +3414 @@
 }
 
-//LRESULT WM_LBUTTONUP (int wParam, int lParam) {
-//      sendMouseEvent (SWT.MouseUp, 1, OS.WM_LBUTTONUP, wParam, lParam);
-//      int result = callWindowProc (OS.WM_LBUTTONUP, wParam, lParam);
+MRESULT WM_BUTTON1UP (int mp1, int mp2) {
+      sendMouseEvent (SWT.MouseUp, 1, OS.WM_BUTTON1UP, mp1, mp2);
+      int result = callWindowProc (OS.WM_BUTTON1UP, mp1, mp2);
 //      if ((wParam & (OS.MK_LBUTTON | OS.MK_MBUTTON | OS.MK_RBUTTON)) == 0) {
-//              if (OS.WinQueryCapture () == handle) OS.ReleaseCapture ();
+              if (OS.WinQueryCapture (OS.HWND_DESKTOP) == handle) OS.WinSetCapture (OS.HWND_DESKTOP, OS.NULLHANDLE);
 //      }
-//      return new LRESULT (result);
-//}
-//
+      return new MRESULT (result);
+}
+
 //LRESULT WM_MBUTTONDBLCLK (int wParam, int lParam) {
 //      /*