Merge 9.0

Author: jan.nijtmans

Diff for: tests/filebox.test

@@ -282,8 +282,8 @@ foreach mode $modes {
 test fileDialog-2.7-$mode {"tk_getOpenFile: bad extension" -body {
     #ToPressButton $parent cancel
     set filename [tk_getOpenFile -filetypes {
-        {"Invalid extension" {x.y}}
-        {"All files" {*}}
+	{"Invalid extension" {x.y}}
+	{"All files" {*}}
      }]
      } -result {}
 }

Diff for: unix/tkUnixSysTray.c

@@ -914,7 +914,7 @@ DisplayIcon(
 		icon->offscreenImage = XGetImage(Tk_Display(icon->drawingWin),
 			icon->offscreenPixmap, 0, 0, w, h, AllPlanes, ZPixmap);
 	    }
-	    if (icon->offscreenGC == None) {
+	    if (icon->offscreenGC == NULL) {
 		XGCValues gcv;
 		gcv.function = GXcopy;
 		gcv.plane_mask = AllPlanes;

Diff for: win/tkWinWm.c

@@ -8361,12 +8361,12 @@ TkpWinToplevelWithDraw(
 	     && !(wmPtr->flags & TK_EMBEDDED)
 	     && !(wmPtr->flags & WM_NEVER_MAPPED)
 	     && (wmPtr->containerPtr != NULL)) {
-        exStyle = GetWindowLongPtrW(wmPtr->wrapper, GWL_EXSTYLE);
-        if ( !(exStyle & WS_EX_TOOLWINDOW) ) {
+	exStyle = GetWindowLongPtrW(wmPtr->wrapper, GWL_EXSTYLE);
+	if ( !(exStyle & WS_EX_TOOLWINDOW) ) {
 	    SetWindowLongPtrW(wmPtr->wrapper, GWL_EXSTYLE,
 		     exStyle | WS_EX_TOOLWINDOW);
 	    resetTempStyle=1;
-        }
+	}
     }
 
     wmPtr->flags |= WM_WITHDRAWN;