Mercurial > hg > xemacs-beta
comparison src/frame-x.c @ 177:6075d714658b r20-3b15
Import from CVS: tag r20-3b15
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:51:16 +0200 |
parents | 2d532a89d707 |
children | 9ad43877534d |
comparison
equal
deleted
inserted
replaced
176:6866abce6aaf | 177:6075d714658b |
---|---|
363 !FRAME_X_TOP_LEVEL_FRAME_P (XFRAME (XCAR (rest))))) | 363 !FRAME_X_TOP_LEVEL_FRAME_P (XFRAME (XCAR (rest))))) |
364 rest = XCDR (rest); | 364 rest = XCDR (rest); |
365 if (NILP (rest)) | 365 if (NILP (rest)) |
366 return; | 366 return; |
367 f = XFRAME (XCAR (rest)); | 367 f = XFRAME (XCAR (rest)); |
368 | |
369 #ifndef HAVE_WINDOWMAKER | |
368 x_wm_maybe_store_wm_command (f); | 370 x_wm_maybe_store_wm_command (f); |
371 #endif /* HAVE_WINDOWMAKER */ | |
372 | |
369 } | 373 } |
370 } | 374 } |
371 | 375 |
372 static int | 376 static int |
373 x_frame_iconified_p (struct frame *f) | 377 x_frame_iconified_p (struct frame *f) |
1863 #endif | 1867 #endif |
1864 if (FRAME_X_TOP_LEVEL_FRAME_P (f)) | 1868 if (FRAME_X_TOP_LEVEL_FRAME_P (f)) |
1865 { | 1869 { |
1866 /* tell the window manager about us. */ | 1870 /* tell the window manager about us. */ |
1867 x_wm_store_class_hints (shell_widget, XtName (frame_widget)); | 1871 x_wm_store_class_hints (shell_widget, XtName (frame_widget)); |
1872 | |
1873 #ifndef HAVE_WINDOWMAKER | |
1868 x_wm_maybe_store_wm_command (f); | 1874 x_wm_maybe_store_wm_command (f); |
1875 #endif /* HAVE_WINDOWMAKER */ | |
1876 | |
1869 x_wm_hack_wm_protocols (shell_widget); | 1877 x_wm_hack_wm_protocols (shell_widget); |
1870 } | 1878 } |
1871 | 1879 |
1872 #ifdef HAVE_XIM | 1880 #ifdef HAVE_XIM |
1873 XIM_init_frame (f); | 1881 XIM_init_frame (f); |
2437 x_delete_frame (struct frame *f) | 2445 x_delete_frame (struct frame *f) |
2438 { | 2446 { |
2439 Widget w = FRAME_X_SHELL_WIDGET (f); | 2447 Widget w = FRAME_X_SHELL_WIDGET (f); |
2440 Lisp_Object popup, frame; | 2448 Lisp_Object popup, frame; |
2441 | 2449 |
2450 #ifndef HAVE_WINDOWMAKER | |
2442 if (FRAME_X_TOP_LEVEL_FRAME_P (f)) | 2451 if (FRAME_X_TOP_LEVEL_FRAME_P (f)) |
2443 x_wm_maybe_move_wm_command (f); | 2452 x_wm_maybe_move_wm_command (f); |
2453 #endif /* HAVE_WINDOWMAKER */ | |
2444 | 2454 |
2445 /* Frames with the popup property are using other frames as their | 2455 /* Frames with the popup property are using other frames as their |
2446 widget parent. Deleting them are their parent has already been | 2456 widget parent. Deleting them are their parent has already been |
2447 deleted can lead to crashes. */ | 2457 deleted can lead to crashes. */ |
2448 XSETFRAME (frame, f); | 2458 XSETFRAME (frame, f); |