* generic/tkMain.c:

	* macosx/tkMacOSXAppInit.c (removed):
	* macosx/Wish.pbproj/project.pbxproj:
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXInt.h: changes to make TkAqua dynamically loadable,
	enabling [package require Tk] from tclsh. Startup code from
	tkMacOSXAppInit.c moved into tkMacOSXInit.c, added code that
	notifies the window server that an unbundled executable is a full
	GUI application after loading Tk. [Patch 1035348]

	* doc/wm.n: documented [wm attributes] on Mac OS X. [Bug 606665]
	* macosx/tkMacOSXWm.c: implemented TIP 222 [wm attributes -alpha] on
	Mac OS X. [Patch 892194]
	WmIconbitmapCmd: adopted FSRef changes from [wm atttrs -titlepath].

	* macosx/tkMacOSXButton.c:
	* macosx/tkMacOSXMenus.c:
	* macosx/tkMacOSXRegion.c:
	* macosx/tkMacOSXSubwindows.c: synced spacing/formatting with HEAD.

	* macosx/tkMacOSXMouseEvent.c: endianness fixes.

	* macosx/Wish.pbproj/project.pbxproj: corrected path to html help
	inside framework.

	* macosx/Makefile: prevent parallel make from building several
	targets at the same time.
	Ensure that xcodebuild will use Wish.pbproj project even if a .xcode
	project is also present.

1 files changed, 5 insertions, 5 deletions

diff --git a/macosx/tkMacOSXRegion.c b/macosx/tkMacOSXRegion.c
index 0fce0c0..12270f5 100644
--- a/macosx/tkMacOSXRegion.c
+++ b/macosx/tkMacOSXRegion.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXRegion.c,v 1.2 2002/08/31 06:12:30 das Exp $
+ * RCS: @(#) $Id: tkMacOSXRegion.c,v 1.2.2.1 2004/11/11 01:26:43 das Exp $
  */
 
 #include "tkInt.h"
@@ -139,7 +139,7 @@ TkUnionRectWithRegion(
         tmpRgn = NewRgn();
     }
     SetRectRgn(tmpRgn, rectangle->x, rectangle->y,
-        rectangle->x + rectangle->width, rectangle->y + rectangle->height);
+	    rectangle->x + rectangle->width, rectangle->y + rectangle->height);
     UnionRgn(srcRgn, tmpRgn, destRgn);
 }
 
@@ -177,11 +177,11 @@ TkRectInRegion(
     SetRectRgn(rectRgn, x,  y, x + width, y + height);
     SectRgn(rgn, rectRgn, destRgn);
     if (EmptyRgn(destRgn)) {
-            result = RectangleOut;
+	result = RectangleOut;
     } else if (EqualRgn(rgn, destRgn)) {
-            result = RectangleIn;
+	result = RectangleIn;
     } else {
-            result = RectanglePart;
+	result = RectanglePart;
     }
     DisposeRgn(rectRgn);
     DisposeRgn(destRgn);