summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-08-16 07:57:18 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-08-16 07:57:18 (GMT)
commite6fe5e1f356751dea5d391b25a6f2437ffebae5f (patch)
tree4810edcd3b39814a55c1d5fb235d768f181bc42a /generic
parent52482ab5023994148201c6b4e71c40b62809b205 (diff)
downloadtk-e6fe5e1f356751dea5d391b25a6f2437ffebae5f.zip
tk-e6fe5e1f356751dea5d391b25a6f2437ffebae5f.tar.gz
tk-e6fe5e1f356751dea5d391b25a6f2437ffebae5f.tar.bz2
[Bug 3388350] mingw64 compiler warnings
Diffstat (limited to 'generic')
-rw-r--r--generic/tkCanvLine.c7
-rw-r--r--generic/tkConsole.c8
-rw-r--r--generic/tkListbox.c2
3 files changed, 1 insertions, 16 deletions
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c
index 747e42c..4c7b9be 100644
--- a/generic/tkCanvLine.c
+++ b/generic/tkCanvLine.c
@@ -864,7 +864,6 @@ DisplayLine(canvas, itemPtr, display, drawable, x, y, width, height)
double linewidth;
int numPoints;
Tk_State state = itemPtr->state;
- Pixmap stipple = linePtr->outline.stipple;
if ((!linePtr->numPoints)||(linePtr->outline.gc==None)) {
return;
@@ -875,16 +874,10 @@ DisplayLine(canvas, itemPtr, display, drawable, x, y, width, height)
}
linewidth = linePtr->outline.width;
if (((TkCanvas *)canvas)->currentItemPtr == itemPtr) {
- if (linePtr->outline.activeStipple != None) {
- stipple = linePtr->outline.activeStipple;
- }
if (linePtr->outline.activeWidth != linewidth) {
linewidth = linePtr->outline.activeWidth;
}
} else if (state==TK_STATE_DISABLED) {
- if (linePtr->outline.disabledStipple != None) {
- stipple = linePtr->outline.disabledStipple;
- }
if (linePtr->outline.disabledWidth != linewidth) {
linewidth = linePtr->outline.disabledWidth;
}
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index 175f1c5..307b9b5 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -117,25 +117,17 @@ static int ShouldUseConsoleChannel(type)
DCB dcb;
DWORD consoleParams;
DWORD fileType;
- int mode;
- char *bufMode;
HANDLE handle;
switch (type) {
case TCL_STDIN:
handleId = STD_INPUT_HANDLE;
- mode = TCL_READABLE;
- bufMode = "line";
break;
case TCL_STDOUT:
handleId = STD_OUTPUT_HANDLE;
- mode = TCL_WRITABLE;
- bufMode = "line";
break;
case TCL_STDERR:
handleId = STD_ERROR_HANDLE;
- mode = TCL_WRITABLE;
- bufMode = "none";
break;
default:
return 0;
diff --git a/generic/tkListbox.c b/generic/tkListbox.c
index 0aa66ff..cc73937 100644
--- a/generic/tkListbox.c
+++ b/generic/tkListbox.c
@@ -1821,7 +1821,7 @@ DisplayListbox(clientData)
register Listbox *listPtr = (Listbox *) clientData;
register Tk_Window tkwin = listPtr->tkwin;
GC gc;
- int i, limit, x, y, width, prevSelected, freeGC;
+ int i, limit, x, y, width = 0, prevSelected, freeGC;
Tk_FontMetrics fm;
Tcl_Obj *curElement;
Tcl_HashEntry *entry;