Changeset 1050 for trunk/src/user32/win32wbase.cpp

Timestamp:

Sep 25, 1999, 6:49:30 PM (26 years ago)

Author:

cbratschi

Message:

MsgButton() -> double click handling changed

File:

• trunk/src/user32/win32wbase.cpp (modified) (7 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.12 1999-09-25 15:10:00 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.13 1999-09-25 16:49:30 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -393 +393 @@
 
 //CB: dwOSFrameStyle handled by OSLibWinConvertStyle
-//    todo: subclass frame WM_PAINT -> call DrawEdge() if HAS_3DFRAME
+//    todo: subclass frame WM_PAINT -> call DrawEdge() if HAS_3DFRAME (code below)
 //          OSLibWinCreateWindow: perhaps problems
 //    shouldn't we always use a frame? -> no problems with scrollbars
@@ -480 +480 @@
                      SWP_NOACTIVATE);
   }
+  //Subclass frame
+  if (dwStyle & WS_CHILD && HAS_3DFRAME(dwExStyle))
+  {
+    //CB: use a win32 window procedure and call DrawEdge() or
+    //    emulate DrawEdge() in a OS/2 procedure
+  }
+
   //Get the client window rectangle
   GetClientRect(Win32Hwnd, &rectClient);
@@ -1018 +1025 @@
                 break;
         case BUTTON_LEFTDBLCLICK:
-                win32msg = WM_LBUTTONDBLCLK;
-                win32ncmsg = WM_NCLBUTTONDBLCLK;
+                if (windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS)
+                {
+                  win32msg = WM_LBUTTONDBLCLK;
+                  win32ncmsg = WM_NCLBUTTONDBLCLK;
+                } else
+                {
+                  MsgButton(BUTTON_LEFTDOWN,ncx,ncy,clx,cly);
+                  return MsgButton(BUTTON_LEFTUP,ncx,ncy,clx,cly);
+                }
                 break;
         case BUTTON_RIGHTUP:
@@ -1030 +1044 @@
                 break;
         case BUTTON_RIGHTDBLCLICK:
-                win32msg = WM_RBUTTONDBLCLK;
-                win32ncmsg = WM_NCRBUTTONDBLCLK;
+                if (windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS)
+                {
+                  win32msg = WM_RBUTTONDBLCLK;
+                  win32ncmsg = WM_NCRBUTTONDBLCLK;
+                } else
+                {
+                  MsgButton(BUTTON_RIGHTDOWN,ncx,ncy,clx,cly);
+                  return MsgButton(BUTTON_RIGHTUP,ncx,ncy,clx,cly);
+                }
                 break;
         case BUTTON_MIDDLEUP:
@@ -1042 +1063 @@
                 break;
         case BUTTON_MIDDLEDBLCLICK:
-                win32msg = WM_MBUTTONDBLCLK;
-                win32ncmsg = WM_NCMBUTTONDBLCLK;
+                if (windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS)
+                {
+                  win32msg = WM_MBUTTONDBLCLK;
+                  win32ncmsg = WM_NCMBUTTONDBLCLK;
+                } else
+                {
+                  MsgButton(BUTTON_MIDDLEDOWN,ncx,ncy,clx,cly);
+                  return MsgButton(BUTTON_MIDDLEUP,ncx,ncy,clx,cly);
+                }
                 break;
         default:
@@ -1049 +1077 @@
                 return 1;
     }
-    if(win32msg == WM_MBUTTONDBLCLK || win32msg == WM_RBUTTONDBLCLK || win32msg == WM_LBUTTONDBLCLK) {
-        if(!(windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS)) {
-            return 1;
-        }
-    }
+
     SendInternalMessageA(WM_SETCURSOR, Win32Hwnd, MAKELONG(lastHitTestVal, win32ncmsg));