Mercurial > hg > xemacs-beta

changeset 3055:6c9e392b4307

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-11-10 15:47:33 by crestani] Fix C++ build: new->new_.
author crestani
date Thu, 10 Nov 2005 15:47:33 +0000
parents f4a678ca6f3d
children 87650ff4c6b3
files lwlib/ChangeLog lwlib/xlwgauge.c lwlib/xlwradio.c
diffstat 3 files changed, 24 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/lwlib/ChangeLog	Thu Nov 10 15:45:13 2005 +0000
+++ b/lwlib/ChangeLog	Thu Nov 10 15:47:33 2005 +0000
@@ -1,3 +1,10 @@
+2005-11-08  Marcus Crestani  <crestani@xemacs.org>
+
+	* xlwgauge.c (GaugeInit):
+	* xlwgauge.c (GaugeSetValues):
+	* xlwradio.c (RadioInit):
+	* xlwradio.c (RadioSetValues): Rename new->new_.
+
 2005-10-26  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.23 "daikon" is released.
--- a/lwlib/xlwgauge.c	Thu Nov 10 15:45:13 2005 +0000
+++ b/lwlib/xlwgauge.c	Thu Nov 10 15:47:33 2005 +0000
@@ -240,11 +240,11 @@
 /* ARGSUSED */
 static void
 GaugeInit (Widget   request,
-	   Widget   new,
+	   Widget   new_,
 	   ArgList  UNUSED (args),
 	   Cardinal *UNUSED (num_args))
 {
-    GaugeWidget gw = (GaugeWidget) new;
+    GaugeWidget gw = (GaugeWidget) new_;
 
     if( gw->gauge.v0 == 0  &&  gw->gauge.v1 == 0 ) {
       gw->gauge.autoScaleUp = gw->gauge.autoScaleDown = TRUE ;
@@ -258,10 +258,10 @@
       Dimension w,h ;
       GaugeSize(gw, &w,&h, DEF_LEN) ;
       if( request->core.width == 0 )
-	new->core.width = w ;
+	new_->core.width = w ;
       if( request->core.height == 0 )
-	new->core.height = h ;
-      gw->core.widget_class->core_class.resize(new) ;
+	new_->core.height = h ;
+      gw->core.widget_class->core_class.resize(new_) ;
     }
 
     gw->gauge.selected = None ;
@@ -501,16 +501,16 @@
 static Boolean
 GaugeSetValues (Widget   old,
 		Widget   UNUSED (request),
-		Widget   new,
+		Widget   new_,
 		ArgList  UNUSED (args),
 		Cardinal *UNUSED (num_args))
 {
 	GaugeWidget oldgw = (GaugeWidget) old;
-	GaugeWidget gw = (GaugeWidget) new;
+	GaugeWidget gw = (GaugeWidget) new_;
 	Boolean was_resized = False;
 
 	if( gw->gauge.selected != None ) {
-	  XtDisownSelection(new, gw->gauge.selected, CurrentTime) ;
+	  XtDisownSelection(new_, gw->gauge.selected, CurrentTime) ;
 	  gw->gauge.selected = None ;
 	}
 
@@ -535,7 +535,7 @@
 	  if( gw->label.resize )
 	    GaugeSize(gw, &gw->core.width, &gw->core.height, DEF_LEN) ;
 	  else
-	    GaugeResize(new) ;
+	    GaugeResize(new_) ;
 	}
 
 	if( gw->gauge.update != oldgw->gauge.update )
@@ -548,12 +548,12 @@
 
 	if( gw->core.background_pixel != oldgw->core.background_pixel )
 	{
-	  XtReleaseGC(new, gw->gauge.inverse_GC) ;
+	  XtReleaseGC(new_, gw->gauge.inverse_GC) ;
 	  gw->gauge.inverse_GC = Get_GC(gw, gw->core.background_pixel) ;
 	}
 
 	return was_resized || gw->gauge.value != oldgw->gauge.value  ||
-	   XtIsSensitive(old) != XtIsSensitive(new);
+	   XtIsSensitive(old) != XtIsSensitive(new_);
 }
 
 
--- a/lwlib/xlwradio.c	Thu Nov 10 15:45:13 2005 +0000
+++ b/lwlib/xlwradio.c	Thu Nov 10 15:47:33 2005 +0000
@@ -218,11 +218,11 @@
 /*ARGSUSED*/
 static void
 RadioInit (Widget   request,
-	   Widget   new,
+	   Widget   new_,
 	   ArgList  UNUSED (args),
 	   Cardinal *UNUSED (num_args))
 {
-    RadioWidget rw = (RadioWidget) new;
+    RadioWidget rw = (RadioWidget) new_;
     RadioWidget rw_req = (RadioWidget) request;
     Dimension	w,h ;
 
@@ -234,7 +234,7 @@
 	rw->core.width = w ;
       if( rw_req->core.height == 0 )
 	rw->core.height = h ;
-      rw->core.widget_class->core_class.resize(new) ;
+      rw->core.widget_class->core_class.resize(new_) ;
     }
 }
 
@@ -345,12 +345,12 @@
 static Boolean
 RadioSetValues (Widget   current,
 		Widget   UNUSED (request),
-		Widget   new,
+		Widget   new_,
 		ArgList  UNUSED (args),
 		Cardinal *UNUSED (num_args))
 {
     RadioWidget oldrw = (RadioWidget) current;
-    RadioWidget newrw = (RadioWidget) new;
+    RadioWidget newrw = (RadioWidget) new_;
 
     /* Need to find out if the size of the widget changed.  Set new size
      * if it did and resize is permitted.  One way to determine of the
@@ -373,7 +373,7 @@
      */
     if (newrw->label.label_x != oldrw->label.label_x)
     {
-      RadioResize (new);
+      RadioResize (new_);
     }
     return FALSE ;
 }