Alexandre Julliard : clock: Use system colors instead of hardcoded RGB values.
Alexandre Julliard
julliard at winehq.org
Thu Dec 6 08:26:45 CST 2007
Module: wine
Branch: master
Commit: b966b451ff0e371198cbcbb1e1a5a58e3709eff5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b966b451ff0e371198cbcbb1e1a5a58e3709eff5
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Dec 6 12:06:31 2007 +0100
clock: Use system colors instead of hardcoded RGB values.
---
programs/clock/main.c | 2 +-
programs/clock/winclock.c | 15 +++++----------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/programs/clock/main.c b/programs/clock/main.c
index e1d2288..55a9676 100644
--- a/programs/clock/main.c
+++ b/programs/clock/main.c
@@ -309,7 +309,7 @@ static VOID CLOCK_Paint(HWND hWnd)
SetViewportOrgEx(dcMem, -ps.rcPaint.left, -ps.rcPaint.top, NULL);
/* Erase the background */
- FillRect(dcMem, &ps.rcPaint, GetStockObject(LTGRAY_BRUSH));
+ FillRect(dcMem, &ps.rcPaint, GetSysColorBrush(COLOR_3DFACE));
if(Globals.bAnalog)
AnalogClock(dcMem, Globals.MaxX, Globals.MaxY, Globals.bSeconds, Globals.bWithoutTitle);
diff --git a/programs/clock/winclock.c b/programs/clock/winclock.c
index eb31eb1..5b53457 100644
--- a/programs/clock/winclock.c
+++ b/programs/clock/winclock.c
@@ -32,16 +32,11 @@
#include "windows.h"
#include "winclock.h"
-#define Black RGB(0,0,0)
-#define Gray RGB(128,128,128)
-#define LtGray RGB(192,192,192)
-#define White RGB(255,255,255)
-
-static const COLORREF FaceColor = LtGray;
-static const COLORREF HandColor = White;
-static const COLORREF TickColor = White;
-static const COLORREF ShadowColor = Black;
-static const COLORREF BackgroundColor = LtGray;
+#define FaceColor (GetSysColor(COLOR_3DFACE))
+#define HandColor (GetSysColor(COLOR_3DHIGHLIGHT))
+#define TickColor (GetSysColor(COLOR_3DHIGHLIGHT))
+#define ShadowColor (GetSysColor(COLOR_3DDKSHADOW))
+#define BackgroundColor (GetSysColor(COLOR_3DFACE))
static const int SHADOW_DEPTH = 2;
More information about the wine-cvs
mailing list