From a97f5396dbb9c7ea2976a025e9429f809f019989 Mon Sep 17 00:00:00 2001 From: andreask Date: Thu, 30 Aug 2012 17:54:43 +0000 Subject: Unbreak windows problems with commit [961ae24a3f] as well. --- ChangeLog | 3 +++ win/tkWinDialog.c | 4 ++-- win/tkWinMenu.c | 2 +- win/tkWinSend.c | 8 ++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72be7ba..4590f7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ * generic/tkCanvWind.c (CanvasPsWindow): Unbreak AIX, replaced use of C99 comments in commit [961ae24a3f] (2012-08-27) with C89-style. + * win/tkWinDialog.c: Unbreak windows problems with commit [961ae24a3f] + * win/tkWinMenu.c: as well. + * win/tkWinSend.c: 2012-08-28 Jan Nijtmans diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index c64df72..9263830 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -1604,8 +1604,8 @@ ChooseDirectoryValidateProc( * User HAS to select a valid directory. */ - wsprintf(selDir, TEXT("Directory '%s' does not exist,\n" - "please select or enter an existing directory."), + wsprintf(selDir, TEXT("Directory '%s' does not exist,\n") + TEXT("please select or enter an existing directory."), chooseDirSharedData->retDir); MessageBox(NULL, selDir, NULL, MB_ICONEXCLAMATION|MB_OK); chooseDirSharedData->retDir[0] = '\0'; diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 0955de1..26f08f4 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -335,7 +335,7 @@ TkpNewMenu( if (winMenuHdl == NULL) { Tcl_SetObjResult(menuPtr->interp, Tcl_NewStringObj( "No more menus can be allocated.", -1)); - Tcl_SetErrorCode(interp, "TK", "MENU", "SYSTEM_RESOURCES", NULL); + Tcl_SetErrorCode(menuPtr->interp, "TK", "MENU", "SYSTEM_RESOURCES", NULL); return TCL_ERROR; } diff --git a/win/tkWinSend.c b/win/tkWinSend.c index a40c238..43cb741 100644 --- a/win/tkWinSend.c +++ b/win/tkWinSend.c @@ -1,4 +1,4 @@ -`/* +/* * tkWinSend.c -- * * This file provides functions that implement the "send" command, @@ -147,7 +147,7 @@ Tk_SetAppName( if (FAILED(hr)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "failed to initialize the COM library", -1)); - Tcl_SetErrorcode(interp, "TK", "SEND", "COM", NULL); + Tcl_SetErrorCode(interp, "TK", "SEND", "COM", NULL); return ""; } tsdPtr->initialized = 1; @@ -365,7 +365,7 @@ Tk_SendObjCmd( Tcl_SetObjResult(interp, Tcl_NewStringObj( "option not implemented: \"displayof\" is not available" " for this platform.", -1)); - Tcl_SetErrorcode(interp, "TK", "SEND", "DISPLAYOF_WIN", NULL); + Tcl_SetErrorCode(interp, "TK", "SEND", "DISPLAYOF_WIN", NULL); result = TCL_ERROR; } @@ -439,7 +439,7 @@ FindInterpreterObject( } else { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "no application named \"%s\"", name)); - Tcl_SetErrorcode(interp, "TK", "LOOKUP", "APPLICATION", + Tcl_SetErrorCode(interp, "TK", "LOOKUP", "APPLICATION", NULL); result = TCL_ERROR; } -- cgit v0.12