Merge trunk

7 files changed, 13 insertions, 13 deletions

diff --git a/doc/tk_mac.n b/doc/tk_mac.n
index da960ff..6c50281 100644
--- a/doc/tk_mac.n
+++ b/doc/tk_mac.n
@@ -51,7 +51,7 @@ the command is absent, no action will be taken.
 The default Apple Event handler for AEDoScriptHandler. This command,
 if defined, executes a Tcl file when an AppleScript sends a
 .QW "do script"
-command to Wish with a file path as a parameter. 
+command to Wish with a file path as a parameter.
 .TP
 \fB::tk::mac::DoScriptText\fR
 .
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index af24447..631c6e7 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -2857,7 +2857,7 @@ TkCygwinMainEx(
 
     /* construct "<path>/libtk8.?.dll", from "<path>/tk8?.dll" */
     len = GetModuleFileNameW(Tk_GetHINSTANCE(), name, MAX_PATH);
-    name[len-2] = L'.';
+    name[len-2] = '.';
     name[len-1] = name[len-5];
     wcscpy(name+len, L".dll");
     memcpy(name+len-8, L"libtk8", 6 * sizeof(WCHAR));
diff --git a/library/demos/twind.tcl b/library/demos/twind.tcl
index df879e3..45d1da8 100644
--- a/library/demos/twind.tcl
+++ b/library/demos/twind.tcl
@@ -315,7 +315,7 @@ proc changeBg {t c} {
 
 proc embDefBg t {
     set bg [lindex [$t configure -background] 3]
-    changeBg $t $bg 
+    changeBg $t $bg
 }
 
 proc textMakePeer {parent} {
diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
index e8cb211..615192b 100644
--- a/macosx/tkMacOSXBitmap.c
+++ b/macosx/tkMacOSXBitmap.c
@@ -134,7 +134,7 @@ PixmapFromImage(
 {
     TkMacOSXDrawingContext dc;
     Pixmap pixmap;
-    
+
     pixmap = Tk_GetPixmap(display, None, size.width, size.height, 0);
     if (TkMacOSXSetupDrawingContext(pixmap, NULL, 1, &dc)) {
 	if (dc.context) {
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 0f92c70..a189646 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -216,7 +216,7 @@ static void drawMacScrollbar(
     /*
      * Do not display the thumb unless scrolling is possible.
      */
-    
+
     if (scrollPtr->firstFraction > 0.0 || scrollPtr->lastFraction < 1.0) {
 	CGRect thumbBounds = {thumbOrigin, thumbSize};
 	path = CGPathCreateWithRoundedRect(thumbBounds, 4, 4, NULL);
@@ -233,7 +233,7 @@ static void drawMacScrollbar(
     }
 }
 #endif
-	       
+
 void
 TkpDisplayScrollbar(
     ClientData clientData)	/* Information about window. */
@@ -317,7 +317,7 @@ TkpDisplayScrollbar(
 	/*
 	 * Switch back to NSView coordinates and draw a modern scrollbar.
 	 */
-	
+
 	CGContextConcatCTM(dc.context, t);
 	drawMacScrollbar(scrollPtr, msPtr, dc.context);
 #endif
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index b287691..7e6d8e5 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -1374,7 +1374,7 @@ static int GetFileNameVista(Tcl_Interp *interp, OFNOpts *optsPtr,
         src = Tcl_GetString(optsPtr->extObj);
         Tcl_DStringInit(&ds);
         wstr = (LPWSTR) Tcl_UtfToUniCharDString(src, optsPtr->extObj->length, &ds);
-        if (wstr[0] == L'.')
+        if (wstr[0] == '.')
             ++wstr;
         hr = fdlgIf->lpVtbl->SetDefaultExtension(fdlgIf, wstr);
         Tcl_DStringFree(&ds);
diff --git a/win/tkWinInit.c b/win/tkWinInit.c
index 2b86876..7dde247 100644
--- a/win/tkWinInit.c
+++ b/win/tkWinInit.c
@@ -137,21 +137,21 @@ TkpDisplayWarning(
 
     len = MultiByteToWideChar(CP_UTF8, 0, title, -1, titleString, TK_MAX_WARN_LEN);
     msgString = &titleString[len + 1];
-    titleString[TK_MAX_WARN_LEN - 1] = L'\0';
+    titleString[TK_MAX_WARN_LEN - 1] = '\0';
     MultiByteToWideChar(CP_UTF8, 0, msg, -1, msgString, (TK_MAX_WARN_LEN - 1) - len);
     /*
      * Truncate MessageBox string if it is too long to not overflow the screen
      * and cause possible oversized window error.
      */
-    if (titleString[TK_MAX_WARN_LEN - 1] != L'\0') {
+    if (titleString[TK_MAX_WARN_LEN - 1] != '\0') {
 	memcpy(titleString + (TK_MAX_WARN_LEN - 5), L" ...", 5 * sizeof(WCHAR));
     }
     if (IsDebuggerPresent()) {
-	titleString[len - 1] = L':';
-	titleString[len] = L' ';
+	titleString[len - 1] = ':';
+	titleString[len] = ' ';
 	OutputDebugStringW(titleString);
     } else {
-	titleString[len - 1] = L'\0';
+	titleString[len - 1] = '\0';
 	MessageBoxW(NULL, msgString, titleString,
 		MB_OK | MB_ICONEXCLAMATION | MB_SYSTEMMODAL
 		| MB_SETFOREGROUND | MB_TOPMOST);