APPROVE COMMIT 21.5
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.73
diff -u -U0 -r1.73 ChangeLog
--- ChangeLog 13 Nov 2005 10:39:34 -0000 1.73
+++ ChangeLog 16 Nov 2005 05:01:39 -0000
@@ -0,0 +1,8 @@
+2005-11-16 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * xlwcheckbox.c (CheckboxInit): Mark unused parameters. C++
+ correctness.
+ (CheckboxRealize): Don't compile at all if unused.
+
+ * xlwradio.c (RadioDestroy): #if 0 dead code for later removal.
+
@@ -6 +13,0 @@
-
Index: lwlib/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.73
diff -u -r1.73 ChangeLog
--- lwlib/ChangeLog 13 Nov 2005 10:39:34 -0000 1.73
+++ lwlib/ChangeLog 16 Nov 2005 04:24:07 -0000
@@ -4,7 +4,6 @@
Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
Do some refactoring for cleanliness.
-
2005-11-08 Marcus Crestani <crestani(a)xemacs.org>
* xlwgauge.c (GaugeInit):
Index: lwlib/xlwcheckbox.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwcheckbox.c,v
retrieving revision 1.3
diff -u -r1.3 xlwcheckbox.c
--- lwlib/xlwcheckbox.c 20 Sep 2004 19:19:17 -0000 1.3
+++ lwlib/xlwcheckbox.c 16 Nov 2005 04:24:07 -0000
@@ -280,17 +280,13 @@
*/
/* ARGSUSED */
+#if DRAW_CHECK
static void
CheckboxDestroy (
-#if DRAW_CHECK
Widget w,
-#else
- Widget UNUSED (w),
-#endif
XtPointer UNUSED (junk),
XtPointer UNUSED (garbage))
{
-#if DRAW_CHECK
CheckboxWidget cw = (CheckboxWidget) w;
/* TODO: cache this via xmu */
@@ -298,8 +294,8 @@
XFreePixmap( XtDisplay(w), cw->checkbox.checkmark ) ;
if( cw->checkbox.checkmark_GC != None )
XtReleaseGC(w, cw->checkbox.checkmark_GC) ;
-#endif
}
+#endif /* DRAW_CHECK */
Index: lwlib/xlwradio.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwradio.c,v
retrieving revision 1.6
diff -u -r1.6 xlwradio.c
--- lwlib/xlwradio.c 10 Nov 2005 15:47:33 -0000 1.6
+++ lwlib/xlwradio.c 16 Nov 2005 04:24:07 -0000
@@ -89,13 +89,17 @@
static void RadioInit (Widget, Widget, ArgList, Cardinal *);
static void RadioExpose (Widget, XEvent *, Region);
static void RadioResize (Widget);
-static void RadioDestroy (Widget, XtPointer, XtPointer);
static void RadioClassInit (void);
static void RadioClassPartInit (WidgetClass);
static Boolean RadioSetValues (Widget, Widget, Widget, ArgList, Cardinal *);
static void DrawDiamond (Widget);
static XtGeometryResult RadioQueryGeometry (Widget, XtWidgetGeometry *,
XtWidgetGeometry *);
+#if 0
+/* #### This function isn't used and is slated for destruction.
+ Can we just nuke it? */
+static void RadioDestroy (Widget, XtPointer, XtPointer);
+#endif
/* Action procs */
@@ -245,6 +249,9 @@
* Returns: none.
*/
+#if 0
+/* #### This function isn't used and is slated for destruction.
+ Can we just nuke it? */
/* ARGSUSED */
static void
RadioDestroy (Widget UNUSED (w),
@@ -253,7 +260,7 @@
{
/* TODO: get rid of this */
}
-
+#endif
/* React to size change from manager. Label widget will compute some internal
* stuff, but we need to override. This code requires knowledge of the
--
Graduate School of Systems and Information Engineering University of Tsukuba
http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Economics of Information Communication and Computation Systems
Experimental Economics, Microeconomic Theory, Game Theory