* macosx/tkMacOSXButton.c: sync formatting, whitespace, copyright

	* macosx/tkMacOSXDialog.c:	with core-8-4-branch.
	* macosx/tkMacOSXMenus.c:
	* macosx/tkMacOSXWm.c:
	* xlib/xgc.c
	* library/bgerror.tcl:
	* library/console.tcl:
	* library/menu.tcl:

4 files changed, 16 insertions, 15 deletions

diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index f134e56..d9b1349 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXButton.c,v 1.30 2007/11/08 14:25:59 das Exp $
+ * RCS: @(#) $Id: tkMacOSXButton.c,v 1.31 2007/11/09 06:23:29 das Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -25,6 +25,8 @@
 #define FIRST_DRAW	    2
 #define ACTIVE		    4
 
+#define MAX_VALUE	    2
+
 /*
  * Default insets for controls
  */
@@ -1456,13 +1458,13 @@ TkMacOSXComputeControlParams(
 		|| (butPtr->indicatorOn)) {
 		paramsPtr->initialValue = 1;
 		paramsPtr->minValue = 0;
-		paramsPtr->maxValue = 2;
+		paramsPtr->maxValue = MAX_VALUE;
 		paramsPtr->procID = kControlRadioButtonProc;
 	    } else {
 		paramsPtr->initialValue = 0;
 		paramsPtr->minValue = kControlBehaviorOffsetContents |
 			kControlBehaviorSticky | kControlContentPictHandle;
-		paramsPtr->maxValue = 2;
+		paramsPtr->maxValue = MAX_VALUE;
 		if (butPtr->borderWidth <= 2) {
 		    paramsPtr->procID = kControlBevelButtonSmallBevelProc;
 		} else if (butPtr->borderWidth == 3) {
@@ -1478,13 +1480,13 @@ TkMacOSXComputeControlParams(
 		    || (butPtr->indicatorOn)) {
 		paramsPtr->initialValue = 1;
 		paramsPtr->minValue = 0;
-		paramsPtr->maxValue = 2;
+		paramsPtr->maxValue = MAX_VALUE;
 		paramsPtr->procID = kControlCheckBoxProc;
 	    } else {
 		paramsPtr->initialValue = 0;
 		paramsPtr->minValue = kControlBehaviorOffsetContents |
 			kControlBehaviorSticky | kControlContentPictHandle;
-		paramsPtr->maxValue = 2;
+		paramsPtr->maxValue = MAX_VALUE;
 		if (butPtr->borderWidth <= 2) {
 		    paramsPtr->procID = kControlBevelButtonSmallBevelProc;
 		} else if (butPtr->borderWidth == 3) {
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index cb0d474..5b50345 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.34 2007/11/08 17:37:34 das Exp $
+ * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.35 2007/11/09 06:23:29 das Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -270,7 +270,8 @@ Tk_GetOpenFileObjCmd(
     };
     enum openOptions {
 	OPEN_DEFAULT, OPEN_FILETYPES, OPEN_INITDIR, OPEN_INITFILE,
-	OPEN_MESSAGE, OPEN_MULTIPLE, OPEN_PARENT, OPEN_TITLE, OPEN_TYPEVARIABLE
+	OPEN_MESSAGE, OPEN_MULTIPLE, OPEN_PARENT, OPEN_TITLE,
+	OPEN_TYPEVARIABLE,
     };
 
     if (!fileDlgInited) {
@@ -352,11 +353,9 @@ Tk_GetOpenFileObjCmd(
 	    &selectDesc, &initialDesc) != TCL_OK) {
 	goto end;
     }
-
     if (initialDesc.descriptorType == typeFSRef) {
 	initialPtr = &initialDesc;
     }
-
     if (typeVariablePtr) {
 	initialtype = Tcl_GetVar(interp, Tcl_GetString(typeVariablePtr), 0);
     }
@@ -427,7 +426,7 @@ Tk_GetSaveFileObjCmd(
     };
     enum saveOptions {
 	SAVE_DEFAULT, SAVE_FILETYPES, SAVE_INITDIR, SAVE_INITFILE,
-	SAVE_MESSAGE, SAVE_PARENT, SAVE_TITLE, SAVE_TYPEVARIABLE
+	SAVE_MESSAGE, SAVE_PARENT, SAVE_TITLE, SAVE_TYPEVARIABLE,
     };
 
     if (!fileDlgInited) {
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index b29ed45..1194bf2 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.19 2007/11/04 10:39:14 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.20 2007/11/09 06:23:29 das Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -42,7 +42,6 @@ static Tcl_Obj* GetWidgetDemoPath(Tcl_Interp *interp);
 static OSStatus MenuEventHandlerProc(EventHandlerCallRef callRef,
 	EventRef event, void *userData);
 
-
 
 /*
  *----------------------------------------------------------------------
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 97a6362..d4f6502 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXWm.c,v 1.60 2007/10/26 10:36:42 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.61 2007/11/09 06:23:29 das Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -574,8 +574,9 @@ wrongNumArgs:
 	!= TCL_OK) {
 	return TCL_ERROR;
     }
-    if (!Tk_IsTopLevel(winPtr) &&
-	    (index != WMOPT_MANAGE) && (index != WMOPT_FORGET)) {
+    if (!Tk_IsTopLevel(winPtr)
+	    && (index != WMOPT_MANAGE) && (index != WMOPT_FORGET)
+	    ) {
 	Tcl_AppendResult(interp, "window \"", winPtr->pathName,
 		"\" isn't a top-level window", NULL);
 	return TCL_ERROR;