merge updates from HEAD

15 files changed, 85 insertions, 55 deletions

diff --git a/macosx/Wish.xcodeproj/default.pbxuser b/macosx/Wish.xcodeproj/default.pbxuser
index f8ee8dd..1ab49ec 100644
--- a/macosx/Wish.xcodeproj/default.pbxuser
+++ b/macosx/Wish.xcodeproj/default.pbxuser
@@ -34,10 +34,12 @@
 			NO,
 			NO,
 			NO,
+			NO,
 		);
 		argumentStrings = (
 			"${SRCROOT}/../../tk/library/demos/widget",
 			"${SRCROOT}/../../tk/tests/all.tcl",
+			"${SRCROOT}/../../tk/tests/ttk/all.tcl",
 			"-geometry +0+0",
 			"-singleproc 1",
 			"-verbose \"bet\"",
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 258f992..ec825cb 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.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: tkMacOSXDraw.c,v 1.21.2.2 2007/06/01 04:01:32 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXDraw.c,v 1.21.2.3 2007/06/04 15:19:00 dgp Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -601,7 +601,11 @@ XDrawLines(
     int i, lw = gc->line_width;
 
     if (npoints < 2) {
-	return; /* TODO: generate BadValue error. */
+	/*
+	 * TODO: generate BadValue error.
+	 */
+
+	return;
     }
 
     display->request++;
@@ -1560,9 +1564,8 @@ TkMacOSXSetUpGraphicsPort(
 	}
 	if (gc->line_style != LineSolid) {
 	    /*
-	     * FIXME:
-	     * Here the dash pattern should be set in the drawing environment.
-	     * This is not possible with QuickDraw line drawing.
+	     * FIXME: Here the dash pattern should be set in the drawing
+	     * environment. This is not possible with QuickDraw line drawing.
 	     */
 	}
     }
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index 04d0e4d..d6112bb 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -15,7 +15,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- *  RCS: @(#) $Id: tkMacOSXEmbed.c,v 1.12 2007/05/09 12:55:15 das Exp $
+ *  RCS: @(#) $Id: tkMacOSXEmbed.c,v 1.12.2.1 2007/06/04 15:19:00 dgp Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -509,7 +509,7 @@ TkMacOSXGetHostToplevel(
 	contWinPtr = TkpGetOtherWindow(topWinPtr);
 
 	/*
-	 * NOTE: Here we should handle out of process embedding.
+	 * TODO: Here we should handle out of process embedding.
 	 */
 
 	if (contWinPtr != NULL) {
diff --git a/macosx/tkMacOSXEntry.c b/macosx/tkMacOSXEntry.c
index f12f624..60e4a99 100644
--- a/macosx/tkMacOSXEntry.c
+++ b/macosx/tkMacOSXEntry.c
@@ -53,7 +53,7 @@
  *	software in accordance with the terms specified in this
  *	license.
  *
- * RCS: @(#) $Id: tkMacOSXEntry.c,v 1.8 2007/04/23 21:24:33 das Exp $
+ * RCS: @(#) $Id: tkMacOSXEntry.c,v 1.8.2.1 2007/06/04 15:19:00 dgp Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -257,7 +257,10 @@ TkpDrawSpinboxButtons(Spinbox *sbPtr, Drawable d)
     GC bgGC;
     MacDrawable *macDraw = (MacDrawable *) d;
 
-    /* FIXME RAISED really makes more sense */
+    /*
+     * FIXME: RAISED really makes more sense
+     */
+
     if (sbPtr->buRelief != TK_RELIEF_FLAT) {
 	return 0;
     }
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index 6e5fbba..798a111 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -35,7 +35,7 @@
  *   that such fonts can not be used for controls, because controls
  *   definitely require a family id (this assertion needs testing).
  *
- * RCS: @(#) $Id: tkMacOSXFont.c,v 1.24.2.2 2007/05/30 13:47:43 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXFont.c,v 1.24.2.3 2007/06/04 15:19:00 dgp Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -1057,7 +1057,10 @@ TkpDrawCharsInContext(
     TkMacOSXSetupDrawingContext(drawable, gc, 1, &drawingContext);
 
 #if 0
-    /* TODO: implement stippled text drawing */
+    /*
+     * TODO: implement stippled text drawing
+     */
+
     if ((gc->fill_style == FillStippled
 	    || gc->fill_style == FillOpaqueStippled)
 	    && gc->stipple != None) {
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 6625e4a..0dc3826 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.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: tkMacOSXInit.c,v 1.28 2007/04/23 21:24:33 das Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.28.2.1 2007/06/04 15:19:00 dgp Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -307,7 +307,7 @@ TkpInit(
 	}
 
 	/*
-	 * REMOVE ME: Close stdin & stdout for remote debugging otherwise we
+	 * FIXME: Close stdin & stdout for remote debugging otherwise we
 	 * will fight with gdb for stdin & stdout
 	 */
 
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index 14bf641..3728ca1 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -54,7 +54,7 @@
  *	software in accordance with the terms specified in this
  *	license.
  *
- * RCS: @(#) $Id: tkMacOSXKeyEvent.c,v 1.21 2007/04/23 21:24:33 das Exp $
+ * RCS: @(#) $Id: tkMacOSXKeyEvent.c,v 1.21.2.1 2007/06/04 15:19:00 dgp Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -178,7 +178,12 @@ TkMacOSXProcessKeyboardEvent(
 	    case kHICommandPreferences:
 	    case kHICommandQuit:
 		statusPtr->stopProcessing = 0;
-		return 0; /* TODO: may not be on event on queue. */
+
+		/*
+		 * TODO: may not be on event on queue.
+		 */
+
+		return 0;
 		break;
 	    default:
 		break;
diff --git a/macosx/tkMacOSXKeyboard.c b/macosx/tkMacOSXKeyboard.c
index ce16324..3dc8e9c 100644
--- a/macosx/tkMacOSXKeyboard.c
+++ b/macosx/tkMacOSXKeyboard.c
@@ -10,12 +10,13 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXKeyboard.c,v 1.21 2007/04/23 21:24:33 das Exp $
+ * RCS: @(#) $Id: tkMacOSXKeyboard.c,v 1.21.2.1 2007/06/04 15:19:00 dgp Exp $
  */
 
 #include "tkMacOSXInt.h"
-#include "tkMacOSXEvent.h"	/* TkMacOSXKeycodeToUnicode() FIXME: That
-				 * function should probably move here. */
+#include "tkMacOSXEvent.h"	/* for TkMacOSXKeycodeToUnicode()
+				 * FIXME: That function should probably move
+				 * here. */
 
 /*
  * A couple of simple definitions to make code a bit more self-explaining.
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index d1f8daf..25f414d 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.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: tkMacOSXMenu.c,v 1.37.2.1 2007/05/30 13:47:43 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.37.2.2 2007/06/04 15:19:00 dgp Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -1288,8 +1288,8 @@ ReconfigureIndividualMenu(
 			    ->menuPtr->platformData)->menuHdl;
 
 		    if (childMenuHdl != NULL) {
-			SetMenuItemHierarchicalID(macMenuHdl, base + index,
-				GetMenuID(childMenuHdl));
+			ChkErr(SetMenuItemHierarchicalID, macMenuHdl,
+				base + index, GetMenuID(childMenuHdl));
 		    }
 		    /*
 		     * If we changed the highligthing of this menu, its
@@ -1556,6 +1556,7 @@ TkpPostMenu(
 	    Tcl_CancelIdleCall(DrawMenuBarWhenIdle, NULL);
 	    DrawMenuBarWhenIdle(NULL);
 	}
+	RecursivelyInsertMenu(menuPtr);
 
 	TkMacOSXTrackingLoop(1);
 	popUpResult = PopUpMenuSelect(macMenuHdl, y, x, menuPtr->active);
@@ -4203,7 +4204,7 @@ HandleMenuHiliteMsg(
 	    hidPtr->newItem);
 #endif
     GetPort(&macMDEFDrawable.grafPtr);
-    macMDEFDrawable.context = (CGContextRef)hidPtr->context;
+    macMDEFDrawable.context = (CGContextRef) hidPtr->context;
 
     err = ChkErr(GetMenuTrackingData, menu, mtdPtr);
     if (err != noErr) {
@@ -4257,7 +4258,7 @@ HandleMenuDrawMsg(
 
     GetPort(&macMDEFDrawable.grafPtr);
     GetPortBounds(macMDEFDrawable.grafPtr, &bounds);
-    macMDEFDrawable.context = (CGContextRef)ddPtr->context;
+    macMDEFDrawable.context = (CGContextRef) ddPtr->context;
 #ifdef TK_MAC_DEBUG_MENUS
     TkMacOSXDbgMsg("MDEF: DrawMsg %d - %d; %d - %d", menuRectPtr->top,
 	    menuRectPtr->bottom, bounds.top, bounds.bottom);
@@ -4401,7 +4402,7 @@ HandleMenuFindItemMsg(
 
     GetPort(&macMDEFDrawable.grafPtr);
     GetPortBounds(macMDEFDrawable.grafPtr, &bounds);
-    macMDEFDrawable.context = (CGContextRef)fiPtr->context;
+    macMDEFDrawable.context = (CGContextRef) fiPtr->context;
 
     /*
      * Now we need to take care of scrolling the menu.
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index 4bf138d..d33b0ab 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.16 2007/04/23 21:24:33 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.16.2.1 2007/06/04 15:19:00 dgp Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -91,7 +91,10 @@ TkMacOSXHandleMenuSelect(
 	case kFileMenu:
 	    switch (theItem) {
 		case kSourceItem:
-		    /* TODO: source script */
+		    /*
+		     * TODO: source script
+		     */
+
 		    SourceDialog();
 		    break;
 		case kCloseItem:
diff --git a/macosx/tkMacOSXSend.c b/macosx/tkMacOSXSend.c
index 179beb6..076418d 100644
--- a/macosx/tkMacOSXSend.c
+++ b/macosx/tkMacOSXSend.c
@@ -33,7 +33,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXSend.c,v 1.6 2007/04/23 21:24:34 das Exp $
+ * RCS: @(#) $Id: tkMacOSXSend.c,v 1.6.2.1 2007/06/04 15:19:00 dgp Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -297,8 +297,12 @@ Tk_SetAppName(
     interpListPtr = riPtr;
     strcpy(riPtr->name, actualName);
 
+    /*
+     * TODO: DeleteProc
+     */
+
     Tcl_CreateObjCommand(interp, "send", Tk_SendObjCmd,
-	    (ClientData) riPtr, NULL /* TODO: DeleteProc */);
+	    (ClientData) riPtr, NULL);
     if (Tcl_IsSafe(interp)) {
 	Tcl_HideCommand(interp, "send", "send");
     }
@@ -439,8 +443,8 @@ Tk_SendObjCmd(
 	Tcl_Release((ClientData) localInterp);
     } else {
 	/*
-	 * This is a non-local request. Send the script to the server and poll
-	 * it for a result. TODO!!!
+	 * TODO: This is a non-local request. Send the script to the server and
+	 * poll it for a result.
 	 */
     }
 
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 23bdec8..e71a05b 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.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: tkMacOSXSubwindows.c,v 1.18.2.2 2007/06/01 04:01:39 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.18.2.3 2007/06/04 15:19:01 dgp Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -472,7 +472,10 @@ MoveResizeWindow(
 	     */
 	}
     } else {
-	/* TODO: update all xOff & yOffs */
+	/*
+	 * TODO: update all xOff & yOffs
+	 */
+
 	macParent = macWin->winPtr->parentPtr->privatePtr;
 	parentBorderwidth = macWin->winPtr->parentPtr->changes.border_width;
     }
@@ -558,7 +561,9 @@ XRaiseWindow(
     if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
 	TkWmRestackToplevel(macWin->winPtr, Above, NULL);
     } else {
-	/* TODO: this should generate damage */
+	/*
+	 * TODO: this should generate damage
+	 */
     }
 }
 
@@ -590,7 +595,9 @@ XLowerWindow(
     if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
 	TkWmRestackToplevel(macWin->winPtr, Below, NULL);
     } else {
-	/* TODO: this should generate damage */
+	/*
+	 * TODO: this should generate damage
+	 */
     }
 }
 #endif
@@ -748,7 +755,7 @@ TkMacOSXUpdateClipRgn(
 		}
 
 		/*
-		 * NOTE: Here we should handle out of process embedding.
+		 * TODO: Here we should handle out of process embedding.
 		 */
 	    }
 
@@ -790,7 +797,7 @@ TkMacOSXUpdateClipRgn(
 		}
 
 		/*
-		 * NOTE: Here we should handle out of process embedding.
+		 * TODO: Here we should handle out of process embedding.
 		 */
 	    }
 	    SetEmptyRgn(tkMacOSXtmpRgn1);
@@ -956,10 +963,8 @@ TkMacOSXGetDrawablePort(
 
 	if (resultPort == NULL) {
 	    /*
-	     * FIXME:
-	     *
-	     * So far as I can tell, the only time that this happens is when
-	     * we are tearing down an embedded child interpreter, and most
+	     * FIXME: So far as I can tell, the only time that this happens is
+	     * when we are tearing down an embedded child interpreter, and most
 	     * of the time, this is harmless... However, we really need to
 	     * find why the embedding loses.
 	     */
@@ -968,7 +973,7 @@ TkMacOSXGetDrawablePort(
 	}
 
 	/*
-	 * NOTE: Here we should handle out of process embedding.
+	 * TODO: Here we should handle out of process embedding.
 	 */
     }
     return resultPort;
@@ -1083,7 +1088,7 @@ TkMacOSXInvalClipRgns(
 	}
 
 	/*
-	 * NOTE: Here we should handle out of process embedding.
+	 * TODO: Here we should handle out of process embedding.
 	 */
     }
 }
@@ -1174,7 +1179,7 @@ UpdateOffsets(
 	}
 
 	/*
-	 * NOTE: Here we should handle out of process embedding.
+	 * TODO: Here we should handle out of process embedding.
 	 */
     }
 }
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index b4c458b..c73d8ae 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.22.2.2 2007/06/01 04:01:39 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.22.2.3 2007/06/04 15:19:01 dgp Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -573,9 +573,8 @@ GenerateUpdates(
 	}
 
 	/*
-	 * NOTE: Here we should handle out of process embedding.
+	 * TODO: Here we should handle out of process embedding.
 	 */
-
     }
 
     return 1;
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 971f5c6..9c96537 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.49.2.2 2007/06/01 04:01:39 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.49.2.3 2007/06/04 15:19:01 dgp Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -3340,7 +3340,7 @@ UpdateGeometryInfo(
 	TkWindow *contWinPtr = TkpGetOtherWindow(winPtr);
 
 	/*
-	 * NOTE: Here we should handle out of process embedding.
+	 * TODO: Here we should handle out of process embedding.
 	 */
 
 	if (contWinPtr != NULL) {
@@ -3743,11 +3743,9 @@ Tk_CoordsToWindow(
 		}
 	    }
 
-
 	    /*
-	     * NOTE: Here we should handle out of process embedding.
+	     * TODO: Here we should handle out of process embedding.
 	     */
-
 	} else {
 	    for (childPtr = winPtr->childList; childPtr != NULL;
 		    childPtr = childPtr->nextPtr) {
@@ -3836,7 +3834,7 @@ Tk_TopCoordsToWindow(
 	    }
 
 	    /*
-	     * NOTE: Here we should handle out of process embedding.
+	     * TODO: Here we should handle out of process embedding.
 	     */
 	} else {
 	    for (childPtr = winPtr->childList; childPtr != NULL;
@@ -5181,7 +5179,7 @@ TkMacOSXMakeRealWindowExist(
 	return;
 
 	/*
-	 * NOTE: Here we should handle out of process embedding.
+	 * TODO: Here we should handle out of process embedding.
 	 */
     }
 
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index 53bafb7..805d07d 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.17.2.1 2007/05/30 13:47:43 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.17.2.2 2007/06/04 15:19:01 dgp Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -605,7 +605,10 @@ GContext
 XGContextFromGC(
     GC gc)
 {
-    /* TODO - currently a no-op */
+    /*
+     * TODO: currently a no-op
+     */
+
     return 0;
 }