This commit was generated by cvs2svn to compensate for changes in r5106,

[chise/xemacs-chise.git.1] / lwlib / xlwradio.c

diff --git a/lwlib/xlwradio.c b/lwlib/xlwradio.c
index a6430b9..18f9cdd 100644 (file)
--- a/lwlib/xlwradio.c
+++ b/lwlib/xlwradio.c
@@ -25,7 +25,7 @@ Boston, MA 02111-1307, USA.  */
  *
  * Author: Edward A. Falk
  *         falk@falconer.vip.best.com
- *
+ *  
  * Date:   June 30, 1997
  *
  *
@@ -53,7 +53,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
-#include ATHENA_XawInit_h_
+#include <X11/Xaw/XawInit.h>
 #include "../src/xmu.h"
 #include "xlwradioP.h"
 
@@ -120,7 +120,7 @@ static XtActionsRec actionsList[] =
 
 RadioClassRec radioClassRec = {
   {
-    (WidgetClass) SuperClass,          /* superclass           */
+    (WidgetClass) SuperClass,          /* superclass           */      
     "Radio",                           /* class_name           */
     sizeof(RadioRec),                  /* size                 */
     RadioClassInit,                    /* class_initialize     */
@@ -154,7 +154,7 @@ RadioClassRec radioClassRec = {
     NULL                               /* extension            */
   },  /* CoreClass fields initialization */
   {
-    XtInheritChangeSensitive           /* change_sensitive     */
+    XtInheritChangeSensitive           /* change_sensitive     */ 
   },  /* SimpleClass fields initialization */
 #ifdef _ThreeDP_h
   {
@@ -241,7 +241,7 @@ RadioInit (Widget   request,
 /*     Function Name: RadioDestroy
  *     Description: Destroy Callback for radio widget.
  *     Arguments: w - the radio widget that is being destroyed.
- *                 junk, garbage - not used.
+ *                 junk, grabage - not used.
  *     Returns: none.
  */
 
@@ -272,13 +272,13 @@ RadioResize (Widget w)
 
     switch( rw->label.justify ) {
       case XtJustifyLeft:
-       rw->label.label_x += (bs(rw) + rw->label.internal_width) ;
+       rw->label.label_x += bs(rw) + rw->label.internal_width ;
        break ;
       case XtJustifyRight:
        break ;
       case XtJustifyCenter:
       default:
-       rw->label.label_x += (bs(rw) + rw->label.internal_width)/2;
+       rw->label.label_x += (bs(rw) + rw->label.internal_width)/2 ;
        break ;
     }
 }
@@ -375,13 +375,6 @@ RadioSetValues (Widget   current,
       RadioSize(newrw, &newrw->core.width, &newrw->core.height) ;
     }
 
-    /* The label set values routine can resize the widget. We need to
-     * recalculate if this is true.
-     */
-    if (newrw->label.label_x != oldrw->label.label_x)
-    {
-      RadioResize (new);
-    }
     return FALSE ;
 }
 
@@ -423,7 +416,7 @@ RadioQueryGeometry (Widget w,
  * border.
  */
 
-static void
+static void 
 DrawHighlight (Widget w,
               GC gc)
 {
@@ -473,7 +466,7 @@ RadioUnhighlight (Widget   w,
 
 
 /* ARGSUSED */
-void
+void 
 RadioSet (Widget   w,
          XEvent   *event,
          String   *params,     /* unused */
@@ -492,7 +485,7 @@ RadioSet (Widget   w,
 
 
 /* ARGSUSED */
-void
+void 
 RadioUnset (Widget   w,
            XEvent   *event,
            String   *params,     /* unused */