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

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

diff --git a/lwlib/xlwtabs.c b/lwlib/xlwtabs.c
index 559fc91..e58d6fa 100644 (file)
--- a/lwlib/xlwtabs.c
+++ b/lwlib/xlwtabs.c
@@ -644,7 +644,7 @@ TabsSetValues(Widget current, Widget request, Widget new,
         * Window system will handle the redraws.
         */
 
-       if( tw->tabs.topWidget != curtw->tabs.topWidget ) {
+       if( tw->tabs.topWidget != curtw->tabs.topWidget )
          if( XtIsRealized(tw->tabs.topWidget) )
          {
            Widget              w = tw->tabs.topWidget ;
@@ -661,7 +661,6 @@ TabsSetValues(Widget current, Widget request, Widget new,
 
            needRedraw = True ;
          }
-         }
          else
            tw->tabs.needs_layout = True ;
 
@@ -819,8 +818,8 @@ TabsGeometryManager(Widget w, XtWidgetGeometry *req, XtWidgetGeometry *reply)
          Dimension     th ;            /* space used by tabs */
          Dimension     wid,hgt ;       /* Tabs widget size */
 
-         rw = cw = tab->tabs.wid ;
-         rh = ch = tab->tabs.hgt ;
+         rw = tab->tabs.wid ;
+         rh = tab->tabs.hgt ;
 
          /* find out what the resulting preferred size would be */
 
@@ -1058,9 +1057,10 @@ static   void
 TabsPage(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
        TabsWidget      tw = (TabsWidget) w ;
-       Widget          newtop = NULL;
+       Widget          newtop ;
        Widget          *childP ;
        int             idx ;
+       int             i ;
        int             nc = tw->composite.num_children ;
 
        if( nc <= 0 )
@@ -1121,9 +1121,10 @@ static   void
 TabsHighlight(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
        TabsWidget      tw = (TabsWidget) w ;
-       Widget          newhl = NULL;
+       Widget          newhl ;
        Widget          *childP ;
        int             idx ;
+       int             i ;
        int             nc = tw->composite.num_children ;
 
        if( nc <= 0 )
@@ -1270,6 +1271,8 @@ void
 XawTabsSetHighlight(Widget t, Widget w)
 {
        TabsWidget      tw = (TabsWidget)t ;
+       TabsConstraints tab ;
+       Widget          oldtop = tw->tabs.topWidget ;
 
        if( !XtIsSubclass(t, tabsWidgetClass) )
          return ;