From: Doug Coleman <doug.coleman@gmail.com>
Date: Sat, 29 Aug 2009 22:08:25 +0000 (-0500)
Subject: SIZE struct
X-Git-Tag: 0.97~5635^2~11^2~19
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=3ecb3a85db9bf15b21b56c61e220004257b04bbc

SIZE struct
---

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>