# HG changeset patch
# User jhar
# Date 1022024860 0
# Node ID f915ad7befaf802b450912c3c4d3900c7c4515f7
# Parent  503b6a57cf475e3ed72214c27522a41993683403
[xemacs-hg @ 2002-05-21 23:47:38 by jhar]
Fix printer page setup to work on Win95

diff -r 503b6a57cf47 -r f915ad7befaf src/ChangeLog
--- a/src/ChangeLog	Tue May 21 10:29:15 2002 +0000
+++ b/src/ChangeLog	Tue May 21 23:47:40 2002 +0000
@@ -1,3 +1,8 @@
+2002-05-21  Jonathan Harris  <jonathan@xemacs.org>
+
+	* device-msw.c (mswindows_handle_page_setup_dialog_box):
+	Fix detection of metric units to work on Win95
+
 2002-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* eldap.c (print_ldap): swap arguments of write_c_string.
diff -r 503b6a57cf47 -r f915ad7befaf src/device-msw.c
--- a/src/device-msw.c	Tue May 21 10:29:15 2002 +0000
+++ b/src/device-msw.c	Tue May 21 23:47:40 2002 +0000
@@ -871,11 +871,12 @@
   {
     Lisp_Devmode *ldm = decode_devmode (device);
     PAGESETUPDLGW pd;
-    DWORD data;
+    TCHAR measure[2*MAX_XETCHAR_SIZE];
+    int data;
 
-    qxeGetLocaleInfo (LOCALE_USER_DEFAULT,
-		      LOCALE_IMEASURE | LOCALE_RETURN_NUMBER,
-		      (Extbyte *) &data, sizeof (data));
+    qxeGetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_IMEASURE,
+		      measure, sizeof (measure)/MAX_XETCHAR_SIZE);
+    data = qxestrcmp (measure, XETEXT ("0"));
 
     memset (&pd, 0, sizeof (pd));
     pd.lStructSize = sizeof (pd);