[PATCH] Fix C++ build: rename new->new_
Fix C++ build.
I'll commit tomorrow, if nobody objects.
lwlib/ChangeLog addition:
2005-11-08 Marcus Crestani <crestani(a)xemacs.org>
* xlwgauge.c (GaugeInit):
* xlwgauge.c (GaugeSetValues):
* xlwradio.c (RadioInit):
* xlwradio.c (RadioSetValues): Rename new->new_.
xemacs-21.5 source patch:
Diff command: cvs -q diff -u
Files affected: lwlib/xlwradio.c lwlib/xlwgauge.c
Index: lwlib/xlwgauge.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwgauge.c,v
retrieving revision 1.5
diff -u -r1.5 xlwgauge.c
--- lwlib/xlwgauge.c 20 Sep 2004 19:19:17 -0000 1.5
+++ lwlib/xlwgauge.c 8 Nov 2005 12:50:55 -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_);
}
Index: lwlib/xlwradio.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwradio.c,v
retrieving revision 1.5
diff -u -r1.5 xlwradio.c
--- lwlib/xlwradio.c 20 Sep 2004 19:19:17 -0000 1.5
+++ lwlib/xlwradio.c 8 Nov 2005 12:50:55 -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 ;
}
--
Marcus