Lots of small changes to make code more pretty and C89-like.

7 files changed, 185 insertions, 142 deletions

diff --git a/macosx/tkMacOSXCarbonEvents.c b/macosx/tkMacOSXCarbonEvents.c
index 32ddaab..f7f04c4 100644
--- a/macosx/tkMacOSXCarbonEvents.c
+++ b/macosx/tkMacOSXCarbonEvents.c
@@ -60,7 +60,7 @@
  *	software in accordance with the terms specified in this
  *	license.
  *
- * RCS: @(#) $Id: tkMacOSXCarbonEvents.c,v 1.20 2008/06/19 00:16:11 das Exp $
+ * RCS: @(#) $Id: tkMacOSXCarbonEvents.c,v 1.21 2008/11/08 18:44:40 dkf Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -588,7 +588,8 @@ TkMacOSXStopTclEventLoopCarbonTimer(void)
  */
 
 MODULE_SCOPE void
-TkMacOSXTrackingLoop(int tracking)
+TkMacOSXTrackingLoop(
+    int tracking)
 {
     static int previousServiceMode = TCL_SERVICE_NONE;
 
diff --git a/macosx/tkMacOSXDebug.c b/macosx/tkMacOSXDebug.c
index 0065b68..c9ac88c 100644
--- a/macosx/tkMacOSXDebug.c
+++ b/macosx/tkMacOSXDebug.c
@@ -54,7 +54,7 @@
  *	software in accordance with the terms specified in this
  *	license.
  *
- * RCS: @(#) $Id: tkMacOSXDebug.c,v 1.21 2008/10/27 11:55:44 dkf Exp $
+ * RCS: @(#) $Id: tkMacOSXDebug.c,v 1.22 2008/11/08 18:44:40 dkf Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -251,7 +251,8 @@ static MyEventName classicEventNames [] = {
 #endif /* TK_MACOSXDEBUG_UNUSED */
 
 MODULE_SCOPE char *
-TkMacOSXCarbonEventToAscii(EventRef eventRef)
+TkMacOSXCarbonEventToAscii(
+    EventRef eventRef)
 {
     EventClass eventClass;
     EventKind eventKind;
@@ -292,33 +293,35 @@ TkMacOSXCarbonEventToAscii(EventRef eventRef)
 
 #ifdef TK_MACOSXDEBUG_UNUSED
 MODULE_SCOPE char *
-TkMacOSXCarbonEventKindToAscii(EventRef eventRef, char *buf)
+TkMacOSXCarbonEventKindToAscii(
+    EventRef eventRef,
+    char *buf)
 {
-   EventClass eventClass;
-   EventKind eventKind;
-   MyEventNameList *list = eventNameList;
-   MyEventName *names = NULL;
-   int found = 0;
-
-   eventClass = GetEventClass(eventRef);
-   eventKind = GetEventKind(eventRef);
-   while (list->names && (!names) ) {
-       if (eventClass == list -> c) {
-	   names = list -> names;
-       } else {
-	   list++;
-       }
-   }
-   if (names) {
-       found = 0;
-       while (names->name && !found) {
-	   if (eventKind == names->kind) {
-	       sprintf(buf,"%s",names->name);
-	       found = 1;
-	   } else {
-	       names++;
-	   }
-       }
+    EventClass eventClass;
+    EventKind eventKind;
+    MyEventNameList *list = eventNameList;
+    MyEventName *names = NULL;
+    int found = 0;
+
+    eventClass = GetEventClass(eventRef);
+    eventKind = GetEventKind(eventRef);
+    while (list->names && (!names) ) {
+	if (eventClass == list -> c) {
+	    names = list -> names;
+	} else {
+	    list++;
+	}
+    }
+    if (names) {
+	found = 0;
+	while (names->name && !found) {
+	    if (eventKind == names->kind) {
+		sprintf(buf,"%s",names->name);
+		found = 1;
+	    } else {
+		names++;
+	    }
+	}
     }
     if (!found) {
 	sprintf(buf,"%d", eventKind);
@@ -329,7 +332,9 @@ TkMacOSXCarbonEventKindToAscii(EventRef eventRef, char *buf)
 }
 
 MODULE_SCOPE char *
-TkMacOSXClassicEventToAscii(EventRecord *eventPtr, char *buf)
+TkMacOSXClassicEventToAscii(
+    EventRecord *eventPtr,
+    char *buf)
 {
     MyEventName *names = NULL;
     int found = 0;
@@ -354,17 +359,20 @@ TkMacOSXClassicEventToAscii(EventRecord *eventPtr, char *buf)
 		(int) eventPtr->message, eventPtr->modifiers, buf);
     }
     return buf;
-
 }
 
 MODULE_SCOPE void
-TkMacOSXPrintPoint(char *tag, Point *p)
+TkMacOSXPrintPoint(
+    char *tag,
+    Point *p)
 {
     TkMacOSXDbgMsg("%s %4d %4d", tag,p->h,p->v );
 }
 
 MODULE_SCOPE void
-TkMacOSXPrintRect(char *tag, Rect *r)
+TkMacOSXPrintRect(
+    char *tag,
+    Rect *r)
 {
     TkMacOSXDbgMsg("%s %4d %4d %4d %4d (%dx%d)",
 	    tag, r->left, r->top, r->right, r->bottom,
@@ -372,20 +380,26 @@ TkMacOSXPrintRect(char *tag, Rect *r)
 }
 
 MODULE_SCOPE void
-TkMacOSXPrintRegion(char *tag, RgnHandle rgn)
+TkMacOSXPrintRegion(
+    char *tag,
+    RgnHandle rgn)
 {
     Rect r;
+
     GetRegionBounds(rgn,&r);
     TkMacOSXPrintRect(tag,&r);
 }
 
 MODULE_SCOPE void
-TkMacOSXPrintWindowTitle(char *tag, WindowRef window)
+TkMacOSXPrintWindowTitle(
+    char *tag,
+    WindowRef window)
 {
     Str255 title;
-    GetWTitle(window,title);
+
+    GetWTitle(window, title);
     title[title[0] + 1] = 0;
-    TkMacOSXDbgMsg("%s %s", tag, title +1 );
+    TkMacOSXDbgMsg("%s %s", tag, title+1);
 }
 
 typedef struct {
@@ -408,15 +422,16 @@ static MsgName msgNames [] = {
 };
 
 MODULE_SCOPE char *
-TkMacOSXMenuMessageToAscii(int msg, char *s)
+TkMacOSXMenuMessageToAscii(
+    int msg,
+    char *s)
 {
     MsgName *msgNamePtr;
-    for (msgNamePtr = msgNames;msgNamePtr->name;) {
+
+    for (msgNamePtr=msgNames ; msgNamePtr->name ; msgNamePtr++) {
 	if (msgNamePtr->msg == msg) {
 	   strcpy(s,msgNamePtr->name);
 	   return s;
-	} else {
-	    msgNamePtr++;
 	}
     }
     sprintf(s, "unknown : %d", msg);
@@ -436,9 +451,12 @@ static MsgName trackingNames [] = {
 };
 
 MODULE_SCOPE char *
-TkMacOSXMouseTrackingResultToAscii(MouseTrackingResult r, char *buf)
+TkMacOSXMouseTrackingResultToAscii(
+    MouseTrackingResult r,
+    char *buf)
 {
     MsgName *namePtr;
+
     for (namePtr = trackingNames; namePtr->name; namePtr++) {
 	if (namePtr->msg == r) {
 	    strcpy(buf, namePtr->name);
@@ -510,10 +528,11 @@ TkMacOSXDebugFlashRegion(
 
 MODULE_SCOPE void *
 TkMacOSXGetNamedDebugSymbol(
-    const char* module,
-    const char* symbol)
+    const char *module,
+    const char *symbol)
 {
     void *addr = TkMacOSXGetNamedSymbol(module, symbol);
+
 #ifndef __LP64__
     if (!addr) {
 	const struct mach_header *mh = NULL;
@@ -616,5 +635,11 @@ TkMacOSXGetNamedDebugSymbol(
 #endif /* __LP64__ */
     return addr;
 }
-
 #endif /* TK_MAC_DEBUG */
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/macosx/tkMacOSXEntry.c b/macosx/tkMacOSXEntry.c
index a0b458e..46c6a00 100644
--- a/macosx/tkMacOSXEntry.c
+++ b/macosx/tkMacOSXEntry.c
@@ -53,23 +53,22 @@
  *	software in accordance with the terms specified in this
  *	license.
  *
- * RCS: @(#) $Id: tkMacOSXEntry.c,v 1.14 2007/12/13 15:27:09 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXEntry.c,v 1.15 2008/11/08 18:44:40 dkf Exp $
  */
 
 #include "tkMacOSXPrivate.h"
 #include "tkMacOSXDefault.h"
 #include "tkEntry.h"
 
-static ThemeButtonKind ComputeIncDecParameters (int height, int *width);
-
+static ThemeButtonKind	ComputeIncDecParameters(int height, int *width);
+
 /*
  *--------------------------------------------------------------
  *
  * ComputeIncDecParameters --
  *
- *	This procedure figures out which of the kThemeIncDec
- *	buttons to use. It also sets width to the width of the
- *	IncDec button.
+ *	This procedure figures out which of the kThemeIncDec buttons to use.
+ *	It also sets width to the width of the IncDec button.
  *
  * Results:
  *	The ThemeButtonKind of the button we should use.
@@ -79,8 +78,11 @@ static ThemeButtonKind ComputeIncDecParameters (int height, int *width);
  *
  *--------------------------------------------------------------
  */
+
 static ThemeButtonKind
-ComputeIncDecParameters(int height, int *width)
+ComputeIncDecParameters(
+    int height,
+    int *width)
 {
     ThemeButtonKind kind;
 
@@ -112,18 +114,17 @@ ComputeIncDecParameters(int height, int *width)
 
     return kind;
 }
-
+
 /*
  *--------------------------------------------------------------
  *
  * TkpDrawEntryBorderAndFocus --
  *
- *	This procedure redraws the border of an entry window.
- *	It overrides the generic border drawing code if the
- *	entry widget parameters are such that the native widget
- *	drawing is a good fit.
- *	This version just returns 1, so platforms that don't
- *	do special native drawing don't have to implement it.
+ *	This procedure redraws the border of an entry window. It overrides the
+ *	generic border drawing code if the entry widget parameters are such
+ *	that the native widget drawing is a good fit. This version just
+ *	returns 1, so platforms that don't do special native drawing don't
+ *	have to implement it.
  *
  * Results:
  *	1 if it has drawn the border, 0 if not.
@@ -133,8 +134,12 @@ ComputeIncDecParameters(int height, int *width)
  *
  *--------------------------------------------------------------
  */
+
 int
-TkpDrawEntryBorderAndFocus(Entry *entryPtr, Drawable d, int isSpinbox)
+TkpDrawEntryBorderAndFocus(
+    Entry *entryPtr,
+    Drawable d,
+    int isSpinbox)
 {
     Rect bounds;
     TkMacOSXDrawingContext dc;
@@ -145,9 +150,9 @@ TkpDrawEntryBorderAndFocus(Entry *entryPtr, Drawable d, int isSpinbox)
     MacDrawable *macDraw = (MacDrawable *) d;
 
     /*
-     * I use 6 as the borderwidth. 2 of the 5 go into the actual frame the
-     * 3 are because the Mac OS Entry widgets leave more space around the
-     * Text than Tk does on X11.
+     * I use 6 as the borderwidth. 2 of the 5 go into the actual frame the 3
+     * are because the Mac OS Entry widgets leave more space around the Text
+     * than Tk does on X11.
      */
 
     if (entryPtr->borderWidth != MAC_OSX_ENTRY_BORDER
@@ -157,9 +162,9 @@ TkpDrawEntryBorderAndFocus(Entry *entryPtr, Drawable d, int isSpinbox)
     }
 
     /*
-     * For the spinbox, we have to make the entry part smaller by the size
-     * of the buttons. We also leave 2 pixels to the left (as per the HIG)
-     * and space for one pixel to the right, 'cause it makes the buttons look
+     * For the spinbox, we have to make the entry part smaller by the size of
+     * the buttons. We also leave 2 pixels to the left (as per the HIG) and
+     * space for one pixel to the right, 'cause it makes the buttons look
      * nicer.
      */
 
@@ -175,17 +180,17 @@ TkpDrawEntryBorderAndFocus(Entry *entryPtr, Drawable d, int isSpinbox)
     }
 
    /*
-    * The focus ring is drawn with an Alpha at the outside
-    * part of the ring, so we have to draw over the edges of the
-    * ring before drawing the focus or the text will peep through.
+    * The focus ring is drawn with an Alpha at the outside part of the ring,
+    * so we have to draw over the edges of the ring before drawing the focus
+    * or the text will peep through.
     */
 
     bgGC = Tk_GCForColor(entryPtr->highlightBgColorPtr, d);
     TkDrawInsetFocusHighlight(entryPtr->tkwin, bgGC, MAC_OSX_FOCUS_WIDTH, d, 0);
 
     /*
-     * Inset the entry Frame by the maximum width of the focus rect,
-     * which is 3 according to the Carbon docs.
+     * Inset the entry Frame by the maximum width of the focus rect, which is
+     * 3 according to the Carbon docs.
      */
 
     bounds.left = macDraw->xOff + MAC_OSX_FOCUS_WIDTH;
@@ -203,8 +208,8 @@ TkpDrawEntryBorderAndFocus(Entry *entryPtr, Drawable d, int isSpinbox)
     DrawThemeEditTextFrame(&bounds, drawState);
     if (entryPtr->flags & GOT_FOCUS) {
 	/*
-	 * Don't call this if we don't have the focus, because then it
-	 * erases the focus rect to white, but we've already drawn the
+	 * Don't call this if we don't have the focus, because then it erases
+	 * the focus rect to white, but we've already drawn the
 	 * highlightbackground above.
 	 */
 
@@ -216,17 +221,17 @@ TkpDrawEntryBorderAndFocus(Entry *entryPtr, Drawable d, int isSpinbox)
     TkMacOSXRestoreDrawingContext(&dc);
     return 1;
 }
+
 /*
  *--------------------------------------------------------------
  *
  * TkpDrawSpinboxButtons --
  *
- *	This procedure redraws the buttons of an spinbox widget.
- *	It overrides the generic button drawing code if the
- *	spinbox widget parameters are such that the native widget
- *	drawing is a good fit.
- *	This version just returns 0, so platforms that don't
- *	do special native drawing don't have to implement it.
+ *	This procedure redraws the buttons of an spinbox widget. It overrides
+ *	the generic button drawing code if the spinbox widget parameters are
+ *	such that the native widget drawing is a good fit. This version just
+ *	returns 0, so platforms that don't do special native drawing don't
+ *	have to implement it.
  *
  * Results:
  *	1 if it has drawn the border, 0 if not.
@@ -238,7 +243,9 @@ TkpDrawEntryBorderAndFocus(Entry *entryPtr, Drawable d, int isSpinbox)
  */
 
 int
-TkpDrawSpinboxButtons(Spinbox *sbPtr, Drawable d)
+TkpDrawSpinboxButtons(
+    Spinbox *sbPtr,
+    Drawable d)
 {
     Rect inBounds;
     ThemeButtonKind inKind;
@@ -265,10 +272,9 @@ TkpDrawSpinboxButtons(Spinbox *sbPtr, Drawable d)
     }
 
     /*
-     * The actual sizes of the IncDec button are 21 for the normal,
-     * 18 for the small and 15 for the mini. But the spinbox still
-     * looks okay if the entry is a little bigger than this, so we
-     * give it a little slop.
+     * The actual sizes of the IncDec button are 21 for the normal, 18 for the
+     * small and 15 for the mini. But the spinbox still looks okay if the
+     * entry is a little bigger than this, so we give it a little slop.
      */
 
     inKind = ComputeIncDecParameters(buttonHeight, &incDecWidth);
@@ -297,9 +303,10 @@ TkpDrawSpinboxButtons(Spinbox *sbPtr, Drawable d)
     inBounds.top = macDraw->yOff + MAC_OSX_FOCUS_WIDTH;
     inBounds.bottom = macDraw->yOff + Tk_Height(tkwin) - MAC_OSX_FOCUS_WIDTH;
 
-    /* We had to make the entry part of the window smaller so that we
-     * wouldn't overdraw the spin buttons with the focus highlight. So
-     * now we have to draw the highlightbackground.
+    /*
+     * We had to make the entry part of the window smaller so that we wouldn't
+     * overdraw the spin buttons with the focus highlight. So now we have to
+     * draw the highlightbackground.
      */
 
     bgGC = Tk_GCForColor(sbPtr->entry.highlightBgColorPtr, d);
@@ -317,4 +324,3 @@ TkpDrawSpinboxButtons(Spinbox *sbPtr, Drawable d)
     TkMacOSXRestoreDrawingContext(&dc);
     return 1;
 }
-
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index 7bb7192..ee13904 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.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: tkMacOSXMenubutton.c,v 1.18 2007/12/13 15:27:10 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.19 2008/11/08 18:44:40 dkf Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -443,8 +443,8 @@ TkpDestroyMenuButton(
  */
 
 void
-TkpComputeMenuButtonGeometry(mbPtr)
-    register TkMenuButton *mbPtr;	/* Widget record for menu button. */
+TkpComputeMenuButtonGeometry(
+    register TkMenuButton *mbPtr)	/* Widget record for menu button. */
 {
     int width, height, mm, pixels;
     int hasImageOrBitmap = 0;
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index b469c9b..71dfd27 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.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: tkMacOSXNotify.c,v 1.20 2007/12/13 15:27:10 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXNotify.c,v 1.21 2008/11/08 18:44:40 dkf Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -31,8 +31,8 @@ static Tcl_ThreadDataKey dataKey;
 static void TkMacOSXNotifyExitHandler(ClientData clientData);
 static void CarbonEventsSetupProc(ClientData clientData, int flags);
 static void CarbonEventsCheckProc(ClientData clientData, int flags);
-
-/*
+
+/*
  *----------------------------------------------------------------------
  *
  * Tk_MacOSXSetupTkNotifier --
@@ -66,15 +66,20 @@ Tk_MacOSXSetupTkNotifier(void)
 	GetMainEventQueue();
 
 	tsdPtr->initialized = 1;
-	/* Install Carbon events event source in main event loop thread. */
+
+	/*
+	 * Install Carbon events event source in main event loop thread.
+	 */
+
 	if (GetCurrentEventLoop() == GetMainEventLoop()) {
 	    if (!pthread_main_np()) {
 		/*
-		 * Panic if the Carbon main event loop thread (i.e. the
-		 * thread  where HIToolbox was first loaded) is not the
-		 * main application thread, as Carbon does not support
-		 * this properly.
+		 * Panic if the Carbon main event loop thread (i.e. the thread
+		 * where HIToolbox was first loaded) is not the main
+		 * application thread, as Carbon does not support this
+		 * properly.
 		 */
+
 		Tcl_Panic("Tk_MacOSXSetupTkNotifier: %s",
 		    "first [load] of TkAqua has to occur in the main thread!");
 	    }
@@ -103,8 +108,8 @@ Tk_MacOSXSetupTkNotifier(void)
  */
 
 static void
-TkMacOSXNotifyExitHandler(clientData)
-    ClientData clientData;	/* Not used. */
+TkMacOSXNotifyExitHandler(
+    ClientData clientData)	/* Not used. */
 {
     ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey,
 	    sizeof(ThreadSpecificData));
@@ -119,24 +124,24 @@ TkMacOSXNotifyExitHandler(clientData)
  *
  * CarbonEventsSetupProc --
  *
- *	This procedure implements the setup part of the Carbon Events
- *	event source. It is invoked by Tcl_DoOneEvent before entering
- *	the notifier to check for events.
+ *	This procedure implements the setup part of the Carbon Events event
+ *	source. It is invoked by Tcl_DoOneEvent before entering the notifier
+ *	to check for events.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	If Carbon events are queued, then the maximum block time will be
- *	set to 0 to ensure that the notifier returns control to Tcl.
+ *	If Carbon events are queued, then the maximum block time will be set
+ *	to 0 to ensure that the notifier returns control to Tcl.
  *
  *----------------------------------------------------------------------
  */
 
 static void
-CarbonEventsSetupProc(clientData, flags)
-    ClientData clientData;
-    int flags;
+CarbonEventsSetupProc(
+    ClientData clientData,
+    int flags)
 {
     static Tcl_Time blockTime = { 0, 0 };
 
@@ -144,7 +149,7 @@ CarbonEventsSetupProc(clientData, flags)
 	return;
     }
 
-    if (GetNumEventsInQueue((EventQueueRef)clientData)) {
+    if (GetNumEventsInQueue((EventQueueRef) clientData)) {
 	Tcl_SetMaxBlockTime(&blockTime);
     }
 }
@@ -154,8 +159,7 @@ CarbonEventsSetupProc(clientData, flags)
  *
  * CarbonEventsCheckProc --
  *
- *	This procedure processes events sitting in the Carbon event
- *	queue.
+ *	This procedure processes events sitting in the Carbon event queue.
  *
  * Results:
  *	None.
@@ -167,9 +171,9 @@ CarbonEventsSetupProc(clientData, flags)
  */
 
 static void
-CarbonEventsCheckProc(clientData, flags)
-    ClientData clientData;
-    int flags;
+CarbonEventsCheckProc(
+    ClientData clientData,
+    int flags)
 {
     int numFound;
     OSStatus err = noErr;
@@ -178,9 +182,12 @@ CarbonEventsCheckProc(clientData, flags)
 	return;
     }
 
-    numFound = GetNumEventsInQueue((EventQueueRef)clientData);
+    numFound = GetNumEventsInQueue((EventQueueRef) clientData);
+
+    /*
+     * Avoid starving other event sources:
+     */
 
-    /* Avoid starving other event sources: */
     if (numFound > 4) {
 	numFound = 4;
     }
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 5419cb0..ccf1991 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.27 2008/10/03 13:13:31 dkf Exp $
+ * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.28 2008/11/08 18:44:40 dkf Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -328,10 +328,10 @@ TkpDisplayScrollbar(
  */
 
 void
-TkpConfigureScrollbar(scrollPtr)
-    register TkScrollbar *scrollPtr;	/* Information about widget; may or
-					 * may not already have values for
-					 * some fields. */
+TkpConfigureScrollbar(
+    register TkScrollbar *scrollPtr)
+				/* Information about widget; may or may not
+				 * already have values for some fields. */
 {
 }
 
@@ -554,7 +554,9 @@ TkpScrollbarPosition(
  */
 
 static pascal void
-ThumbActionProc(ControlRef theControl, ControlPartCode partCode)
+ThumbActionProc(
+    ControlRef theControl,
+    ControlPartCode partCode)
 {
     TkScrollbar *scrollPtr = (TkScrollbar *)(intptr_t)
 	    GetControlReference(theControl);
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index 0b0ab49..daf39aa 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.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: tkMacOSXXStubs.c,v 1.29 2008/08/19 15:52:13 georgeps Exp $
+ * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.30 2008/11/08 18:44:40 dkf Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -626,7 +626,8 @@ XGetWindowProperty(
 }
 
 void
-XRefreshKeyboardMapping( XMappingEvent* x)
+XRefreshKeyboardMapping(
+    XMappingEvent *x)
 {
     /* used by tkXEvent.c */
     Debugger();
@@ -1077,24 +1078,24 @@ AddPixel(
 
 void
 XChangeWindowAttributes(
-    Display* display,
+    Display *display,
     Window w,
     unsigned long value_mask,
-    XSetWindowAttributes* attributes)
+    XSetWindowAttributes *attributes)
 {
 }
 
 void
 XSetWindowBackground(
-	Display *display,
-	Window window,
-	unsigned long value)
+    Display *display,
+    Window window,
+    unsigned long value)
 {
 }
 
 void
 XSetWindowBackgroundPixmap(
-    Display* display,
+    Display *display,
     Window w,
     Pixmap background_pixmap)
 {
@@ -1102,7 +1103,7 @@ XSetWindowBackgroundPixmap(
 
 void
 XSetWindowBorder(
-    Display* display,
+    Display *display,
     Window w,
     unsigned long border_pixel)
 {
@@ -1110,7 +1111,7 @@ XSetWindowBorder(
 
 void
 XSetWindowBorderPixmap(
-    Display* display,
+    Display *display,
     Window w,
     Pixmap border_pixmap)
 {
@@ -1118,7 +1119,7 @@ XSetWindowBorderPixmap(
 
 void
 XSetWindowBorderWidth(
-    Display* display,
+    Display *display,
     Window w,
     unsigned int width)
 {
@@ -1126,7 +1127,7 @@ XSetWindowBorderWidth(
 
 void
 XSetWindowColormap(
-    Display* display,
+    Display *display,
     Window w,
     Colormap colormap)
 {
@@ -1135,24 +1136,25 @@ XSetWindowColormap(
 
 Status
 XStringListToTextProperty(
-    char** list,
+    char **list,
     int count,
-    XTextProperty* text_prop_return)
+    XTextProperty *text_prop_return)
 {
     Debugger();
     return (Status) 0;
 }
+
 void
 XSetWMClientMachine(
-    Display* display,
+    Display *display,
     Window w,
-    XTextProperty* text_prop)
+    XTextProperty *text_prop)
 {
     Debugger();
 }
+
 XIC
-XCreateIC(
-    void)
+XCreateIC(void)
 {
     Debugger();
     return (XIC) 0;