Mercurial > hg > xemacs-beta

diff lwlib/xlwtabs.c @ 430:a5df635868b2 r21-2-23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-23
author cvs
date Mon, 13 Aug 2007 11:29:08 +0200
parents 3ecd8885ac67
children 3a7e78e1142d
line wrap: on
line diff
--- a/lwlib/xlwtabs.c	Mon Aug 13 11:28:16 2007 +0200
+++ b/lwlib/xlwtabs.c	Mon Aug 13 11:29:08 2007 +0200
@@ -598,75 +598,74 @@
 TabsSetValues(Widget current, Widget request, Widget new,
 	ArgList args, Cardinal *num_args)
 {
-  TabsWidget curtw = (TabsWidget) current ;
-  TabsWidget tw = (TabsWidget) new ;
-  Boolean	needRedraw = False ;
-  Widget	*childP ;
-  int	i ;
+	TabsWidget curtw = (TabsWidget) current ;
+	TabsWidget tw = (TabsWidget) new ;
+	Boolean	needRedraw = False ;
+	Widget	*childP ;
+	int	i ;
 
 
-  if( tw->tabs.font != curtw->tabs.font  ||
-      tw->tabs.internalWidth != curtw->tabs.internalWidth ||
-      tw->tabs.internalHeight != curtw->tabs.internalHeight )
-    {
-      tw->tabs.tab_height = 2 * tw->tabs.internalHeight + SHADWID ;
+	if( tw->tabs.font != curtw->tabs.font  ||
+	    tw->tabs.internalWidth != curtw->tabs.internalWidth ||
+	    tw->tabs.internalHeight != curtw->tabs.internalHeight )
+	{
+	  tw->tabs.tab_height = 2 * tw->tabs.internalHeight + SHADWID ;
 
-      if( tw->tabs.font != NULL )
-	tw->tabs.tab_height += tw->tabs.font->max_bounds.ascent +
-	  tw->tabs.font->max_bounds.descent ;
+	  if( tw->tabs.font != NULL )
+	    tw->tabs.tab_height += tw->tabs.font->max_bounds.ascent +
+				   tw->tabs.font->max_bounds.descent ;
 
-      /* Tab size has changed.  Resize all tabs and request a new size */
-      for(i=0, childP=tw->composite.children;
-	  i < tw->composite.num_children;
-	  ++i, ++childP)
-	if( XtIsManaged(*childP) )
-	  TabWidth(*childP) ;
-      PreferredSize(tw, &tw->core.width, &tw->core.height, NULL,NULL) ;
-      needRedraw = True ;
-      tw->tabs.needs_layout = True ;
-    }
+	  /* Tab size has changed.  Resize all tabs and request a new size */
+	  for(i=0, childP=tw->composite.children;
+		i < tw->composite.num_children;
+		++i, ++childP)
+	    if( XtIsManaged(*childP) )
+	      TabWidth(*childP) ;
+	  PreferredSize(tw, &tw->core.width, &tw->core.height, NULL,NULL) ;
+	  needRedraw = True ;
+	  tw->tabs.needs_layout = True ;
+	}
 
-  /* TODO: if any color changes, need to recompute GCs and redraw */
+	/* TODO: if any color changes, need to recompute GCs and redraw */
 
-  if( tw->core.background_pixel != curtw->core.background_pixel ||
-      tw->core.background_pixmap != curtw->core.background_pixmap )
-    if( XtIsRealized(new) )
-      {
-	TabsFreeGCs(tw) ;
-	TabsAllocGCs(tw) ;
-	needRedraw = True ;
-      }
+	if( tw->core.background_pixel != curtw->core.background_pixel ||
+	    tw->core.background_pixmap != curtw->core.background_pixmap )
+	  if( XtIsRealized(new) )
+	  {
+	    TabsFreeGCs(tw) ;
+	    TabsAllocGCs(tw) ;
+	    needRedraw = True ;
+	  }
 
-  if( tw->core.sensitive != curtw->core.sensitive )
-    needRedraw = True ;
+	if( tw->core.sensitive != curtw->core.sensitive )
+	  needRedraw = True ;
 
-  /* If top widget changes, need to change stacking order, redraw tabs.
-   * Window system will handle the redraws.
-   */
+	/* If top widget changes, need to change stacking order, redraw tabs.
+	 * Window system will handle the redraws.
+	 */
 
-  if( tw->tabs.topWidget != curtw->tabs.topWidget )
-    {
-      if( XtIsRealized(tw->tabs.topWidget) )
-	{
-	  Widget		w = tw->tabs.topWidget ;
-	  TabsConstraints	tab = (TabsConstraints) w->core.constraints ;
+	if( tw->tabs.topWidget != curtw->tabs.topWidget ) {
+	  if( XtIsRealized(tw->tabs.topWidget) )
+	  {
+	    Widget		w = tw->tabs.topWidget ;
+	    TabsConstraints	tab = (TabsConstraints) w->core.constraints ;
 
-	  XRaiseWindow(XtDisplay(w), XtWindow(w)) ;
+	    XRaiseWindow(XtDisplay(w), XtWindow(w)) ;
 #ifdef	NEED_MOTIF
-	  XtVaSetValues(curtw->tabs.topWidget, XmNtraversalOn, False, 0) ;
-	  XtVaSetValues(w, XmNtraversalOn, True, 0) ;
+	    XtVaSetValues(curtw->tabs.topWidget, XmNtraversalOn, False, 0) ;
+	    XtVaSetValues(w, XmNtraversalOn, True, 0) ;
 #endif
 
-	  if( tab->tabs.row != tw->tabs.numRows-1 )
-	    TabsShuffleRows(tw) ;
+	    if( tab->tabs.row != tw->tabs.numRows-1 )
+	      TabsShuffleRows(tw) ;
 
-	  needRedraw = True ;
-	}
-      else
-	tw->tabs.needs_layout = True ;
-    }
+	    needRedraw = True ;
+	  }
+	  }
+	  else
+	    tw->tabs.needs_layout = True ;
 
-  return needRedraw ;
+	return needRedraw ;
 }
 
 
@@ -820,8 +819,8 @@
 	  Dimension	th ;		/* space used by tabs */
 	  Dimension	wid,hgt ;	/* Tabs widget size */
 
-	  rw = tab->tabs.wid ;
-	  rh = tab->tabs.hgt ;
+	  rw = cw = tab->tabs.wid ;
+	  rh = ch = tab->tabs.hgt ;
 
 	  /* find out what the resulting preferred size would be */
 
@@ -1059,7 +1058,7 @@
 TabsPage(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
 	TabsWidget	tw = (TabsWidget) w ;
-	Widget		newtop ;
+	Widget		newtop = NULL;
 	Widget		*childP ;
 	int		idx ;
 	int		nc = tw->composite.num_children ;
@@ -1122,7 +1121,7 @@
 TabsHighlight(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
 	TabsWidget	tw = (TabsWidget) w ;
-	Widget		newhl ;
+	Widget		newhl = NULL;
 	Widget		*childP ;
 	int		idx ;
 	int		nc = tw->composite.num_children ;