summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-03-11 09:19:51 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-03-11 09:19:51 (GMT)
commitcfc7fad4cea8331c03f4687b5619470a5c3aae81 (patch)
tree2b063843811fceaf49b9299bb925a63b56f396b3 /generic
parent361c3bf9f98f466a889c0fe9c7f7ce6d723746d0 (diff)
parent1c329fda154991dc5abe51c9359959e52c4e5b12 (diff)
downloadtk-cfc7fad4cea8331c03f4687b5619470a5c3aae81.zip
tk-cfc7fad4cea8331c03f4687b5619470a5c3aae81.tar.gz
tk-cfc7fad4cea8331c03f4687b5619470a5c3aae81.tar.bz2
Eliminate some unneeded write-only variables (discovered by gcc-4.6)
Diffstat (limited to 'generic')
-rw-r--r--generic/ttk/ttkDefaultTheme.c3
-rw-r--r--generic/ttk/ttkManager.c3
-rw-r--r--generic/ttk/ttkSquare.c3
3 files changed, 3 insertions, 6 deletions
diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c
index f8ad762..e39a960 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 17b3525..fcbe14d 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);