summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2011-08-16 08:15:48 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2011-08-16 08:15:48 (GMT)
commit6bbf480a398c0d9f2a74f237213633d8687e271b (patch)
tree69d6c8405ca5790ebbc70cb34914e1722804ad88
parent40e55732d3ae5d793292ceedc7c7ab9b3305a0b1 (diff)
parentfb4440681afebe563603f66b8dc97cb1f831d5ea (diff)
downloadtk-6bbf480a398c0d9f2a74f237213633d8687e271b.zip
tk-6bbf480a398c0d9f2a74f237213633d8687e271b.tar.gz
tk-6bbf480a398c0d9f2a74f237213633d8687e271b.tar.bz2
[Bug 3388350] mingw64 compiler warnings
-rw-r--r--ChangeLog7
-rw-r--r--win/tkWinDialog.c6
-rw-r--r--win/tkWinDraw.c2
-rw-r--r--win/tkWinSend.c3
-rw-r--r--win/tkWinSendCom.c3
5 files changed, 12 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index e8c5f29..1785edf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-16 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * win/tkWinDialog.c: [Bug 3388350] mingw64 compiler warnings
+ * win/tkWinDraw.c
+ * win/tkWinSend.c
+ * win/tkWinSendCom.c
+
2011-08-13 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tkBitmap.c: [Bug 3388350] mingw64 compiler warnings
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 36747b0..4110848 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -592,7 +592,7 @@ GetFileNameW(
OFNData ofnData;
int cdlgerr;
int filterIndex = 0, result = TCL_ERROR, winCode, oldMode, i, multi = 0;
- char *extension = NULL, *filter = NULL, *title = NULL;
+ char *extension = NULL, *title = NULL;
Tk_Window tkwin = (Tk_Window) clientData;
HWND hWnd;
Tcl_Obj *filterObj = NULL, *initialTypeObj = NULL, *typeVariableObj = NULL;
@@ -719,7 +719,6 @@ GetFileNameW(
&filterIndex) != TCL_OK) {
goto end;
}
- filter = Tcl_DStringValue(&utfFilterString);
Tk_MakeWindowExist(tkwin);
hWnd = Tk_GetHWND(Tk_WindowId(tkwin));
@@ -1133,7 +1132,7 @@ GetFileNameA(
OFNData ofnData;
int cdlgerr;
int filterIndex = 0, result = TCL_ERROR, winCode, oldMode, i, multi = 0;
- char *extension = NULL, *filter = NULL, *title = NULL;
+ char *extension = NULL, *title = NULL;
Tk_Window tkwin = (Tk_Window) clientData;
HWND hWnd;
Tcl_Obj *filterObj = NULL, *initialTypeObj = NULL, *typeVariableObj = NULL;
@@ -1258,7 +1257,6 @@ GetFileNameA(
&filterIndex) != TCL_OK) {
goto end;
}
- filter = Tcl_DStringValue(&utfFilterString);
Tk_MakeWindowExist(tkwin);
hWnd = Tk_GetHWND(Tk_WindowId(tkwin));
diff --git a/win/tkWinDraw.c b/win/tkWinDraw.c
index 4dc184c..366fc61 100644
--- a/win/tkWinDraw.c
+++ b/win/tkWinDraw.c
@@ -744,7 +744,7 @@ RenderObject(
HPEN pen,
WinDrawFunc func)
{
- RECT rect;
+ RECT rect = {0, 0, 0, 0};
HPEN oldPen;
HBRUSH oldBrush;
POINT *winPoints = ConvertPoints(points, npoints, mode, &rect);
diff --git a/win/tkWinSend.c b/win/tkWinSend.c
index dfece32..4b25963 100644
--- a/win/tkWinSend.c
+++ b/win/tkWinSend.c
@@ -996,12 +996,11 @@ SendEventProc(
Tcl_Event *eventPtr,
int flags)
{
- int result = TCL_OK;
SendEvent *evPtr = (SendEvent *)eventPtr;
TRACE("SendEventProc\n");
- result = Tcl_EvalObjEx(evPtr->interp, evPtr->cmdPtr,
+ Tcl_EvalObjEx(evPtr->interp, evPtr->cmdPtr,
TCL_EVAL_DIRECT | TCL_EVAL_GLOBAL);
Tcl_DecrRefCount(evPtr->cmdPtr);
diff --git a/win/tkWinSendCom.c b/win/tkWinSendCom.c
index 59e2b69..3bbdd63 100644
--- a/win/tkWinSendCom.c
+++ b/win/tkWinSendCom.c
@@ -372,7 +372,6 @@ Async(
UINT *puArgErr)
{
HRESULT hr = S_OK;
- int result = TCL_OK;
VARIANT vCmd;
VariantInit(&vCmd);
@@ -389,7 +388,7 @@ Async(
if (obj->interp) {
Tcl_Obj *scriptPtr = Tcl_NewUnicodeObj(vCmd.bstrVal,
(int)SysStringLen(vCmd.bstrVal));
- result = TkWinSend_QueueCommand(obj->interp, scriptPtr);
+ TkWinSend_QueueCommand(obj->interp, scriptPtr);
}
}