Changeset 1724 for trunk/src/user32/button.cpp

Timestamp:

Nov 13, 1999, 5:42:43 PM (26 years ago)

Author:

cbratschi

Message:

merged with wine-991031, fixed edit bugs

File:

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

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.16 1999-10-30 18:40:43 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.17 1999-11-13 16:42:40 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -7 +7 @@
  * Copyright (c) 1999 Christoph Bratschi
  *
- * WINE version: 990923
+ * WINE version: 991031
  */
 
@@ -201 +201 @@
 static LRESULT BUTTON_LButtonDown(HWND hwnd,WPARAM wParam,LPARAM lParam)
 {
+  BUTTONINFO* infoPtr = (BUTTONINFO*)GetInfoPtr(hwnd);
+
   SetCapture(hwnd);
   SetFocus(hwnd);
   SendMessageA(hwnd,BM_SETSTATE,TRUE,0);
+  infoPtr->state |= BUTTON_BTNPRESSED;
 
   return 0;
@@ -217 +220 @@
   pt.y = HIWORD(lParam);
 
+  if (!(infoPtr->state & BUTTON_BTNPRESSED)) return 0;
+  infoPtr->state &= BUTTON_NSTATES;
+  if (!(infoPtr->state & BUTTON_HIGHLIGHTED))
+  {
+    ReleaseCapture();
+    return 0;
+  }
+  SendMessageA(hwnd,BM_SETSTATE,FALSE,0);
   ReleaseCapture();
-  if (!(infoPtr->state & BUTTON_HIGHLIGHTED)) return 0;
-  SendMessageA(hwnd,BM_SETSTATE,FALSE,0);
   GetClientRect(hwnd,&rect);
   if (PtInRect(&rect,pt))
@@ -246 +255 @@
 }
 
+static LRESULT BUTTON_CaptureChanged(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  BUTTONINFO* infoPtr = (BUTTONINFO*)GetInfoPtr(hwnd);
+
+  if (infoPtr->state & BUTTON_BTNPRESSED)
+  {
+    infoPtr->state &= BUTTON_NSTATES;
+    if (infoPtr->state & BUTTON_HIGHLIGHTED)
+      SendMessageA( hwnd, BM_SETSTATE, FALSE, 0 );
+  }
+
+  return 0;
+}
+
 static LRESULT BUTTON_MouseMove(HWND hwnd,WPARAM wParam,LPARAM lParam)
 {
@@ -542 +565 @@
     case WM_LBUTTONUP:
       return BUTTON_LButtonUp(hwnd,wParam,lParam);
+
+    case WM_CAPTURECHANGED:
+      return BUTTON_CaptureChanged(hwnd,wParam,lParam);
 
     case WM_MOUSEMOVE:
@@ -1074 +1100 @@
 
     SetBkColor( hDC, GetSysColor( COLOR_BTNFACE ) );
-    FillRect( hDC,  &dis.rcItem, GetSysColorBrush( COLOR_BTNFACE ) );
 
     dprintf(("OWNERDRAW button %x, enabled %d", hwnd, !(dwStyle & WS_DISABLED)));