diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/ttk/ttkDefaultTheme.c | 3 | ||||
| -rw-r--r-- | generic/ttk/ttkManager.c | 3 | ||||
| -rw-r--r-- | generic/ttk/ttkSquare.c | 3 |
4 files changed, 9 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2011-03-11 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/ttk/ttkDefaultTheme.c: Eliminate some unneeded write-only + * generic/ttk/ttkManager.c: variables (discovered by gcc-4.6) + * generic/ttk/ttkSquare.c: + 2011-03-09 Reinhard Max <max@suse.de> * unix/configure.in: Use a symbol from libXft itself for the link diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c index 07bc3ec..3bb3db7 100644 --- a/generic/ttk/ttkDefaultTheme.c +++ b/generic/ttk/ttkDefaultTheme.c @@ -499,7 +499,7 @@ static void IndicatorElementDraw( IndicatorElement *indicator = elementRecord; Display *display = Tk_Display(tkwin); Ttk_Padding padding; - XColor *fgColor, *frameColor, *lightColor, *shadeColor, *indicatorColor, *borderColor; + XColor *fgColor, *frameColor, *shadeColor, *indicatorColor, *borderColor; int index, ix, iy; XGCValues gcValues; @@ -529,7 +529,6 @@ static void IndicatorElementDraw( */ fgColor = Tk_GetColorFromObj(tkwin, indicator->foregroundObj); frameColor = Tk_GetColorFromObj(tkwin, indicator->backgroundObj); - lightColor = Tk_GetColorFromObj(tkwin, indicator->lightColorObj); shadeColor = Tk_GetColorFromObj(tkwin, indicator->shadeColorObj); indicatorColor = Tk_GetColorFromObj(tkwin, indicator->colorObj); borderColor = Tk_GetColorFromObj(tkwin, indicator->borderColorObj); diff --git a/generic/ttk/ttkManager.c b/generic/ttk/ttkManager.c index 47c9df0..1238638 100644 --- a/generic/ttk/ttkManager.c +++ b/generic/ttk/ttkManager.c @@ -528,7 +528,7 @@ void Ttk_ReorderSlave(Ttk_Manager *mgr, int fromIndex, int toIndex) */ int Ttk_Maintainable(Tcl_Interp *interp, Tk_Window slave, Tk_Window master) { - Tk_Window ancestor = master, parent = Tk_Parent(slave), sibling = NULL; + Tk_Window ancestor = master, parent = Tk_Parent(slave); if (Tk_IsTopLevel(slave) || slave == master) { goto badWindow; @@ -538,7 +538,6 @@ int Ttk_Maintainable(Tcl_Interp *interp, Tk_Window slave, Tk_Window master) if (Tk_IsTopLevel(ancestor)) { goto badWindow; } - sibling = ancestor; ancestor = Tk_Parent(ancestor); } diff --git a/generic/ttk/ttkSquare.c b/generic/ttk/ttkSquare.c index d2f4540..29e0d7f 100644 --- a/generic/ttk/ttkSquare.c +++ b/generic/ttk/ttkSquare.c @@ -222,10 +222,9 @@ static void SquareElementDraw( Drawable d, Ttk_Box b, unsigned int state) { SquareElement *square = elementRecord; - Tk_3DBorder border = NULL, foreground = NULL; + Tk_3DBorder foreground = NULL; int borderWidth = 1, relief = TK_RELIEF_FLAT; - border = Tk_Get3DBorderFromObj(tkwin, square->borderObj); foreground = Tk_Get3DBorderFromObj(tkwin, square->foregroundObj); Tcl_GetIntFromObj(NULL, square->borderWidthObj, &borderWidth); Tk_GetReliefFromObj(NULL, square->reliefObj, &relief); |