3:47 p.m.
User: crestani
Date: 05/11/10 16:47:36
Modified: xemacs/lwlib ChangeLog xlwgauge.c xlwradio.c
Log:
Fix C++ build: new->new_.
Revision Changes Path
1.72 +7 -0 XEmacs/xemacs/lwlib/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- ChangeLog 2005/10/26 15:13:56 1.71
+++ ChangeLog 2005/11/10 15:47:33 1.72
＠＠ -1,3 +1,10 ＠＠
+2005-11-08 Marcus Crestani <crestani(a)xemacs.org>
+
+ * xlwgauge.c (GaugeInit):
+ * xlwgauge.c (GaugeSetValues):
+ * xlwradio.c (RadioInit):
+ * xlwradio.c (RadioSetValues): Rename new->new_.
+
2005-10-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.23 "daikon" is released.
1.6 +11 -11 XEmacs/xemacs/lwlib/xlwgauge.c
Index: xlwgauge.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwgauge.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xlwgauge.c 2004/09/20 19:19:17 1.5
+++ xlwgauge.c 2005/11/10 15:47:33 1.6
＠＠ -240,11 +240,11 ＠＠ GaugeClassInit (void)
/* 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 ＠＠ GaugeInit (Widget request,
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 ＠＠ register Window win = XtWindow(w) ;
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 ＠＠ GaugeSetValues (Widget old,
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 ＠＠ GaugeSetValues (Widget old,
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_);
}
1.6 +6 -6 XEmacs/xemacs/lwlib/xlwradio.c
Index: xlwradio.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwradio.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xlwradio.c 2004/09/20 19:19:17 1.5
+++ xlwradio.c 2005/11/10 15:47:33 1.6
＠＠ -218,11 +218,11 ＠＠ RadioClassPartInit (WidgetClass class_)
/*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 ＠＠ RadioInit (Widget request,
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 ＠＠ RadioExpose (Widget w,
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 ＠＠ RadioSetValues (Widget current,
*/
if (newrw->label.label_x != oldrw->label.label_x)
{
- RadioResize (new);
+ RadioResize (new_);
}
return FALSE ;
}