* 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, 159 insertions, 149 deletions

diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c
index d90791d..8aab83c 100644
--- a/macosx/tkMacOSXScale.c
+++ b/macosx/tkMacOSXScale.c
@@ -1,16 +1,16 @@
-/*
+/* 
  * tkMacOSXScale.c --
  *
- *	This file implements the Macintosh specific portion of the scale
- *	widget.
+ *	This file implements the Macintosh specific portion of the 
+ *	scale widget.
  *
  * Copyright (c) 1996 by Sun Microsystems, Inc.
  * Copyright (c) 1998-2000 by Scriptics Corporation.
  *
- * See the file "license.terms" for information on usage and redistribution of
- * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXScale.c,v 1.9 2007/04/13 14:51:18 dkf Exp $
+ * RCS: @(#) $Id: tkMacOSXScale.c,v 1.10 2007/04/21 19:06:38 hobbs Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -19,7 +19,6 @@
 /*
  * Defines used in this file.
  */
-
 #define slider		1110
 #define inSlider	1
 #define inInc		2
@@ -44,10 +43,10 @@ static ControlActionUPP scaleActionProc = NULL; /* Pointer to func. */
  * Forward declarations for procedures defined later in this file:
  */
 
-static void		MacScaleEventProc(ClientData clientData,
-			    XEvent *eventPtr);
-static pascal void	ScaleActionProc(ControlRef theControl,
-			    ControlPartCode partCode);
+static void		MacScaleEventProc _ANSI_ARGS_((ClientData clientData,
+			    XEvent *eventPtr));
+static pascal void	ScaleActionProc _ANSI_ARGS_((ControlRef theControl,
+			    ControlPartCode partCode));
 
 /*
  *----------------------------------------------------------------------
@@ -66,19 +65,20 @@ static pascal void	ScaleActionProc(ControlRef theControl,
  */
 
 TkScale *
-TkpCreateScale(
-    Tk_Window tkwin)
+TkpCreateScale(tkwin)
+    Tk_Window tkwin;
 {
-    MacScale *macScalePtr = (MacScale *) ckalloc(sizeof(MacScale));
-
+    MacScale *macScalePtr;
+    
+    macScalePtr = (MacScale *) ckalloc(sizeof(MacScale));
     macScalePtr->scaleHandle = NULL;
     if (scaleActionProc == NULL) {
 	scaleActionProc = NewControlActionUPP(ScaleActionProc);
     }
-
+    
     Tk_CreateEventHandler(tkwin, ButtonPressMask,
 	    MacScaleEventProc, (ClientData) macScalePtr);
-
+	    
     return (TkScale *) macScalePtr;
 }
 
@@ -99,15 +99,14 @@ TkpCreateScale(
  */
 
 void
-TkpDestroyScale(
-    TkScale *scalePtr)
+TkpDestroyScale(scalePtr)
+    TkScale *scalePtr;
 {
     MacScale *macScalePtr = (MacScale *) scalePtr;
-
+    
     /*
      * Free Macintosh control.
      */
-
     if (macScalePtr->scaleHandle != NULL) {
         DisposeControl(macScalePtr->scaleHandle);
     }
@@ -118,8 +117,8 @@ TkpDestroyScale(
  *
  * TkpDisplayScale --
  *
- *	This procedure is invoked as an idle handler to redisplay the contents
- *	of a scale widget.
+ *	This procedure is invoked as an idle handler to redisplay
+ *	the contents of a scale widget.
  *
  * Results:
  *	None.
@@ -131,8 +130,8 @@ TkpDestroyScale(
  */
 
 void
-TkpDisplayScale(
-    ClientData clientData)	/* Widget record for scale. */
+TkpDisplayScale(clientData)
+    ClientData clientData;	/* Widget record for scale. */
 {
     TkScale *scalePtr = (TkScale *) clientData;
     Tk_Window tkwin = scalePtr->tkwin;
@@ -142,13 +141,19 @@ TkpDisplayScale(
     MacScale *macScalePtr = (MacScale *) clientData;
     Rect r;
     WindowRef windowRef;
-    CGrafPtr destPort, saveWorld;
+    CGrafPtr destPort;        
+    CGrafPtr saveWorld;
     GDHandle saveDevice;
     MacDrawable *macDraw;
-    SInt32 initialValue, minValue, maxValue;
-    UInt16 numTicks;
-
-    ERR_MSG("TkpDisplayScale");
+    SInt32       initialValue;
+    SInt32       minValue;
+    SInt32       maxValue;
+    UInt16       numTicks;
+    
+
+#ifdef TK_MAC_DEBUG
+    fprintf(stderr,"TkpDisplayScale\n");
+#endif
     scalePtr->flags &= ~REDRAW_PENDING;
     if ((scalePtr->tkwin == NULL) || !Tk_IsMapped(scalePtr->tkwin)) {
 	goto done;
@@ -162,7 +167,8 @@ TkpDisplayScale(
     if ((scalePtr->flags & INVOKE_COMMAND) && (scalePtr->command != NULL)) {
 	Tcl_Preserve((ClientData) interp);
 	sprintf(string, scalePtr->format, scalePtr->value);
-	result = Tcl_VarEval(interp, scalePtr->command, " ", string, NULL);
+	result = Tcl_VarEval(interp, scalePtr->command, " ", string,
+		(char *) NULL);
 	if (result != TCL_OK) {
 	    Tcl_AddErrorInfo(interp, "\n    (command executed by scale)");
 	    Tcl_BackgroundError(interp);
@@ -177,13 +183,15 @@ TkpDisplayScale(
     Tcl_Release((ClientData) scalePtr);
 
     /*
-     * Now handle the part of redisplay that is the same for horizontal and
-     * vertical scales: border and traversal highlight.
+     * Now handle the part of redisplay that is the same for
+     * horizontal and vertical scales:  border and traversal
+     * highlight.
      */
 
     if (scalePtr->highlightWidth != 0) {
-	GC gc = Tk_GCForColor(scalePtr->highlightColorPtr,Tk_WindowId(tkwin));
-
+	GC gc;
+    
+	gc = Tk_GCForColor(scalePtr->highlightColorPtr, Tk_WindowId(tkwin));
 	Tk_DrawFocusHighlight(tkwin, gc, scalePtr->highlightWidth,
 		Tk_WindowId(tkwin));
     }
@@ -196,7 +204,6 @@ TkpDisplayScale(
     /*
      * Set up port for drawing Macintosh control.
      */
-
     macDraw = (MacDrawable *) Tk_WindowId(tkwin);
     destPort = TkMacOSXGetDrawablePort(Tk_WindowId(tkwin));
     windowRef = GetWindowFromPort(destPort);
@@ -211,76 +218,79 @@ TkpDisplayScale(
 #define MAC_OSX_SCROLL_WIDTH 10
 
     if (scalePtr->orient == ORIENT_HORIZONTAL) {
-	int offset = (Tk_Height(tkwin) - MAC_OSX_SCROLL_WIDTH)/2;
-
-	if (offset < 0) {
-	    offset = 0;
-	}
-
-	r.left = macDraw->xOff + scalePtr->inset;
-	r.top = macDraw->yOff + offset;
-	r.right = macDraw->xOff+Tk_Width(tkwin) - scalePtr->inset;
-	r.bottom = macDraw->yOff + offset + MAC_OSX_SCROLL_WIDTH/2;
+        int offset;
+        offset = (Tk_Height(tkwin) - MAC_OSX_SCROLL_WIDTH)/2;
+        if (offset < 0) {
+            offset = 0;
+        }
+        
+        r.left = macDraw->xOff + scalePtr->inset;
+        r.top = macDraw->yOff + offset;
+        r.right = macDraw->xOff+Tk_Width(tkwin) - scalePtr->inset;
+        r.bottom = macDraw->yOff + offset + MAC_OSX_SCROLL_WIDTH/2;
     } else {
-	int offset = (Tk_Width(tkwin) - MAC_OSX_SCROLL_WIDTH)/2;
-
-	if (offset < 0) {
-	    offset = 0;
-	}
-
-	r.left = macDraw->xOff + offset;
-	r.top = macDraw->yOff + scalePtr->inset;
-	r.right = macDraw->xOff + offset + MAC_OSX_SCROLL_WIDTH/2;
-	r.bottom = macDraw->yOff+Tk_Height(tkwin) - scalePtr->inset;
+        int offset;
+    
+        offset = (Tk_Width(tkwin) - MAC_OSX_SCROLL_WIDTH)/2;
+        if (offset < 0) {
+            offset = 0;
+        }
+        
+        r.left = macDraw->xOff + offset;
+        r.top = macDraw->yOff + scalePtr->inset;
+        r.right = macDraw->xOff + offset + MAC_OSX_SCROLL_WIDTH/2;
+        r.bottom = macDraw->yOff+Tk_Height(tkwin) - scalePtr->inset;
     }
 
     if (macScalePtr->scaleHandle == NULL) {
-	ERR_MSG("Initialising scale");
-
-	initialValue = scalePtr->value;
-	if (scalePtr->orient == ORIENT_HORIZONTAL) {
-	    minValue = scalePtr->fromValue;
-	    maxValue = scalePtr->toValue;
-	} else {
-	    minValue = scalePtr->fromValue;
-	    maxValue = scalePtr->toValue;
-	}
-
-	if (scalePtr->tickInterval == 0) {
-	    numTicks = 0;
-	} else {
-	    numTicks = (maxValue - minValue)/scalePtr->tickInterval;
-	}
-
-	CreateSliderControl(windowRef, &r, initialValue, minValue, maxValue,
-		kControlSliderPointsDownOrRight, numTicks, 1, scaleActionProc,
-		&(macScalePtr->scaleHandle));
-	SetControlReference(macScalePtr->scaleHandle, (UInt32) scalePtr);
+        
+#ifdef TK_MAC_DEBUG
+        fprintf(stderr,"Initialising scale\n");
+#endif
+
+        initialValue = scalePtr->value;
+        if (scalePtr->orient == ORIENT_HORIZONTAL) {
+            minValue = scalePtr->fromValue;
+            maxValue = scalePtr->toValue;
+        } else {
+            minValue = scalePtr->fromValue;
+            maxValue = scalePtr->toValue;
+        }
+        
+        if (scalePtr->tickInterval == 0) {
+            numTicks = 0;
+        } else {
+            numTicks = (maxValue - minValue)/scalePtr->tickInterval;
+        }
+                
+        CreateSliderControl(windowRef, &r, initialValue, minValue, maxValue,
+                kControlSliderPointsDownOrRight, numTicks, 
+                1, scaleActionProc, 
+                &(macScalePtr->scaleHandle));
+        SetControlReference(macScalePtr->scaleHandle, (UInt32) scalePtr);
 
 	/*
 	 * If we are foremost than make us active.
 	 */
-
 	if (windowRef == FrontWindow()) {
 	    macScalePtr->flags |= ACTIVE;
 	}
     } else {
-	SetControlBounds(macScalePtr->scaleHandle, &r);
-	SetControl32BitValue(macScalePtr->scaleHandle, scalePtr->value);
-	SetControl32BitMinimum(macScalePtr->scaleHandle, scalePtr->fromValue);
-	SetControl32BitMaximum(macScalePtr->scaleHandle, scalePtr->toValue);
+        SetControlBounds(macScalePtr->scaleHandle, &r);
+        SetControl32BitValue(macScalePtr->scaleHandle, scalePtr->value);
+        SetControl32BitMinimum(macScalePtr->scaleHandle, scalePtr->fromValue);
+        SetControl32BitMaximum(macScalePtr->scaleHandle, scalePtr->toValue);
     }
 
     /*
      * Finally draw the control.
      */
-
     SetControlVisibility(macScalePtr->scaleHandle,true,true);
     HiliteControl(macScalePtr->scaleHandle,0);
     Draw1Control(macScalePtr->scaleHandle);
 
     SetGWorld(saveWorld, saveDevice);
-  done:
+done:
     scalePtr->flags &= ~REDRAW_ALL;
 }
 
@@ -289,12 +299,13 @@ TkpDisplayScale(
  *
  * TkpScaleElement --
  *
- *	Determine which part of a scale widget lies under a given point.
+ *	Determine which part of a scale widget lies under a given
+ *	point.
  *
  * Results:
- *	The return value is either TROUGH1, SLIDER, TROUGH2, or OTHER,
- *	depending on which of the scale's active elements (if any) is under
- *	the point at (x,y).
+ *	The return value is either TROUGH1, SLIDER, TROUGH2, or
+ *	OTHER, depending on which of the scale's active elements
+ *	(if any) is under the point at (x,y).
  *
  * Side effects:
  *	None.
@@ -303,9 +314,9 @@ TkpDisplayScale(
  */
 
 int
-TkpScaleElement(
-    TkScale *scalePtr,		/* Widget record for scale. */
-    int x, int y)		/* Coordinates within scalePtr's window. */
+TkpScaleElement(scalePtr, x, y)
+    TkScale *scalePtr;		/* Widget record for scale. */
+    int x, y;			/* Coordinates within scalePtr's window. */
 {
     MacScale *macScalePtr = (MacScale *) scalePtr;
     ControlPartCode part;
@@ -313,9 +324,10 @@ TkpScaleElement(
     Rect bounds;
     CGrafPtr saveWorld;
     GDHandle saveDevice;
-    GWorldPtr destPort;
-
-    ERR_MSG("TkpScaleElement");
+    GWorldPtr destPort;        
+#ifdef TK_MAC_DEBUG
+    fprintf(stderr,"TkpScaleElement\n");
+#endif
 
     destPort = TkMacOSXGetDrawablePort(Tk_WindowId(scalePtr->tkwin));
     GetGWorld(&saveWorld, &saveDevice);
@@ -323,35 +335,37 @@ TkpScaleElement(
 
     /*
      * All of the calculations in this procedure mirror those in
-     * DisplayScrollbar. Be sure to keep the two consistent.
+     * DisplayScrollbar.  Be sure to keep the two consistent.
      */
 
-    TkMacOSXWinBounds((TkWindow *) scalePtr->tkwin, &bounds);
+    TkMacOSXWinBounds((TkWindow *) scalePtr->tkwin, &bounds);		
     where.h = x + bounds.left;
     where.v = y + bounds.top;
     part = TestControl(macScalePtr->scaleHandle, where);
-
+    
     SetGWorld(saveWorld, saveDevice);
 
-    ERR_MSG("ScalePart %d, pos ( %d %d )", part, where.h, where.v);
-
+#ifdef TK_MAC_DEBUG
+    fprintf (stderr,"ScalePart %d, pos ( %d %d )\n", part, where.h, where.v );
+#endif
+    
     switch (part) {
-    case inSlider:
-	return SLIDER;
-    case inInc:
-	if (scalePtr->orient == ORIENT_VERTICAL) {
-	    return TROUGH1;
-	} else {
-	    return TROUGH2;
-	}
-    case inDecr:
-	if (scalePtr->orient == ORIENT_VERTICAL) {
-	    return TROUGH2;
-	} else {
-	    return TROUGH1;
-	}
-    default:
-	return OTHER;
+    	case inSlider:
+	    return SLIDER;
+    	case inInc:
+	    if (scalePtr->orient == ORIENT_VERTICAL) {
+		return TROUGH1;
+	    } else {
+		return TROUGH2;
+	    }
+    	case inDecr:
+	    if (scalePtr->orient == ORIENT_VERTICAL) {
+		return TROUGH2;
+	    } else {
+		return TROUGH1;
+	    }
+    	default:
+	    return OTHER;
     }
 }
 
@@ -360,23 +374,23 @@ TkpScaleElement(
  *
  * MacScaleEventProc --
  *
- *	This procedure is invoked by the Tk dispatcher for ButtonPress events
- *	on scales.
+ *	This procedure is invoked by the Tk dispatcher for 
+ *	ButtonPress events on scales.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	When the window gets deleted, internal structures get cleaned up. When
- *	it gets exposed, it is redisplayed.
+ *	When the window gets deleted, internal structures get
+ *	cleaned up.  When it gets exposed, it is redisplayed.
  *
  *--------------------------------------------------------------
  */
 
 static void
-MacScaleEventProc(
-    ClientData clientData,	/* Information about window. */
-    XEvent *eventPtr)		/* Information about event. */
+MacScaleEventProc(clientData, eventPtr)
+    ClientData clientData;	/* Information about window. */
+    XEvent *eventPtr;		/* Information about event. */
 {
     MacScale *macScalePtr = (MacScale *) clientData;
     Point where;
@@ -386,43 +400,44 @@ MacScaleEventProc(
     GDHandle saveDevice;
     GWorldPtr destPort;
 
-    ERR_MSG("MacScaleEventProc");
-
+#ifdef TK_MAC_DEBUG
+    fprintf(stderr,"MacScaleEventProc\n" );
+#endif
     /*
-     * To call Macintosh control routines we must have the port set to the
-     * window containing the control. We will then test which part of the
-     * control was hit and act accordingly.
+     * To call Macintosh control routines we must have the port
+     * set to the window containing the control.  We will then test
+     * which part of the control was hit and act accordingly.
      */
-
     destPort = TkMacOSXGetDrawablePort(Tk_WindowId(macScalePtr->info.tkwin));
     GetGWorld(&saveWorld, &saveDevice);
     SetGWorld(destPort, NULL);
     TkMacOSXSetUpClippingRgn(Tk_WindowId(macScalePtr->info.tkwin));
 
-    TkMacOSXWinBounds((TkWindow *) macScalePtr->info.tkwin, &bounds);
+    TkMacOSXWinBounds((TkWindow *) macScalePtr->info.tkwin, &bounds);		
     where.h = eventPtr->xbutton.x + bounds.left;
     where.v = eventPtr->xbutton.y + bounds.top;
-    ERR_MSG("calling TestControl");
+#ifdef TK_MAC_DEBUG
+    fprintf(stderr,"calling TestControl\n");
+#endif
     part = TestControl(macScalePtr->scaleHandle, where);
     if (part == 0) {
 	return;
     }
-
+    
     part = TrackControl(macScalePtr->scaleHandle, where, scaleActionProc);
-
+    
     /*
      * Update the value for the widget.
      */
-
     macScalePtr->info.value = GetControlValue(macScalePtr->scaleHandle);
     /* TkScaleSetValue(&macScalePtr->info, macScalePtr->info.value, 1, 0); */
 
     /*
-     * The TrackControl call will "eat" the ButtonUp event. We now generate a
-     * ButtonUp event so Tk will unset implicit grabs etc.
+     * The TrackControl call will "eat" the ButtonUp event.  We now
+     * generate a ButtonUp event so Tk will unset implicit grabs etc.
      */
-
     TkGenerateButtonEventForXPointer(Tk_WindowId(macScalePtr->info.tkwin));
+
     SetGWorld(saveWorld, saveDevice);
 }
 
@@ -431,9 +446,9 @@ MacScaleEventProc(
  *
  * ScaleActionProc --
  *
- *	Callback procedure used by the Macintosh toolbox call TrackControl.
- *	This call will update the display while the scrollbar is being
- *	manipulated by the user.
+ *	Callback procedure used by the Macintosh toolbox call
+ *	TrackControl.  This call will update the display while
+ *	the scrollbar is being manipulated by the user.
  *
  * Results:
  *	None.
@@ -452,18 +467,13 @@ ScaleActionProc(
     int value;
     TkScale *scalePtr = (TkScale *) GetControlReference(theControl);
 
-    ERR_MSG("ScaleActionProc");
-    value = GetControlValue(theControl);
+#ifdef TK_MAC_DEBUG
+    fprintf(stderr,"ScaleActionProc\n");
+#endif
+    value =  GetControlValue(theControl);
     TkScaleSetValue(scalePtr, value, 1, 1);
     Tcl_Preserve((ClientData) scalePtr);
     Tcl_DoOneEvent(TCL_IDLE_EVENTS);
     Tcl_Release((ClientData) scalePtr);
 }
-
-/*
- * Local Variables:
- * mode: c
- * c-basic-offset: 4
- * fill-column: 78
- * End:
- */
+