aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-08-03 20:22:34 +0000
committerGerd Moellmann2000-08-03 20:22:34 +0000
commitc52e7aa6e2955763050e305229a75c43924ec1e4 (patch)
tree23a07e0b521e459a596a31f647b376c72e059104 /src
parent6a2bfc84786a28b942082ea28b00b9940ac169e5 (diff)
downloademacs-c52e7aa6e2955763050e305229a75c43924ec1e4.tar.gz
emacs-c52e7aa6e2955763050e305229a75c43924ec1e4.zip
(set_frame_size, update_wm_hints, EmacsFrameSetValues):
Use NULL instead of 0 at the end of variable argument list of XtVaGetValues and XtVaSetValues, because 0 fails on systems where sizeof (int) < sizeof (void *).
Diffstat (limited to 'src')
-rw-r--r--src/widget.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/widget.c b/src/widget.c
index 47f78786741..9e8672cb57c 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -318,17 +318,17 @@ set_frame_size (ew)
318 treat that as the geometry of the frame. (Is this bogus? 318 treat that as the geometry of the frame. (Is this bogus?
319 I'm not sure.) */ 319 I'm not sure.) */
320 if (ew->emacs_frame.geometry == 0) 320 if (ew->emacs_frame.geometry == 0)
321 XtVaGetValues (wmshell, XtNgeometry, &ew->emacs_frame.geometry, 0); 321 XtVaGetValues (wmshell, XtNgeometry, &ew->emacs_frame.geometry, NULL);
322 322
323 /* If the Shell is iconic, then the EmacsFrame is iconic. (Is 323 /* If the Shell is iconic, then the EmacsFrame is iconic. (Is
324 this bogus? I'm not sure.) */ 324 this bogus? I'm not sure.) */
325 if (!ew->emacs_frame.iconic) 325 if (!ew->emacs_frame.iconic)
326 XtVaGetValues (wmshell, XtNiconic, &ew->emacs_frame.iconic, 0); 326 XtVaGetValues (wmshell, XtNiconic, &ew->emacs_frame.iconic, NULL);
327 327
328 328
329 { 329 {
330 char *geom = 0; 330 char *geom = 0;
331 XtVaGetValues (app_shell, XtNgeometry, &geom, 0); 331 XtVaGetValues (app_shell, XtNgeometry, &geom, NULL);
332 if (geom) 332 if (geom)
333 app_flags = XParseGeometry (geom, &app_x, &app_y, &app_w, &app_h); 333 app_flags = XParseGeometry (geom, &app_x, &app_y, &app_w, &app_h);
334 } 334 }
@@ -378,7 +378,7 @@ set_frame_size (ew)
378 378
379 /* If the AppShell is iconic, then the EmacsFrame is iconic. */ 379 /* If the AppShell is iconic, then the EmacsFrame is iconic. */
380 if (!ew->emacs_frame.iconic) 380 if (!ew->emacs_frame.iconic)
381 XtVaGetValues (app_shell, XtNiconic, &ew->emacs_frame.iconic, 0); 381 XtVaGetValues (app_shell, XtNiconic, &ew->emacs_frame.iconic, NULL);
382 382
383 first_frame_p = False; 383 first_frame_p = False;
384 } 384 }
@@ -456,7 +456,7 @@ set_frame_size (ew)
456 len = strlen (shell_position) + 1; 456 len = strlen (shell_position) + 1;
457 tem = (char *) xmalloc (len); 457 tem = (char *) xmalloc (len);
458 strncpy (tem, shell_position, len); 458 strncpy (tem, shell_position, len);
459 XtVaSetValues (wmshell, XtNgeometry, tem, 0); 459 XtVaSetValues (wmshell, XtNgeometry, tem, NULL);
460 } 460 }
461 else if (flags & (WidthValue | HeightValue)) 461 else if (flags & (WidthValue | HeightValue))
462 { 462 {
@@ -466,7 +466,7 @@ set_frame_size (ew)
466 len = strlen (shell_position) + 1; 466 len = strlen (shell_position) + 1;
467 tem = (char *) xmalloc (len); 467 tem = (char *) xmalloc (len);
468 strncpy (tem, shell_position, len); 468 strncpy (tem, shell_position, len);
469 XtVaSetValues (wmshell, XtNgeometry, tem, 0); 469 XtVaSetValues (wmshell, XtNgeometry, tem, NULL);
470 } 470 }
471 471
472 /* If the geometry spec we're using has W/H components, mark the size 472 /* If the geometry spec we're using has W/H components, mark the size
@@ -476,7 +476,7 @@ set_frame_size (ew)
476 476
477 /* Also assign the iconic status of the frame to the Shell, so that 477 /* Also assign the iconic status of the frame to the Shell, so that
478 the WM sees it. */ 478 the WM sees it. */
479 XtVaSetValues (wmshell, XtNiconic, ew->emacs_frame.iconic, 0); 479 XtVaSetValues (wmshell, XtNiconic, ew->emacs_frame.iconic, NULL);
480#endif /* 0 */ 480#endif /* 0 */
481 } 481 }
482} 482}
@@ -530,7 +530,7 @@ update_wm_hints (ew)
530 XtNheightInc, ch, 530 XtNheightInc, ch,
531 XtNminWidth, base_width + min_cols * cw, 531 XtNminWidth, base_width + min_cols * cw,
532 XtNminHeight, base_height + min_rows * ch, 532 XtNminHeight, base_height + min_rows * ch,
533 0); 533 NULL);
534} 534}
535 535
536#if 0 536#if 0
@@ -855,7 +855,7 @@ EmacsFrameSetValues (cur_widget, req_widget, new_widget, dum1, dum2)
855 if (cur->emacs_frame.iconic != new->emacs_frame.iconic) 855 if (cur->emacs_frame.iconic != new->emacs_frame.iconic)
856 { 856 {
857 Widget wmshell = get_wm_shell ((Widget) cur); 857 Widget wmshell = get_wm_shell ((Widget) cur);
858 XtVaSetValues (wmshell, XtNiconic, new->emacs_frame.iconic, 0); 858 XtVaSetValues (wmshell, XtNiconic, new->emacs_frame.iconic, NULL);
859 } 859 }
860 860
861 return needs_a_refresh; 861 return needs_a_refresh;