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

Timestamp:

Jun 7, 2000, 4:51:33 PM (25 years ago)

Author:

sandervl

Message:

Major rewrite: frame/client -> frame

File:

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

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.36 2000-06-01 11:27:56 sandervl Exp $ */
+/* $Id: button.cpp,v 1.37 2000-06-07 14:51:24 sandervl Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -176 +176 @@
 static LRESULT BUTTON_EraseBkgnd(HWND hwnd,WPARAM wParam,LPARAM lParam)
 {
-  //SvL: This is wrong: should be 
+  DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & 0x0f;
   //SvL: TODO: NT does something extra for ownerdrawn buttons; check this 
-//  if(style == BS_OWNERDRAW) {
-//        return DefWindowProcA(hwnd, WM_ERASEBKGND, wParam, lParam);
-//  }
-//  return 1;
-
-  //SvL: Erase background for groupboxes as the paint function only draws
-  //     a box
-  DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & 0x0f;
-//  if(style == BS_GROUPBOX) {
+  if(style == BS_OWNERDRAW) {
         return DefWindowProcA(hwnd, WM_ERASEBKGND, wParam, lParam);
-//  }
-//  return 1;
+  }
+  return 1;
 }
 
@@ -325 +317 @@
   DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & 0x0f;
 
-  //if (style == BS_GROUPBOX) return HTTRANSPARENT;
+  if (style == BS_GROUPBOX) return HTTRANSPARENT;
 
   return DefWindowProcA(hwnd,WM_NCHITTEST,wParam,lParam);
@@ -1205 +1197 @@
     wndClass.cbWndExtra    = sizeof(BUTTONINFO);
     wndClass.hCursor       = LoadCursorA(0,IDC_ARROWA);
-//    wndClass.hbrBackground = (HBRUSH)0;
     wndClass.hbrBackground = GetSysColorBrush(COLOR_BTNFACE);
     wndClass.lpszClassName = BUTTONCLASSNAME;