From ac926c8962ff29dc01aaf033abe31036311c5d28 Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Sun, 25 Aug 2013 03:11:59 +0000
Subject: Fix for 3016181, thanks to Tom Goddard for patch

---
 macosx/tkMacOSXButton.c |  4 ++--
 macosx/tkMacOSXMenu.c   |  2 +-
 macosx/tkMacOSXScrlbr.c |  2 ++
 macosx/tkMacOSXWm.c     | 11 ++++++++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index f912b81..f77a74e 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -429,7 +429,7 @@ ComputeNativeButtonGeometry(
 	}
 	break;
     case TYPE_RADIO_BUTTON:
-    case TYPE_CHECK_BUTTON:
+    case TYPE_CHECK_BUTTON: 
 	if (!haveImage /*|| butPtr->indicatorOn*/) { // TODO: indicatorOn
 	    type = butPtr->type == TYPE_RADIO_BUTTON ?
 		    NSRadioButton : NSSwitchButton;
@@ -454,7 +454,7 @@ ComputeNativeButtonGeometry(
     }
     [button setButtonType:type];
     if (style) {
-	[button setBezelStyle:style];
+       	[button setBezelStyle:style];
     }
     if (highlightsBy) {
 	[cell setHighlightsBy:highlightsBy|[cell highlightsBy]];
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 2b4dbc8..7116050 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -827,7 +827,7 @@ TkpSetWindowMenuBar(
  *
  *----------------------------------------------------------------------
  */
-
+ 
 void
 TkpSetMainMenubar(
     Tcl_Interp *interp,		/* The interpreter of the application */
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index ff91ffd..4b3bc31 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -254,6 +254,8 @@ TkpDestroyScrollbar(
     TkScrollbar *scrollPtr)
 {
     MacScrollbar *macScrollPtr = (MacScrollbar *) scrollPtr;
+    NSScroller *scroller = macScrollPtr->scroller;
+    [scroller setTag:(NSInteger)0];
 
     TkMacOSXMakeCollectableAndRelease(macScrollPtr->scroller);
 }
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index fbc167d..b834766 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -20,6 +20,7 @@
 #include "tkMacOSXWm.h"
 #include "tkMacOSXEvent.h"
 #include "tkMacOSXDebug.h"
+#include <Carbon/Carbon.h>
 
 /*
 #ifdef TK_MAC_DEBUG
@@ -351,6 +352,7 @@ static void		RemapWindows(TkWindow *winPtr,
 	    kHelpWindowClass || winPtr->wmInfoPtr->attributes &
 	    kWindowNoActivatesAttribute)) ? NO : YES;
 }
+
 @end
 
 #pragma mark -
@@ -5187,6 +5189,7 @@ WmWinStyle(
 	{ "brown",		NULL			                     },
 	{ "clear",		NULL			                     },
 	{ "opacity",		NULL			                     },
+	{ "fullscreen",         NULL                                         },
 	{ NULL }
     };
 
@@ -6320,7 +6323,7 @@ TkMacOSXMakeFullscreen(
 	    NSRect bounds = [window contentRectForFrameRect:[window frame]];
 	    NSRect screenBounds = NSMakeRect(0, 0, screenWidth, screenHeight);
 
-	    if (!NSEqualRects(bounds, screenBounds) && !wasFullscreen) {
+    	    if (!NSEqualRects(bounds, screenBounds) && !wasFullscreen) {
 		wmPtr->configX = wmPtr->x;
 		wmPtr->configY = wmPtr->y;
 		wmPtr->configAttributes = wmPtr->attributes;
@@ -6329,7 +6332,8 @@ TkMacOSXMakeFullscreen(
 			wmPtr->configAttributes, wmPtr->flags, 1, 0);
 		wmPtr->flags |= WM_SYNC_PENDING;
 		[window setFrame:[window frameRectForContentRect:
-			screenBounds] display:YES];
+					   screenBounds] display:YES];
+
 		wmPtr->flags &= ~WM_SYNC_PENDING;
 	    }
 	    wmPtr->flags |= WM_FULLSCREEN;
@@ -6347,7 +6351,8 @@ TkMacOSXMakeFullscreen(
 	prevPres = [NSApp presentationOptions];
 	[window setStyleMask: NSBorderlessWindowMask];
 	[NSApp setPresentationOptions: NSApplicationPresentationAutoHideDock
-	                          | NSApplicationPresentationAutoHideMenuBar];
+	     | NSApplicationPresentationAutoHideMenuBar];
+        
 #endif /*TK_GOT_AT_LEAST_SNOW_LEOPARD*/
     } else {
 	wmPtr->flags &= ~WM_FULLSCREEN;
-- 
cgit v0.12