Mercurial > hg > xemacs-beta

diff lwlib/xlwtabs.c @ 3025:facf3239ba30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-10-25 11:16:19 by ben] rename new->new_, convert 'foo to `foo' EmacsFrame.c, ExternalClient.c, ExternalShell.c, chartab.c, cmdloop.c, compiler.h, console.c, database.c, device-msw.c, device-x.c, device.c, doc.c, dragdrop.c, eval.c, event-msw.c, event-stream.c, events.c, extents.c, file-coding.c, fns.c, frame-tty.c, frame.c, gpmevent.c, gutter.c, hash.c, imgproc.c, indent.c, keymap.c, lisp-union.h, macros.c, malloc.c, marker.c, menubar-x.c, menubar.c, mule-charset.c, number.c, process.c, profile.h, ralloc.c, redisplay.c, select-common.h, select.c, syntax.c, sysfile.h, sysproc.h, systime.h, syswindows.h, toolbar.c, tooltalk.c, tparam.c, unexaix.c, unexalpha.c, unexconvex.c, unexec.c, unexhp9k800.c, unexmips.c, unicode.c, window.c: new -> new_. 'foo -> `foo'. lwlib-internal.h: redo assert macros to follow lisp.h and not trigger warnings. lwlib.c, xlwtabs.c: new -> new_.
author ben
date Tue, 25 Oct 2005 11:16:49 +0000
parents 04bc9d2f42c7
children ad2f4ae9895b
line wrap: on
line diff
--- a/lwlib/xlwtabs.c	Tue Oct 25 08:32:50 2005 +0000
+++ b/lwlib/xlwtabs.c	Tue Oct 25 11:16:49 2005 +0000
@@ -238,7 +238,7 @@
 #else
 
 static	void	TabsClassInit(void) ;
-static	void	TabsInit( Widget req, Widget new, ArgList, Cardinal *nargs) ;
+static	void	TabsInit( Widget req, Widget new_, ArgList, Cardinal *nargs) ;
 static	void	TabsConstraintInitialize(Widget, Widget, ArgList, Cardinal *) ;
 static	void	TabsRealize(Widget, Mask *, XSetWindowAttributes *) ;
 static	void	TabsDestroy( Widget w) ;
@@ -421,10 +421,10 @@
 /* ARGSUSED */
 
 static void
-TabsInit(Widget request, Widget new, ArgList UNUSED (args),
+TabsInit(Widget request, Widget new_, ArgList UNUSED (args),
 	 Cardinal *UNUSED (num_args))
 {
-    TabsWidget newTw = (TabsWidget)new;
+    TabsWidget newTw = (TabsWidget)new_;
 
     newTw->tabs.numRows = 0 ;
     newTw->tabs.realRows = 0;
@@ -448,9 +448,9 @@
     {
       Dimension	w,h ;
       PreferredSize(newTw, &w, &h, NULL,NULL) ;
-      if( request->core.width == 0 ) new->core.width = w ;
-      if( request->core.height == 0 ) new->core.height = h ;
-      XtClass(new)->core_class.resize(new) ;
+      if( request->core.width == 0 ) new_->core.width = w ;
+      if( request->core.height == 0 ) new_->core.height = h ;
+      XtClass(new_)->core_class.resize(new_) ;
     }
 
     /* defer GC allocation, etc., until Realize() time. */
@@ -478,15 +478,15 @@
 	 */
 /* ARGSUSED */
 static	void
-TabsConstraintInitialize(Widget UNUSED (request), Widget new,
+TabsConstraintInitialize(Widget UNUSED (request), Widget new_,
 			 ArgList UNUSED (args), Cardinal *UNUSED (num_args))
 {
-	TabsConstraints tab = (TabsConstraints) new->core.constraints ;
+	TabsConstraints tab = (TabsConstraints) new_->core.constraints ;
 	tab->tabs.greyAlloc = False ;	/* defer allocation of pixel */
 	tab->tabs.visible = False ;
 
-	getBitmapInfo((TabsWidget)XtParent(new), tab) ;
-	TabWidth(new) ;
+	getBitmapInfo((TabsWidget)XtParent(new_), tab) ;
+	TabWidth(new_) ;
 }
 
 
@@ -605,11 +605,11 @@
 
 /* ARGSUSED */
 static	Boolean
-TabsSetValues(Widget current, Widget UNUSED (request), Widget new,
+TabsSetValues(Widget current, Widget UNUSED (request), Widget new_,
 	      ArgList UNUSED (args), Cardinal *UNUSED (num_args))
 {
 	TabsWidget curtw = (TabsWidget) current ;
-	TabsWidget tw = (TabsWidget) new ;
+	TabsWidget tw = (TabsWidget) new_ ;
 	Boolean	needRedraw = False ;
 	Widget	*childP ;
 	int	i ;
@@ -641,7 +641,7 @@
 	if( tw->core.background_pixel != curtw->core.background_pixel ||
 	    tw->core.background_pixmap != curtw->core.background_pixmap ||
 	    tw->tabs.font != curtw->tabs.font )
-	  if( XtIsRealized(new) )
+	  if( XtIsRealized(new_) )
 	  {
 	    TabsFreeGCs(tw) ;
 	    TabsAllocGCs(tw) ;
@@ -685,12 +685,12 @@
 
 /* ARGSUSED */
 static	Boolean
-TabsConstraintSetValues(Widget current, Widget UNUSED (request), Widget new,
+TabsConstraintSetValues(Widget current, Widget UNUSED (request), Widget new_,
 			ArgList UNUSED (args), Cardinal *UNUSED (num_args))
 {
-	TabsWidget tw = (TabsWidget) XtParent(new) ;
+	TabsWidget tw = (TabsWidget) XtParent(new_) ;
 	TabsConstraints ctab = (TabsConstraints) current->core.constraints ;
-	TabsConstraints tab = (TabsConstraints) new->core.constraints ;
+	TabsConstraints tab = (TabsConstraints) new_->core.constraints ;
 
 
 	/* if label changes, need to re-layout the entire widget */
@@ -703,7 +703,7 @@
 	if( tab->tabs.label != ctab->tabs.label ||  /* Tab size has changed. */
 	    tab->tabs.left_bitmap != ctab->tabs.left_bitmap )
 	{
-	  TabWidth(new) ;
+	  TabWidth(new_) ;
 	  tw->tabs.needs_layout = True ;
 
 	  if( tab->tabs.left_bitmap != ctab->tabs.left_bitmap )
@@ -722,7 +722,7 @@
 	 * Tabs widget might.
 	 */
 
-	if( XtIsRealized(new) )
+	if( XtIsRealized(new_) )
 	{
 	  if( tw->tabs.needs_layout ) {
 	    XClearWindow(XtDisplay((Widget)tw), XtWindow((Widget)tw)) ;
@@ -730,7 +730,7 @@
 	  }
 
 	  else if( tab->tabs.foreground != ctab->tabs.foreground )
-	    DrawTab(tw, new, True) ;
+	    DrawTab(tw, new_, True) ;
 	}
 
 	return False ;