reactos/lib/user32/windows
diff -u -r1.126 -r1.127
--- defwnd.c 29 Mar 2004 19:50:21 -0000 1.126
+++ defwnd.c 31 Mar 2004 14:12:04 -0000 1.127
@@ -1,4 +1,4 @@
-/* $Id: defwnd.c,v 1.126 2004/03/29 19:50:21 weiden Exp $
+/* $Id: defwnd.c,v 1.127 2004/03/31 14:12:04 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll
@@ -49,41 +49,39 @@
static COLORREF SysColors[] =
-{
- RGB(212, 208, 200), /* COLOR_SCROLLBAR */
- RGB(58, 110, 165), /* COLOR_BACKGROUND */
- RGB(10, 36, 106), /* COLOR_ACTIVECAPTION */
- RGB(128, 128, 128), /* COLOR_INACTIVECAPTION */
- RGB(212, 208, 200), /* COLOR_MENU */
- RGB(255, 255, 255), /* COLOR_WINDOW */
- RGB(0, 0, 0), /* COLOR_WINDOWFRAME */
- RGB(0, 0, 0), /* COLOR_MENUTEXT */
- RGB(0, 0, 0), /* COLOR_WINDOWTEXT */
- RGB(255, 255, 255), /* COLOR_CAPTIONTEXT */
- RGB(212, 208, 200), /* COLOR_ACTIVEBORDER */
- RGB(212, 208, 200), /* COLOR_INACTIVEBORDER */
- RGB(128, 128, 128), /* COLOR_APPWORKSPACE */
- RGB(10, 36, 106), /* COLOR_HIGHLIGHT */
- RGB(255, 255, 255), /* COLOR_HIGHLIGHTTEXT */
- RGB(212, 208, 200), /* COLOR_BTNFACE */
- RGB(128, 128, 128), /* COLOR_BTNSHADOW */
- RGB(128, 128, 128), /* COLOR_GRAYTEXT */
- RGB(0, 0, 0), /* COLOR_BTNTEXT */
- RGB(212, 208, 200), /* COLOR_INACTIVECAPTIONTEXT */
- RGB(255, 255, 255), /* COLOR_BTNHIGHLIGHT */
- RGB(64, 64, 64), /* COLOR_3DDKSHADOW */
- RGB(212, 208, 200), /* COLOR_3DLIGHT */
- RGB(0, 0, 0), /* COLOR_INFOTEXT */
- RGB(255, 255, 225), /* COLOR_INFOBK */
- RGB(181, 181, 181), /* COLOR_UNKNOWN */
- RGB(0, 0, 128), /* COLOR_HOTLIGHT */
- RGB(166, 202, 240), /* COLOR_GRADIENTACTIVECAPTION */
- RGB(192, 192, 192), /* COLOR_GRADIENTINACTIVECAPTION */
- RGB(49, 106, 197), /* COLOR_MENUHILIGHT */
- RGB(236, 233, 216) /* COLOR_MENUBAR */
-};
+ {
+ RGB(192, 192, 192) /* COLOR_SCROLLBAR */,
+ RGB(58, 110, 165) /* COLOR_BACKGROUND */,
+ RGB(10, 36, 106) /* COLOR_ACTIVECAPTION */,
+ RGB(128, 128, 128) /* COLOR_INACTIVECAPTION */,
+ RGB(192, 192, 192) /* COLOR_MENU */,
+ RGB(255, 255, 255) /* COLOR_WINDOW */,
+ RGB(0, 0, 0) /* COLOR_WINDOWFRAME */,
+ RGB(0, 0, 0) /* COLOR_MENUTEXT */,
+ RGB(0, 0, 0) /* COLOR_WINDOWTEXT */,
+ RGB(255, 255, 255) /* COLOR_CAPTIONTEXT */,
+ RGB(192, 192, 192) /* COLOR_ACTIVEBORDER */,
+ RGB(192, 192, 192) /* COLOR_INACTIVEBORDER */,
+ RGB(128, 128, 128) /* COLOR_APPWORKSPACE */,
+ RGB(0, 0, 128) /* COLOR_HILIGHT */,
+ RGB(255, 255, 255) /* COLOR_HILIGHTTEXT */,
+ RGB(192, 192, 192) /* COLOR_BTNFACE */,
+ RGB(128, 128, 128) /* COLOR_BTNSHADOW */,
+ RGB(128, 128, 128) /* COLOR_GRAYTEXT */,
+ RGB(0, 0, 0) /* COLOR_BTNTEXT */,
+ RGB(192, 192, 192) /* COLOR_INACTIVECAPTIONTEXT */,
+ RGB(255, 255, 255) /* COLOR_BTNHILIGHT */,
+ RGB(32, 32, 32) /* COLOR_3DDKSHADOW */,
+ RGB(192, 192, 192) /* COLOR_3DLIGHT */,
+ RGB(0, 0, 0) /* COLOR_INFOTEXT */,
+ RGB(255, 255, 192) /* COLOR_INFOBK */,
+ RGB(180, 180, 180) /* COLOR_ALTERNATEBTNFACE */,
+ RGB(0, 0, 255) /* COLOR_HOTLIGHT */,
+ RGB(166, 202, 240) /* COLOR_GRADIENTACTIVECAPTION */,
+ RGB(192, 192, 192) /* COLOR_GRADIENTINACTIVECAPTION */,
+ };
-#define NUM_SYSCOLORS 31
+#define NUM_SYSCOLORS (sizeof(SysColors) / sizeof(SysColors[0]))
/* Bits in the dwKeyData */
#define KEYDATA_ALT 0x2000
@@ -1564,3 +1562,4 @@
return User32DefWindowProc(hWnd, Msg, wParam, lParam, TRUE);
}
+