From 3ecb3a85db9bf15b21b56c61e220004257b04bbc Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sat, 29 Aug 2009 17:08:25 -0500
Subject: [PATCH] SIZE struct

---
 basis/windows/types/types.factor         | 6 +++---
 basis/windows/uniscribe/uniscribe.factor | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/basis/windows/types/types.factor b/basis/windows/types/types.factor
index c62de58bcd..fb3ba7f0f5 100755
--- a/basis/windows/types/types.factor
+++ b/basis/windows/types/types.factor
@@ -287,9 +287,9 @@ C-STRUCT: POINT
     { "LONG" "x" }
     { "LONG" "y" } ; 
 
-C-STRUCT: SIZE
-    { "LONG" "cx" }
-    { "LONG" "cy" } ; 
+STRUCT: SIZE
+    { cx LONG }
+    { cy LONG } ;
 
 C-STRUCT: MSG
     { "HWND" "hWnd" }
diff --git a/basis/windows/uniscribe/uniscribe.factor b/basis/windows/uniscribe/uniscribe.factor
index 7dd630ca5b..1c1830fa02 100755
--- a/basis/windows/uniscribe/uniscribe.factor
+++ b/basis/windows/uniscribe/uniscribe.factor
@@ -82,7 +82,7 @@ TUPLE: script-string < disposable font string metrics ssa size image ;
 : script-string-size ( script-string -- dim )
     ssa>> ScriptString_pSize
     dup win32-error=0/f
-    [ SIZE-cx ] [ SIZE-cy ] bi 2array ;
+    [ cx>> ] [ cy>> ] bi 2array ;
 
 : dc-metrics ( dc -- metrics )
     TEXTMETRICW <struct>
-- 
2.34.1