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

Timestamp:

Dec 26, 1999, 6:30:20 PM (26 years ago)

Author:

cbratschi

Message:

non-client fixes, DefWndProc enhancements, several other bugs fixed

File:

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

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.24 1999-12-21 17:03:42 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.25 1999-12-26 17:30:14 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -219 +219 @@
   BUTTONINFO* infoPtr = (BUTTONINFO*)GetInfoPtr(hwnd);
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
-
+  DWORD style = dwStyle & 0x0F;
+
+  if (style == BS_GROUPBOX) return 0;
   SetCapture(hwnd);
   SetFocus(hwnd);
@@ -234 +236 @@
   BUTTONINFO* infoPtr = (BUTTONINFO*)GetInfoPtr(hwnd);
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+  DWORD style = dwStyle & 0x0F;
   RECT rect;
   POINT pt;
 
+  if (style == BS_GROUPBOX) return 0;
   pt.x = LOWORD(lParam);
   pt.y = HIWORD(lParam);
@@ -460 +464 @@
 static LRESULT BUTTON_SetStyle(HWND hwnd,WPARAM wParam,LPARAM lParam)
 {
-  DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+  DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE),newStyle;
 
   if ((wParam & 0x0f) >= MAX_BTN_TYPE) return 0;
-  dwStyle = (dwStyle & 0xfffffff0) | (wParam & 0x0000000f);
-  SetWindowLongA(hwnd,GWL_STYLE,dwStyle);
-  PAINT_BUTTON(hwnd,dwStyle & 0x0f,ODA_DRAWENTIRE);
+  newStyle = (dwStyle & 0xfffffff0) | (wParam & 0x0000000f);
+
+  if (newStyle != dwStyle)
+  {
+    SetWindowLongA(hwnd,GWL_STYLE,newStyle);
+    PAINT_BUTTON(hwnd,newStyle & 0x0f,ODA_DRAWENTIRE);
+  }
 
   return 0;
@@ -542 +550 @@
 {
   BUTTONINFO* infoPtr = (BUTTONINFO*)GetInfoPtr(hwnd);
-  DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & 0x0f;
+  DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & 0x0F;
 
   if (wParam)