comparison src/frame-msw.c @ 4982:3c3c1d139863

Automatic merge
author Ben Wing <ben@xemacs.org>
date Fri, 05 Feb 2010 11:25:00 -0600
parents 4aebb0131297 16112448d484
children ae48681c47fa
comparison
equal deleted inserted replaced
4981:4aebb0131297 4982:3c3c1d139863
363 mswindows_unregister_popup_frame (wrap_frame (f)); 363 mswindows_unregister_popup_frame (wrap_frame (f));
364 #endif 364 #endif
365 ReleaseDC (FRAME_MSWINDOWS_HANDLE (f), FRAME_MSWINDOWS_DC (f)); 365 ReleaseDC (FRAME_MSWINDOWS_HANDLE (f), FRAME_MSWINDOWS_DC (f));
366 DestroyWindow (FRAME_MSWINDOWS_HANDLE (f)); 366 DestroyWindow (FRAME_MSWINDOWS_HANDLE (f));
367 #ifndef NEW_GC 367 #ifndef NEW_GC
368 xfree (f->frame_data, void *); 368 xfree (f->frame_data);
369 #endif /* not NEW_GC */ 369 #endif /* not NEW_GC */
370 } 370 }
371 f->frame_data = 0; 371 f->frame_data = 0;
372 } 372 }
373 373
1032 HDC hdc = DEVICE_MSPRINTER_HDC (XDEVICE (FRAME_DEVICE (f))); 1032 HDC hdc = DEVICE_MSPRINTER_HDC (XDEVICE (FRAME_DEVICE (f)));
1033 if (FRAME_MSPRINTER_PAGE_STARTED (f)) 1033 if (FRAME_MSPRINTER_PAGE_STARTED (f))
1034 EndPage (hdc); 1034 EndPage (hdc);
1035 if (FRAME_MSPRINTER_JOB_STARTED (f)) 1035 if (FRAME_MSPRINTER_JOB_STARTED (f))
1036 EndDoc (hdc); 1036 EndDoc (hdc);
1037 xfree (f->frame_data, void *); 1037 xfree (f->frame_data);
1038 } 1038 }
1039 1039
1040 f->frame_data = 0; 1040 f->frame_data = 0;
1041 } 1041 }
1042 1042