xemacs-beta: src/frame-x.c comparison

comparison src/frame-x.c @ 163:0132846995bd r20-3b8

Import from CVS: tag r20-3b8

author	cvs
date	Mon, 13 Aug 2007 09:43:35 +0200
parents	360340f9fd5f
children	5a88923fcbfe

comparison

equal deleted inserted replaced

-:4de2936b4e77
+:0132846995bd
 if (! XtIsWMShell (shell)) abort ();
 /* Because of questionable logic in Shell.c, this sequence can't work:
 w = XtCreatePopupShell (...);
-XtVaSetValues (w, XtNiconic, True, 0);
+XtVaSetValues (w, XtNiconic, True, NULL);
 XtRealizeWidget (w);
 The iconic resource is only consulted at initialization time (when
 XtCreatePopupShell is called) instead of at realization time (just
 before the window gets created, which would be more sensible) or
 w->wm.wm_hints.initial_state until after the widget has been realized.
 Calls to XtSetValues are ignored in the window between creation and
 realization.  This is true of MIT X11R5 patch level 25, at least.
 (Apparently some other versions of Xt don't have this bug?)
 */
-XtVaSetValues (shell, XtNiconic, iconic_p, 0);
+XtVaSetValues (shell, XtNiconic, iconic_p, NULL);
 EmacsShellSmashIconicHint (shell, iconic_p);
 }
 void
 x_wm_set_cell_size (Widget wmshell, int cw, int ch)
 abort ();
 XtVaSetValues (wmshell,
 		 XtNwidthInc, cw,
 		 XtNheightInc, ch,
-		 0);
+		 NULL);
 }
 void
 x_wm_set_variable_size (Widget wmshell, int width, int height)
 {
 fflush (stdout);
 #endif
 XtVaSetValues (wmshell,
 		 XtNwidthCells, width,
 		 XtNheightCells, height,
-		 0);
+		 NULL);
 }
 /* If the WM_PROTOCOLS property does not already contain WM_TAKE_FOCUS
 and WM_DELETE_WINDOW, then add them.  (They may already be present
 because of the toolkit (Motif adds them, for example, but Xt doesn't).
 strcpy (temp, shell_geom);
 FRAME_X_GEOM_FREE_ME_PLEASE (f) = temp;
 }
 else
 temp = NULL;
-XtVaSetValues (FRAME_X_SHELL_WIDGET (f), XtNgeometry, temp, 0);
+XtVaSetValues (FRAME_X_SHELL_WIDGET (f), XtNgeometry, temp, NULL);
 }
 /* Report to X that a frame property of frame S is being set or changed.
 If the property is not specially recognized, do nothing.
 */
 	      Extbyte *extval;
 	      Extcount extvallen;
 	      GET_STRING_CTEXT_DATA_ALLOCA (val, extval, extvallen);
 	      XtVaSetValues (w, XtVaTypedArg, extprop,
-			     XtRString, extval, extvallen + 1, 0);
+			     XtRString, extval, extvallen + 1, NULL);
 	    }
 	  else
 	    XtVaSetValues (w, XtVaTypedArg,
 			   extprop, XtRInt, XINT (val),
 			   sizeof (int),
-			   0);
+			   NULL);
 	}
 else if (SYMBOLP (prop))
 	{
 	  Lisp_Object str = Fget (prop, Qx_resource_name, Qnil);
 	  int int_p = !NILP (Fget (prop, Qintegerp, Qnil));
 	  if (int_p)
 	    {
 	      CHECK_INT (val);
 	      XtVaSetValues (w, (char *) XSTRING_DATA (str),
-			     XINT (val), 0);
+			     XINT (val), NULL);
 	    }
 	  else if (EQ (val, Qt))
 	    XtVaSetValues (w,
 			   /* XtN... */
 			   (char *) XSTRING_DATA (str),
 			   True,
-			   0);
+			   NULL);
 	  else if (EQ (val, Qnil))
 	    XtVaSetValues (w,
 			   /* XtN... */
 			   (char *) XSTRING_DATA (str),
 			   False,
-			   0);
+			   NULL);
 	  else
 	    {
 	      CHECK_STRING (val);
 	      XtVaSetValues (w, XtVaTypedArg,
 			     /* XtN... */
 			     (char *) XSTRING_DATA (str),
 			     XtRString,
 			     XSTRING_DATA (val),
 			     XSTRING_LENGTH (val) + 1,
-			     0);
+			     NULL);
 	    }
 #ifdef HAVE_SCROLLBARS
 	  if (!strcmp ((char *) XSTRING_DATA (str), "scrollBarWidth")
 	      || !strcmp ((char *) XSTRING_DATA (str),
 is. (Assume it is smart and pays attention to our values.)
 */
 if (!FRAME_X_TOP_LEVEL_FRAME_P (f))
 {
-XtVaGetValues (ew, XtNgeometry, &ew_geom, 0);
+XtVaGetValues (ew, XtNgeometry, &ew_geom, NULL);
 if (ew_geom)
 	frame_flags = XParseGeometry (ew_geom, &frame_x, &frame_y,
 				       &frame_w, &frame_h);
 if (! (frame_flags & (WidthValue | HeightValue)))
 	{
 	  XtVaGetValues (ew, XtNwidth, &frame_w,
-			 XtNheight, &frame_h, 0);
+			 XtNheight, &frame_h, NULL);
 	  if (!frame_w && !frame_h)
 	    {
 	      frame_w = 64;
 	      frame_h = 12;
 	      frame_flags |= WidthValue | HeightValue;
 if (frame_flags & (WidthValue | HeightValue))
 	EmacsFrameSetCharSize (ew, frame_w, frame_h);
 if (frame_flags & (XValue | YValue))
 	{
 	  XtVaGetValues (ew, XtNwidth, &frame_w,
-			 XtNheight, &frame_h, 0);
+			 XtNheight, &frame_h, NULL);
 	  if (frame_flags & XNegative)
 	    frame_x += frame_w;
 	  if (frame_flags & YNegative)
 	    frame_y += frame_h;
-	  XtVaSetValues (ew, XtNx, frame_x, XtNy, frame_y, 0);
+	  XtVaSetValues (ew, XtNx, frame_x, XtNy, frame_y, NULL);
 	}
 return;
 }
 #endif
 /* If the EmacsFrame doesn't have a geometry but the shell does,
 treat that as the geometry of the frame.  (Is this bogus?
 I'm not sure.) */
-XtVaGetValues (ew, XtNgeometry, &ew_geom, 0);
+XtVaGetValues (ew, XtNgeometry, &ew_geom, NULL);
 if (!ew_geom)
 {
-XtVaGetValues (wmshell, XtNgeometry, &geom, 0);
+XtVaGetValues (wmshell, XtNgeometry, &geom, NULL);
 if (geom)
 	{
 	  ew_geom = geom;
-	  XtVaSetValues (ew, XtNgeometry, ew_geom, 0);
+	  XtVaSetValues (ew, XtNgeometry, ew_geom, NULL);
 	}
 }
 /* If the Shell is iconic, then the EmacsFrame is iconic.  (Is
 this bogus? I'm not sure.) */
-XtVaGetValues (ew, XtNiconic, &ew_iconic_p, 0);
+XtVaGetValues (ew, XtNiconic, &ew_iconic_p, NULL);
 if (!ew_iconic_p)
 {
-XtVaGetValues (wmshell, XtNiconic, &iconic_p, 0);
+XtVaGetValues (wmshell, XtNiconic, &iconic_p, NULL);
 if (iconic_p)
 	{
 	  ew_iconic_p = iconic_p;
-	  XtVaSetValues (ew, XtNiconic, iconic_p, 0);
+	  XtVaSetValues (ew, XtNiconic, iconic_p, NULL);
 	}
 }
-XtVaGetValues (app_shell, XtNgeometry, &geom, 0);
+XtVaGetValues (app_shell, XtNgeometry, &geom, NULL);
 if (geom)
 app_flags = XParseGeometry (geom, &app_x, &app_y, &app_w, &app_h);
 if (ew_geom)
 frame_flags = XParseGeometry (ew_geom, &frame_x, &frame_y,
 	}
 /* If the AppShell is iconic, then the EmacsFrame is iconic. */
 if (!ew_iconic_p)
 	{
-	  XtVaGetValues (app_shell, XtNiconic, &iconic_p, 0);
+	  XtVaGetValues (app_shell, XtNiconic, &iconic_p, NULL);
 	  if (iconic_p)
 	    {
 	      ew_iconic_p = iconic_p;
-	      XtVaSetValues (ew, XtNiconic, iconic_p, 0);
+	      XtVaSetValues (ew, XtNiconic, iconic_p, NULL);
 	    }
 	}
 }
 else
 {
 #ifdef HAVE_SCROLLBARS
 {
 /* The scrollbar positioning is completely handled by redisplay.  We
 just need to know which sides they are supposed to go on. */
 unsigned char scrollbar_placement;
-XtVaGetValues (text, XtNscrollBarPlacement, &scrollbar_placement, 0);
+XtVaGetValues (text, XtNscrollBarPlacement, &scrollbar_placement, NULL);
 f->scrollbar_on_left = (scrollbar_placement == XtTOP_LEFT ||
 scrollbar_placement == XtBOTTOM_LEFT);
 f->scrollbar_on_top  = (scrollbar_placement == XtTOP_LEFT ||
 scrollbar_placement == XtTOP_RIGHT);
 f->scrollbar_y_offset = topbreadth + textbord;
 maybe_set_frame_title_format (shell);
 /* Create the manager widget */
 container = XtVaCreateWidget ("container",
 				emacsManagerWidgetClass,
-				shell, 0);
+				shell, NULL);
 FRAME_X_CONTAINER_WIDGET (f) = container;
 XtAddCallback (container, XtNresizeCallback, x_layout_widgets,
 		 (XtPointer) f);
 XtAddCallback (container, XtNqueryGeometryCallback, x_do_query_geometry,
 		 (XtPointer) f);
 XtVaGetValues (w,
 		 XtNwidth,       &shell_w,
 		 XtNheight,      &shell_h,
 		 XtNborderWidth, &shell_bord,
-		 0);
+		 NULL);
 win_gravity =
 xoff >= 0 && yoff >= 0 ? NorthWestGravity :
 xoff >= 0 ? SouthWestGravity :
 yoff >= 0 ? NorthEastGravity :
 might not be processed). */
 XtVaSetValues (w,
 		 XtNwinGravity, win_gravity,
 		 XtNx, xoff,
 		 XtNy, yoff,
-		 0);
+		 NULL);
 /* Sometimes you will find that
 (set-frame-position (selected-frame) -50 -50)

Mercurial > hg > xemacs-beta

comparison src/frame-x.c @ 163:0132846995bd r20-3b8