Mercurial > hg > xemacs-beta

comparison src/scrollbar-msw.c @ 5027:22179cd0fe15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Wed, 10 Feb 2010 07:25:19 -0600
parents ae48681c47fa
children 1fae11d56ad2
comparison
equal deleted inserted replaced
5026:46cf825f6158 5027:22179cd0fe15
82 &SCROLLBAR_MSW_INFO (sb)); 82 &SCROLLBAR_MSW_INFO (sb));
83 ptr = make_opaque_ptr (SCROLLBAR_MSW_HANDLE (sb)); 83 ptr = make_opaque_ptr (SCROLLBAR_MSW_HANDLE (sb));
84 Fputhash (ptr, wrap_scrollbar_instance (sb), 84 Fputhash (ptr, wrap_scrollbar_instance (sb),
85 Vmswindows_scrollbar_instance_table); 85 Vmswindows_scrollbar_instance_table);
86 qxeSetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_USERDATA, 86 qxeSetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_USERDATA,
87 (LONG) LISP_TO_VOID (ptr)); 87 (LONG) STORE_LISP_IN_VOID (ptr));
88 } 88 }
89 89
90 static void 90 static void
91 mswindows_free_scrollbar_instance (struct scrollbar_instance *sb) 91 mswindows_free_scrollbar_instance (struct scrollbar_instance *sb)
92 { 92 {
94 { 94 {
95 void *opaque = 95 void *opaque =
96 (void *) qxeGetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_USERDATA); 96 (void *) qxeGetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_USERDATA);
97 Lisp_Object ptr; 97 Lisp_Object ptr;
98 98
99 ptr = VOID_TO_LISP (opaque); 99 ptr = GET_LISP_FROM_VOID (opaque);
100 assert (OPAQUE_PTRP (ptr)); 100 assert (OPAQUE_PTRP (ptr));
101 ptr = Fremhash (ptr, Vmswindows_scrollbar_instance_table); 101 ptr = Fremhash (ptr, Vmswindows_scrollbar_instance_table);
102 assert (!NILP (ptr)); 102 assert (!NILP (ptr));
103 DestroyWindow (SCROLLBAR_MSW_HANDLE (sb)); 103 DestroyWindow (SCROLLBAR_MSW_HANDLE (sb));
104 xfree (sb->scrollbar_data); 104 xfree (sb->scrollbar_data);
221 win = FRAME_SELECTED_WINDOW (f); 221 win = FRAME_SELECTED_WINDOW (f);
222 } 222 }
223 else 223 else
224 { 224 {
225 Lisp_Object ptr; 225 Lisp_Object ptr;
226 ptr = VOID_TO_LISP (v); 226 ptr = GET_LISP_FROM_VOID (v);
227 assert (OPAQUE_PTRP (ptr)); 227 assert (OPAQUE_PTRP (ptr));
228 ptr = Fgethash (ptr, Vmswindows_scrollbar_instance_table, Qnil); 228 ptr = Fgethash (ptr, Vmswindows_scrollbar_instance_table, Qnil);
229 sb = XSCROLLBAR_INSTANCE (ptr); 229 sb = XSCROLLBAR_INSTANCE (ptr);
230 /* #### we're still hitting an abort here with 0 as the second 230 /* #### we're still hitting an abort here with 0 as the second
231 parameter, although only occasionally. It seems that sometimes we 231 parameter, although only occasionally. It seems that sometimes we