* macosx/tkMacOSXBitmap.c, macosx/tkMacOSXButton.c:

	* macosx/tkMacOSXCarbonEvents.c, macosx/tkMacOSXClipboard.c:
	* macosx/tkMacOSXCursor.c, macosx/tkMacOSXDialog.c:
	* macosx/tkMacOSXDraw.c, macosx/tkMacOSXEvent.c:
	* macosx/tkMacOSXFont.c, macosx/tkMacOSXInit.c, macosx/tkMacOSXInt.h:
	* macosx/tkMacOSXKeyEvent.c, macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMenubutton.c, macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXScale.c, macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXWm.c: Revert of commits from 2007-04-13 which
	broke the OS X build.

1 files changed, 32 insertions, 30 deletions

diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index a20ac8c..1c8901a 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -54,7 +54,7 @@
  *      software in accordance with the terms specified in this
  *      license.
  *
- * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.19 2007/04/13 14:51:18 dkf Exp $
+ * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.20 2007/04/21 19:06:38 hobbs Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -203,37 +203,39 @@ TkMacOSXProcessWindowEvent(
             sizeof(whichWindow), NULL,
             &whichWindow);
     if (status != noErr) {
-	ERR_MSG("TkMacOSXHandleWindowEvent: Failed to retrieve window");
+#ifdef TK_MAC_DEBUG
+        fprintf ( stderr, "TkMacOSXHandleWindowEvent:Failed to retrieve window" );
+#endif
         return 0;
     }
-
+    
     window = TkMacOSXGetXWindow(whichWindow);
 
     switch (eventPtr->eKind) {
-    case kEventWindowActivated:
-	eventFound |= GenerateActivateEvents(window, 1);
-	eventFound |= TkMacOSXGenerateFocusEvent(window, 1);
-	break;
-    case kEventWindowDeactivated:
-	eventFound |= GenerateActivateEvents(window, 0);
-	eventFound |= TkMacOSXGenerateFocusEvent(window, 0);
-	break;
-    case kEventWindowUpdate:
-	if (GenerateUpdateEvent(window)) {
-	    eventFound = true;
-	}
-	break;
-    case kEventWindowExpanded: {
-	TkDisplay *dispPtr = TkGetDisplayList();
-	TkWindow *winPtr = (TkWindow *)
-		Tk_IdToWindow(dispPtr->display, window);
-
-	if (winPtr) {
-	    TkpWmSetState(winPtr, TkMacOSXIsWindowZoomed(winPtr) ?
-		    ZoomState : NormalState);
-	}
-	break;
-    }
+        case kEventWindowActivated:
+            eventFound |= GenerateActivateEvents(window, 1);
+            eventFound |= TkMacOSXGenerateFocusEvent(window, 1);
+            break;
+        case kEventWindowDeactivated:
+            eventFound |= GenerateActivateEvents(window, 0);
+            eventFound |= TkMacOSXGenerateFocusEvent(window, 0);
+            break;
+        case kEventWindowUpdate:
+            if (GenerateUpdateEvent(window)) {
+                eventFound = true;
+            }
+            break;
+        case kEventWindowExpanded: {
+            TkDisplay *dispPtr;
+            TkWindow  *winPtr;
+            dispPtr = TkGetDisplayList();
+            winPtr = (TkWindow *)Tk_IdToWindow(dispPtr->display, window);
+            if (winPtr) {
+		TkpWmSetState(winPtr, TkMacOSXIsWindowZoomed(winPtr) ?
+			ZoomState : NormalState);
+            }
+            break;
+        }
     }
     return 0;
 }
@@ -243,10 +245,10 @@ TkMacOSXProcessWindowEvent(
  *
  * GenerateUpdateEvent --
  *
- *      Given a Macintosh window update event this function generates all the
- *      Expose XEvents needed by Tk.
+ *      Given a Macintosh window update event this function generates
+ *      all the Expose XEvents needed by Tk.
  *
- * Results:
+ * Results:     
  *      True if event(s) are generated - false otherwise.
  *
  * Side effects: