Mercurial > hg > xemacs-beta

diff src/frame-msw.c @ 5921:68639fb08af8 cygwin

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
no obvious 64 vs. 32 pblms in compilation, but still crashing in event-msw
author Henry Thompson <ht@markup.co.uk>
date Wed, 23 Apr 2014 22:22:37 +0100
parents 0f2338afbabf
children 08cfc8f77fb6
line wrap: on
line diff
--- a/src/frame-msw.c	Mon Apr 21 11:42:50 2014 +0100
+++ b/src/frame-msw.c	Wed Apr 23 22:22:37 2014 +0100
@@ -271,7 +271,7 @@
 			   
   FRAME_MSWINDOWS_HANDLE (f) = hwnd;
 
-  qxeSetWindowLong (hwnd, XWL_FRAMEOBJ, (LONG)STORE_LISP_IN_VOID (frame_obj));
+  qxeSetWindowLong (hwnd, XWL_FRAMEOBJ, (intptr_t)STORE_LISP_IN_VOID (frame_obj));
   FRAME_MSWINDOWS_DC (f) = GetDC (hwnd);
   SetTextAlign (FRAME_MSWINDOWS_DC (f), TA_BASELINE | TA_LEFT | TA_NOUPDATECP);
 
@@ -551,7 +551,7 @@
 
   /* Yippie! */
   ScreenToClient (hwnd, &pt);
-  *frame = GET_LISP_FROM_VOID ((void *) qxeGetWindowLong (hwnd, XWL_FRAMEOBJ));
+  *frame = GET_LISP_FROM_VOID ((void *) qxeGetWindowLongPtr (hwnd, XWL_FRAMEOBJ));
   *x = pt.x;
   *y = pt.y;
   return 1;
@@ -819,7 +819,7 @@
   if (hwnd)
     {
       Lisp_Object parent;
-      parent = GET_LISP_FROM_VOID ((void *) qxeGetWindowLong (hwnd, XWL_FRAMEOBJ));
+      parent = GET_LISP_FROM_VOID ((void *) qxeGetWindowLongPtr (hwnd, XWL_FRAMEOBJ));
       assert (FRAME_MSWINDOWS_P (XFRAME (parent)));
       return parent;
     }