From f3ab8a877f12db1aebd023255ed3bfe4bd30f634 Mon Sep 17 00:00:00 2001 From: cxl Date: Sat, 4 Jul 2009 19:02:35 +0000 Subject: [PATCH] Developint newdraw git-svn-id: svn://ultimatepp.org/upp/trunk@1357 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- newdraw/Draw/Draw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newdraw/Draw/Draw.h b/newdraw/Draw/Draw.h index 76ebbebb8..9f155aac6 100644 --- a/newdraw/Draw/Draw.h +++ b/newdraw/Draw/Draw.h @@ -207,7 +207,7 @@ public: width == f.width && height == f.height; } bool operator!=(Font f) const { return !operator==(f); } - dword GetHashValue() const { return MAKELONG(flags, width) ^ MAKELONG(face, height); } + dword GetHashValue() const { return CombineHash(width, flags, height, face); } bool IsNull() const { return face == 0xffff; } Font() { height = width = 0; face = flags = 0; }