Mercurial > hg > xemacs-beta
comparison src/frame-x.c @ 1726:a8d8f419b459
[xemacs-hg @ 2003-09-30 15:26:34 by james]
Add type information to xfree to avoid alias creation.
author | james |
---|---|
date | Tue, 30 Sep 2003 15:27:01 +0000 |
parents | 01c57eb70ae9 |
children | 18d2b8dabcf7 |
comparison
equal
deleted
inserted
replaced
1725:7ff8f4d70aec | 1726:a8d8f419b459 |
---|---|
1004 XtFree(dragData->data.files[i]); | 1004 XtFree(dragData->data.files[i]); |
1005 } | 1005 } |
1006 } | 1006 } |
1007 | 1007 |
1008 /* free the data string */ | 1008 /* free the data string */ |
1009 xfree (clientData); | 1009 xfree (clientData, XtPointer); |
1010 | 1010 |
1011 CurrentDragWidget = NULL; | 1011 CurrentDragWidget = NULL; |
1012 } | 1012 } |
1013 | 1013 |
1014 static void | 1014 static void |
1162 while (!NILP (item)) | 1162 while (!NILP (item)) |
1163 { | 1163 { |
1164 if (!STRINGP (XCAR (item))) | 1164 if (!STRINGP (XCAR (item))) |
1165 { | 1165 { |
1166 numItems=0; | 1166 numItems=0; |
1167 xfree(Ctext); | 1167 xfree(Ctext, char *); |
1168 Ctext=NULL; | 1168 Ctext=NULL; |
1169 break; | 1169 break; |
1170 } | 1170 } |
1171 strcpy (Ctext+pos, (const char *)XSTRING_DATA (XCAR (item))); | 1171 strcpy (Ctext+pos, (const char *)XSTRING_DATA (XCAR (item))); |
1172 pos += XSTRING_LENGTH (XCAR (item)) + 1; | 1172 pos += XSTRING_LENGTH (XCAR (item)) + 1; |
1240 hurl = dnd_url_hexify_string ((char *)filePath, "file:"); | 1240 hurl = dnd_url_hexify_string ((char *)filePath, "file:"); |
1241 /* #### Mule-izing required */ | 1241 /* #### Mule-izing required */ |
1242 l_data = Fcons (make_string ((Ibyte* )hurl, | 1242 l_data = Fcons (make_string ((Ibyte* )hurl, |
1243 strlen (hurl)), | 1243 strlen (hurl)), |
1244 l_data); | 1244 l_data); |
1245 xfree (hurl); | 1245 xfree (hurl, char *); |
1246 } | 1246 } |
1247 } | 1247 } |
1248 else if (transferInfo->dropData->protocol == DtDND_BUFFER_TRANSFER) | 1248 else if (transferInfo->dropData->protocol == DtDND_BUFFER_TRANSFER) |
1249 { | 1249 { |
1250 int speccount = specpdl_depth(); | 1250 int speccount = specpdl_depth(); |
1337 *dnd_data = 0; | 1337 *dnd_data = 0; |
1338 while (!NILP (run)) | 1338 while (!NILP (run)) |
1339 { | 1339 { |
1340 if (!STRINGP (XCAR (run))) | 1340 if (!STRINGP (XCAR (run))) |
1341 { | 1341 { |
1342 xfree (dnd_data); | 1342 xfree (dnd_data, char *); |
1343 return Qnil; | 1343 return Qnil; |
1344 } | 1344 } |
1345 len = XSTRING_LENGTH (XCAR (run)) + 1; | 1345 len = XSTRING_LENGTH (XCAR (run)) + 1; |
1346 dnd_data = (char *) xrealloc (dnd_data, dnd_len + len); | 1346 dnd_data = (char *) xrealloc (dnd_data, dnd_len + len); |
1347 strcpy (dnd_data + dnd_len - 1, (const char *)XSTRING_DATA (XCAR (run))); | 1347 strcpy (dnd_data + dnd_len - 1, (const char *)XSTRING_DATA (XCAR (run))); |
1401 x_event.xbutton.button = EVENT_BUTTON_BUTTON (lisp_event); | 1401 x_event.xbutton.button = EVENT_BUTTON_BUTTON (lisp_event); |
1402 x_event.xkey.same_screen = True; | 1402 x_event.xkey.same_screen = True; |
1403 | 1403 |
1404 DndSetData(dnd_typ, (unsigned char *)dnd_data, dnd_len); | 1404 DndSetData(dnd_typ, (unsigned char *)dnd_data, dnd_len); |
1405 if (dnd_dealloc) | 1405 if (dnd_dealloc) |
1406 xfree (dnd_data); | 1406 xfree (dnd_data, char *); |
1407 | 1407 |
1408 /* the next thing blocks everything... */ | 1408 /* the next thing blocks everything... */ |
1409 if (DndHandleDragging(wid, &x_event)) | 1409 if (DndHandleDragging(wid, &x_event)) |
1410 return Qt; | 1410 return Qt; |
1411 } | 1411 } |
2675 | 2675 |
2676 FRAME_X_SHELL_WIDGET (f) = 0; | 2676 FRAME_X_SHELL_WIDGET (f) = 0; |
2677 | 2677 |
2678 if (FRAME_X_GEOM_FREE_ME_PLEASE (f)) | 2678 if (FRAME_X_GEOM_FREE_ME_PLEASE (f)) |
2679 { | 2679 { |
2680 xfree (FRAME_X_GEOM_FREE_ME_PLEASE (f)); | 2680 xfree (FRAME_X_GEOM_FREE_ME_PLEASE (f), char *); |
2681 FRAME_X_GEOM_FREE_ME_PLEASE (f) = 0; | 2681 FRAME_X_GEOM_FREE_ME_PLEASE (f) = 0; |
2682 } | 2682 } |
2683 | 2683 |
2684 if (f->frame_data) | 2684 if (f->frame_data) |
2685 { | 2685 { |
2686 xfree (f->frame_data); | 2686 xfree (f->frame_data, void *); |
2687 f->frame_data = 0; | 2687 f->frame_data = 0; |
2688 } | 2688 } |
2689 } | 2689 } |
2690 | 2690 |
2691 static void | 2691 static void |