Fixes from Michael Kirkham:

        * macosx/tkMacOSXMenu.c (TkpConfigureMenuEntry): Thinko in clearing
        the ENTRY_ACCEL_MASK before re-parsing it. [Tk Bug 1012852]

        * macosx/tkMacOSXScrlbr.c (UpdateControlValues): Don't set the
        control value BEFORE setting the min and max or the control manager
        will reset it for you. [Tk Bug 1202181]

        * macosx/tkMacOSXXStubs.c (TkMacOSXXGetPixel, TkMacOSXXPutPixel):
        Restore the port to what it was before putting we were called.
        [Tk Bug 1202223]

5 files changed, 32 insertions, 2078 deletions

diff --git a/ChangeLog b/ChangeLog
index 40ebfd8..b04ee9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-05-15  Jim Ingham  <jingham@apple.com>
+
+        Fixes from Michael Kirkham:
+
+        * macosx/tkMacOSXMenu.c (TkpConfigureMenuEntry): Thinko in clearing 
+        the ENTRY_ACCEL_MASK before re-parsing it. [Tk Bug 1012852]
+
+        * macosx/tkMacOSXScrlbr.c (UpdateControlValues): Don't set the 
+        control value BEFORE setting the min and max or the control manager
+        will reset it for you. [Tk Bug 1202181]
+
+        * macosx/tkMacOSXXStubs.c (TkMacOSXXGetPixel, TkMacOSXXPutPixel):
+        Restore the port to what it was before putting we were called.
+        [Tk Bug 1202223]
+
 2005-05-14  Jim Ingham <jingham@apple.com>
 
 	* macosx/tkMacOSXScrlbr.c (ThumbActionProc): Missing Tcl_Release.
diff --git a/macosx/Wish.pbproj/jingham.pbxuser b/macosx/Wish.pbproj/jingham.pbxuser
index 207347e..fbdc40d 100644
--- a/macosx/Wish.pbproj/jingham.pbxuser
+++ b/macosx/Wish.pbproj/jingham.pbxuser
@@ -55,16 +55,6 @@
 		vrLen = 1522;
 		vrLoc = 0;
 	};
-	4C148EA607ED3FB90033822E = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 199";
-		rLen = 0;
-		rLoc = 8942;
-		rType = 0;
-		vrLen = 2219;
-		vrLoc = 5710;
-	};
 	4C148EA707ED3FB90033822E = {
 		fRef = F5375553016C376E01DC9062;
 		isa = PBXTextBookmark;
@@ -115,16 +105,6 @@
 		vrLen = 2148;
 		vrLoc = 43353;
 	};
-	4C148EC407ED443A0033822E = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = "tkEntry.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1968;
-		vrLoc = 0;
-	};
 	4C148EC507ED443A0033822E = {
 		fRef = F537555C016C376E01DC9062;
 		isa = PBXTextBookmark;
@@ -145,453 +125,6 @@
 		vrLen = 2148;
 		vrLoc = 43353;
 	};
-	4C148ECB07ED48390033822E = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1926;
-		vrLoc = 76289;
-	};
-	4C278C1007F273070034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C1107F273070034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C1707F273750034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C1F07F275760034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C2307F275D30034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C2707F275EC0034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C2807F276B40034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C2B07F276D40034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C2C07F276DE0034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C2D07F276E70034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C3507F2774F0034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C3C07F278180034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C4407F279210034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C4607F27AEF0034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C4C07F27B8D0034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C4D07F27B8D0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		rLen = 0;
-		rLoc = 259;
-		rType = 1;
-	};
-	4C278C4E07F27B8D0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    if (sbPtr->entry.state == STATE_DISABLED) {\n";
-		rLen = 48;
-		rLoc = 8825;
-		rType = 0;
-		vrLen = 510;
-		vrLoc = 7150;
-	};
-	4C278C5107F27BA00034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C5207F27BA00034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    if (sbPtr->entry.state == STATE_DISABLED) {\n";
-		rLen = 48;
-		rLoc = 8825;
-		rType = 0;
-		vrLen = 510;
-		vrLoc = 7150;
-	};
-	4C278C5307F27BB40034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C5407F27BB40034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    if (sbPtr->entry.state == STATE_DISABLED) {\n";
-		rLen = 48;
-		rLoc = 8825;
-		rType = 0;
-		vrLen = 510;
-		vrLoc = 7150;
-	};
-	4C278C5707F27BC90034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C5807F27BC90034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    if (sbPtr->entry.state == STATE_DISABLED) {\n";
-		rLen = 48;
-		rLoc = 8825;
-		rType = 0;
-		vrLen = 510;
-		vrLoc = 7150;
-	};
-	4C278C5D07F27BE00034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C5E07F27BE00034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    if (sbPtr->entry.state == STATE_DISABLED) {\n";
-		rLen = 48;
-		rLoc = 8825;
-		rType = 0;
-		vrLen = 510;
-		vrLoc = 7150;
-	};
-	4C278C5F07F27C5C0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    if (sbPtr->entry.state == STATE_DISABLED) {\n";
-		rLen = 48;
-		rLoc = 8847;
-		rType = 0;
-		vrLen = 349;
-		vrLoc = 7187;
-	};
-	4C278C6207F27C610034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C6307F27C610034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    if (sbPtr->entry.state == STATE_DISABLED) {\n";
-		rLen = 48;
-		rLoc = 8847;
-		rType = 0;
-		vrLen = 349;
-		vrLoc = 7187;
-	};
-	4C278C6407F27C720034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C6507F27C720034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    if (sbPtr->entry.state == STATE_DISABLED) {\n";
-		rLen = 48;
-		rLoc = 8847;
-		rType = 0;
-		vrLen = 349;
-		vrLoc = 7187;
-	};
-	4C278C6607F27CAC0034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C6707F27CAC0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    if (sbPtr->entry.state == STATE_DISABLED) {\n";
-		rLen = 48;
-		rLoc = 8847;
-		rType = 0;
-		vrLen = 349;
-		vrLoc = 7187;
-	};
-	4C278C6807F27CFB0034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C6907F27CFB0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    if (sbPtr->entry.state == STATE_DISABLED) {\n";
-		rLen = 48;
-		rLoc = 8847;
-		rType = 0;
-		vrLen = 349;
-		vrLoc = 7187;
-	};
-	4C278C6C07F27E400034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryEventProc;
-		rLen = 14;
-		rLoc = 76488;
-		rType = 0;
-		vrLen = 1942;
-		vrLoc = 76272;
-	};
-	4C278C6D07F27E400034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryComputeGeometry;
-		rLen = 20;
-		rLoc = 61869;
-		rType = 0;
-		vrLen = 2258;
-		vrLoc = 61869;
-	};
-	4C278C6E07F27E400034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    if (sbPtr->entry.state == STATE_DISABLED) {\n";
-		rLen = 48;
-		rLoc = 8847;
-		rType = 0;
-		vrLen = 349;
-		vrLoc = 7187;
-	};
-	4C278C6F07F27F5C0034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryComputeGeometry;
-		rLen = 20;
-		rLoc = 61869;
-		rType = 0;
-		vrLen = 2258;
-		vrLoc = 61869;
-	};
-	4C278C7007F27F5C0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    if (sbPtr->entry.state == STATE_DISABLED) {\n";
-		rLen = 48;
-		rLoc = 8847;
-		rType = 0;
-		vrLen = 349;
-		vrLoc = 7187;
-	};
-	4C278C7107F27F850034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryComputeGeometry;
-		rLen = 20;
-		rLoc = 61869;
-		rType = 0;
-		vrLen = 2258;
-		vrLoc = 61869;
-	};
-	4C278C7207F27F850034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    if (sbPtr->entry.state == STATE_DISABLED) {\n";
-		rLen = 48;
-		rLoc = 8847;
-		rType = 0;
-		vrLen = 349;
-		vrLoc = 7187;
-	};
-	4C278C7507F283CB0034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryComputeGeometry;
-		rLen = 20;
-		rLoc = 61869;
-		rType = 0;
-		vrLen = 2258;
-		vrLoc = 61869;
-	};
-	4C278C7607F283CB0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    if (sbPtr->entry.state == STATE_DISABLED) {\n";
-		rLen = 48;
-		rLoc = 8847;
-		rType = 0;
-		vrLen = 311;
-		vrLoc = 7134;
-	};
-	4C278C7707F285D40034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryComputeGeometry;
-		rLen = 20;
-		rLoc = 61869;
-		rType = 0;
-		vrLen = 2258;
-		vrLoc = 61869;
-	};
 	4C278C7807F285D40034F48B = {
 		fRef = 4C148E2407ECCFCF0033822E;
 		isa = PBXTextBookmark;
@@ -599,56 +132,6 @@
 		rLoc = 235;
 		rType = 1;
 	};
-	4C278C7907F285D40034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8072;
-		rType = 0;
-		vrLen = 925;
-		vrLoc = 7634;
-	};
-	4C278C7A07F285E40034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryComputeGeometry;
-		rLen = 20;
-		rLoc = 61869;
-		rType = 0;
-		vrLen = 2258;
-		vrLoc = 61869;
-	};
-	4C278C7B07F285E40034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8072;
-		rType = 0;
-		vrLen = 925;
-		vrLoc = 7634;
-	};
-	4C278C8007F285FE0034F48B = {
-		fRef = F5375596016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = EntryComputeGeometry;
-		rLen = 20;
-		rLoc = 61869;
-		rType = 0;
-		vrLen = 2258;
-		vrLoc = 61869;
-	};
-	4C278C8107F285FE0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8072;
-		rType = 0;
-		vrLen = 925;
-		vrLoc = 7634;
-	};
 	4C278C8207F2868D0034F48B = {
 		fRef = F5375596016C389901DC9062;
 		isa = PBXTextBookmark;
@@ -669,1076 +152,6 @@
 		vrLen = 2258;
 		vrLoc = 61869;
 	};
-	4C278C8407F2868D0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 166";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2355;
-		vrLoc = 4549;
-	};
-	4C278C8507F2868D0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 962;
-		vrLoc = 7639;
-	};
-	4C278C8A07F286A10034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 166";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2355;
-		vrLoc = 4549;
-	};
-	4C278C8B07F286A10034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 962;
-		vrLoc = 7639;
-	};
-	4C278C8C07F286C70034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 166";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2355;
-		vrLoc = 4549;
-	};
-	4C278C8D07F286C70034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 962;
-		vrLoc = 7639;
-	};
-	4C278C8E07F287030034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 166";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2257;
-		vrLoc = 4118;
-	};
-	4C278C8F07F287030034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 962;
-		vrLoc = 7639;
-	};
-	4C278C9207F2874B0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 962;
-		vrLoc = 7639;
-	};
-	4C278C9307F287550034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 166";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2343;
-		vrLoc = 4462;
-	};
-	4C278C9407F287550034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 962;
-		vrLoc = 7639;
-	};
-	4C278C9707F287630034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 166";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2343;
-		vrLoc = 4462;
-	};
-	4C278C9807F287630034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 962;
-		vrLoc = 7639;
-	};
-	4C278C9907F2884F0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 166";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2343;
-		vrLoc = 4462;
-	};
-	4C278C9A07F2884F0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 962;
-		vrLoc = 7639;
-	};
-	4C278C9B07F288F80034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2387;
-		vrLoc = 4480;
-	};
-	4C278C9C07F288F80034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 971;
-		vrLoc = 7626;
-	};
-	4C278C9D07F28A800034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2387;
-		vrLoc = 4480;
-	};
-	4C278C9E07F28A800034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 971;
-		vrLoc = 7626;
-	};
-	4C278CA307F28A960034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2387;
-		vrLoc = 4480;
-	};
-	4C278CA407F28A960034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 971;
-		vrLoc = 7626;
-	};
-	4C278CA507F28AED0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2387;
-		vrLoc = 4480;
-	};
-	4C278CA607F28AED0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 971;
-		vrLoc = 7626;
-	};
-	4C278CA907F28B040034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 971;
-		vrLoc = 7626;
-	};
-	4C278CAA07F28B050034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2387;
-		vrLoc = 4480;
-	};
-	4C278CAB07F28B050034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 971;
-		vrLoc = 7626;
-	};
-	4C278CAC07F28B0C0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2387;
-		vrLoc = 4480;
-	};
-	4C278CAD07F28B0C0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 971;
-		vrLoc = 7626;
-	};
-	4C278CAE07F28B700034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2387;
-		vrLoc = 4480;
-	};
-	4C278CAF07F28B700034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 971;
-		vrLoc = 7626;
-	};
-	4C278CB007F28BD90034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2387;
-		vrLoc = 4480;
-	};
-	4C278CB107F28BD90034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 971;
-		vrLoc = 7626;
-	};
-	4C278CB407F28BE80034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2387;
-		vrLoc = 4480;
-	};
-	4C278CB507F28BE80034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 971;
-		vrLoc = 7626;
-	};
-	4C278CBD07F28C060034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2387;
-		vrLoc = 4480;
-	};
-	4C278CBE07F28C060034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8137;
-		rType = 0;
-		vrLen = 971;
-		vrLoc = 7626;
-	};
-	4C278CC107F28C990034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2387;
-		vrLoc = 4480;
-	};
-	4C278CC207F28C990034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8141;
-		rType = 0;
-		vrLen = 972;
-		vrLoc = 7626;
-	};
-	4C278CC507F28CA60034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2387;
-		vrLoc = 4480;
-	};
-	4C278CC607F28CA60034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8141;
-		rType = 0;
-		vrLen = 972;
-		vrLoc = 7626;
-	};
-	4C278CC707F28CBB0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2387;
-		vrLoc = 4480;
-	};
-	4C278CC807F28CBB0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8141;
-		rType = 0;
-		vrLen = 972;
-		vrLoc = 7626;
-	};
-	4C278CC907F28D2D0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2417;
-		vrLoc = 4480;
-	};
-	4C278CCA07F28D2D0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8089;
-		rType = 0;
-		vrLen = 972;
-		vrLoc = 7656;
-	};
-	4C278CCD07F28D3C0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2417;
-		vrLoc = 4480;
-	};
-	4C278CCE07F28D3C0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8089;
-		rType = 0;
-		vrLen = 972;
-		vrLoc = 7656;
-	};
-	4C278CCF07F28D790034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2365;
-		vrLoc = 4480;
-	};
-	4C278CD007F28D790034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8089;
-		rType = 0;
-		vrLen = 972;
-		vrLoc = 7604;
-	};
-	4C278CD307F28D870034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6071;
-		rType = 0;
-		vrLen = 2365;
-		vrLoc = 4480;
-	};
-	4C278CD407F28D870034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8089;
-		rType = 0;
-		vrLen = 972;
-		vrLoc = 7604;
-	};
-	4C278CD507F28E290034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6341;
-		rType = 0;
-		vrLen = 2365;
-		vrLoc = 4480;
-	};
-	4C278CD607F28E290034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8090;
-		rType = 0;
-		vrLen = 972;
-		vrLoc = 7604;
-	};
-	4C278CD907F28E360034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 168";
-		rLen = 0;
-		rLoc = 6341;
-		rType = 0;
-		vrLen = 2365;
-		vrLoc = 4480;
-	};
-	4C278CDA07F28E360034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8090;
-		rType = 0;
-		vrLen = 972;
-		vrLoc = 7604;
-	};
-	4C278CDB07F28F040034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 181";
-		rLen = 0;
-		rLoc = 6346;
-		rType = 0;
-		vrLen = 2275;
-		vrLoc = 4480;
-	};
-	4C278CDC07F28F040034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8138;
-		rType = 0;
-		vrLen = 909;
-		vrLoc = 7561;
-	};
-	4C278CDF07F28F160034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 181";
-		rLen = 0;
-		rLoc = 6346;
-		rType = 0;
-		vrLen = 2275;
-		vrLoc = 4480;
-	};
-	4C278CE007F28F160034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "    int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;\n";
-		rLen = 57;
-		rLoc = 8138;
-		rType = 0;
-		vrLen = 909;
-		vrLoc = 7561;
-	};
-	4C278CE107F28F500034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 181";
-		rLen = 0;
-		rLoc = 6346;
-		rType = 0;
-		vrLen = 2275;
-		vrLoc = 4480;
-	};
-	4C278CE207F28F500034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 182";
-		rLen = 0;
-		rLoc = 6459;
-		rType = 0;
-		vrLen = 1073;
-		vrLoc = 5756;
-	};
-	4C278CE307F28F6F0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 181";
-		rLen = 0;
-		rLoc = 6346;
-		rType = 0;
-		vrLen = 2311;
-		vrLoc = 4480;
-	};
-	4C278CE407F28F6F0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 184";
-		rLen = 0;
-		rLoc = 6460;
-		rType = 0;
-		vrLen = 1048;
-		vrLoc = 5756;
-	};
-	4C278CE507F28F7A0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 181";
-		rLen = 0;
-		rLoc = 6346;
-		rType = 0;
-		vrLen = 2311;
-		vrLoc = 4480;
-	};
-	4C278CE607F28F7A0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 184";
-		rLen = 0;
-		rLoc = 6460;
-		rType = 0;
-		vrLen = 1048;
-		vrLoc = 5756;
-	};
-	4C278CE907F28F8C0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 181";
-		rLen = 0;
-		rLoc = 6346;
-		rType = 0;
-		vrLen = 2311;
-		vrLoc = 4480;
-	};
-	4C278CEA07F28F8C0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 184";
-		rLen = 0;
-		rLoc = 6460;
-		rType = 0;
-		vrLen = 1048;
-		vrLoc = 5756;
-	};
-	4C278CED07F28FCA0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 181";
-		rLen = 0;
-		rLoc = 6346;
-		rType = 0;
-		vrLen = 2275;
-		vrLoc = 4480;
-	};
-	4C278CEE07F28FCA0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 183";
-		rLen = 0;
-		rLoc = 6460;
-		rType = 0;
-		vrLen = 975;
-		vrLoc = 5903;
-	};
-	4C278CF107F28FD80034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 181";
-		rLen = 0;
-		rLoc = 6346;
-		rType = 0;
-		vrLen = 2275;
-		vrLoc = 4480;
-	};
-	4C278CF207F28FD80034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 183";
-		rLen = 0;
-		rLoc = 6460;
-		rType = 0;
-		vrLen = 975;
-		vrLoc = 5903;
-	};
-	4C278CF307F2903F0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 181";
-		rLen = 0;
-		rLoc = 6346;
-		rType = 0;
-		vrLen = 2276;
-		vrLoc = 4480;
-	};
-	4C278CF407F2903F0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 183";
-		rLen = 0;
-		rLoc = 6460;
-		rType = 0;
-		vrLen = 975;
-		vrLoc = 5904;
-	};
-	4C278CF707F2907E0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 181";
-		rLen = 0;
-		rLoc = 6372;
-		rType = 0;
-		vrLen = 2276;
-		vrLoc = 4480;
-	};
-	4C278CF807F2907E0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 158";
-		rLen = 0;
-		rLoc = 5697;
-		rType = 0;
-		vrLen = 974;
-		vrLoc = 5444;
-	};
-	4C278CFB07F2908A0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 181";
-		rLen = 0;
-		rLoc = 6372;
-		rType = 0;
-		vrLen = 2276;
-		vrLoc = 4480;
-	};
-	4C278CFC07F2908A0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 158";
-		rLen = 0;
-		rLoc = 5697;
-		rType = 0;
-		vrLen = 974;
-		vrLoc = 5444;
-	};
-	4C278CFD07F291C70034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 188";
-		rLen = 0;
-		rLoc = 6372;
-		rType = 0;
-		vrLen = 2252;
-		vrLoc = 4480;
-	};
-	4C278CFE07F291C70034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 165";
-		rLen = 0;
-		rLoc = 5697;
-		rType = 0;
-		vrLen = 949;
-		vrLoc = 5444;
-	};
-	4C278D0107F291D80034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 188";
-		rLen = 0;
-		rLoc = 6372;
-		rType = 0;
-		vrLen = 2252;
-		vrLoc = 4480;
-	};
-	4C278D0207F291D80034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 165";
-		rLen = 0;
-		rLoc = 5697;
-		rType = 0;
-		vrLen = 949;
-		vrLoc = 5444;
-	};
-	4C278D0307F291E90034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 188";
-		rLen = 0;
-		rLoc = 6372;
-		rType = 0;
-		vrLen = 2252;
-		vrLoc = 4480;
-	};
-	4C278D0407F291E90034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 165";
-		rLen = 0;
-		rLoc = 5697;
-		rType = 0;
-		vrLen = 949;
-		vrLoc = 5444;
-	};
-	4C278D0507F292270034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 188";
-		rLen = 0;
-		rLoc = 6372;
-		rType = 0;
-		vrLen = 2252;
-		vrLoc = 4480;
-	};
-	4C278D0607F292270034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 165";
-		rLen = 0;
-		rLoc = 5697;
-		rType = 0;
-		vrLen = 949;
-		vrLoc = 5444;
-	};
-	4C278D0707F292B50034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 188";
-		rLen = 0;
-		rLoc = 6233;
-		rType = 0;
-		vrLen = 2230;
-		vrLoc = 4480;
-	};
-	4C278D0807F292B50034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 165";
-		rLen = 0;
-		rLoc = 5558;
-		rType = 0;
-		vrLen = 960;
-		vrLoc = 5044;
-	};
-	4C278D0B07F2932B0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 183";
-		rLen = 0;
-		rLoc = 6233;
-		rType = 0;
-		vrLen = 2332;
-		vrLoc = 4480;
-	};
-	4C278D0C07F2932B0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 160";
-		rLen = 0;
-		rLoc = 5558;
-		rType = 0;
-		vrLen = 973;
-		vrLoc = 5044;
-	};
-	4C278D0F07F293390034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 183";
-		rLen = 0;
-		rLoc = 6233;
-		rType = 0;
-		vrLen = 2332;
-		vrLoc = 4480;
-	};
-	4C278D1007F293390034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 160";
-		rLen = 0;
-		rLoc = 5558;
-		rType = 0;
-		vrLen = 973;
-		vrLoc = 5044;
-	};
-	4C278D1107F293A60034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 183";
-		rLen = 0;
-		rLoc = 6394;
-		rType = 0;
-		vrLen = 2332;
-		vrLoc = 4480;
-	};
-	4C278D1207F293A60034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 160";
-		rLen = 0;
-		rLoc = 5719;
-		rType = 0;
-		vrLen = 973;
-		vrLoc = 5044;
-	};
-	4C278D1507F295B60034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 182";
-		rLen = 0;
-		rLoc = 6394;
-		rType = 0;
-		vrLen = 2367;
-		vrLoc = 4480;
-	};
-	4C278D1607F295B60034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 160";
-		rLen = 0;
-		rLoc = 5719;
-		rType = 0;
-		vrLen = 1012;
-		vrLoc = 5040;
-	};
-	4C278D1907F295C60034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 182";
-		rLen = 0;
-		rLoc = 6394;
-		rType = 0;
-		vrLen = 2367;
-		vrLoc = 4480;
-	};
-	4C278D1A07F295C60034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 160";
-		rLen = 0;
-		rLoc = 5719;
-		rType = 0;
-		vrLen = 1012;
-		vrLoc = 5040;
-	};
-	4C278D1B07F2964B0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 182";
-		rLen = 0;
-		rLoc = 6522;
-		rType = 0;
-		vrLen = 2367;
-		vrLoc = 4480;
-	};
-	4C278D1C07F2964B0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 160";
-		rLen = 0;
-		rLoc = 5847;
-		rType = 0;
-		vrLen = 1012;
-		vrLoc = 5040;
-	};
-	4C278D1F07F2965C0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 182";
-		rLen = 0;
-		rLoc = 6522;
-		rType = 0;
-		vrLen = 2367;
-		vrLoc = 4480;
-	};
-	4C278D2007F2965C0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 160";
-		rLen = 0;
-		rLoc = 5847;
-		rType = 0;
-		vrLen = 1012;
-		vrLoc = 5040;
-	};
-	4C278D2107F296DA0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 160";
-		rLen = 0;
-		rLoc = 5847;
-		rType = 0;
-		vrLen = 1012;
-		vrLoc = 5040;
-	};
-	4C278D2207F296DC0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 160";
-		rLen = 0;
-		rLoc = 5847;
-		rType = 0;
-		vrLen = 1012;
-		vrLoc = 5040;
-	};
-	4C278D2307F296E20034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 160";
-		rLen = 0;
-		rLoc = 5847;
-		rType = 0;
-		vrLen = 1012;
-		vrLoc = 5040;
-	};
-	4C278D2A07F29A7E0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 182";
-		rLen = 0;
-		rLoc = 6522;
-		rType = 0;
-		vrLen = 2367;
-		vrLoc = 4480;
-	};
-	4C278D2B07F29A7E0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 160";
-		rLen = 0;
-		rLoc = 5847;
-		rType = 0;
-		vrLen = 1012;
-		vrLoc = 5040;
-	};
-	4C278D9A07F29B4F0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 91";
-		rLen = 0;
-		rLoc = 3615;
-		rType = 0;
-		vrLen = 1879;
-		vrLoc = 2853;
-	};
-	4C278D9B07F29B4F0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 165";
-		rLen = 0;
-		rLoc = 6127;
-		rType = 0;
-		vrLen = 971;
-		vrLoc = 5011;
-	};
 	4C278D9C07F29B4F0034F48B = {
 		fRef = F5375568016C376E01DC9062;
 		isa = PBXTextBookmark;
@@ -1746,196 +159,6 @@
 		rLoc = 3324;
 		rType = 0;
 	};
-	4C278D9D07F29B4F0034F48B = {
-		fRef = F5375568016C376E01DC9062;
-		isa = PBXTextBookmark;
-		name = "    Gestalt(gestaltSystemVersion, (long*)&display->release);\n";
-		rLen = 61;
-		rLoc = 3320;
-		rType = 0;
-		vrLen = 1608;
-		vrLoc = 2724;
-	};
-	4C278DA407F29B630034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 91";
-		rLen = 0;
-		rLoc = 3615;
-		rType = 0;
-		vrLen = 1879;
-		vrLoc = 2853;
-	};
-	4C278DA507F29B630034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 165";
-		rLen = 0;
-		rLoc = 6127;
-		rType = 0;
-		vrLen = 971;
-		vrLoc = 5011;
-	};
-	4C278DA607F29B630034F48B = {
-		fRef = F5375568016C376E01DC9062;
-		isa = PBXTextBookmark;
-		name = "    Gestalt(gestaltSystemVersion, (long*)&display->release);\n";
-		rLen = 61;
-		rLoc = 3320;
-		rType = 0;
-		vrLen = 1608;
-		vrLoc = 2724;
-	};
-	4C278DA907F29CA90034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: ComputeIncDecParameters";
-		rLen = 0;
-		rLoc = 4218;
-		rType = 0;
-		vrLen = 1889;
-		vrLoc = 2853;
-	};
-	4C278DAA07F29CA90034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 179";
-		rLen = 0;
-		rLoc = 6127;
-		rType = 0;
-		vrLen = 926;
-		vrLoc = 4974;
-	};
-	4C278DAB07F29CA90034F48B = {
-		fRef = F5375568016C376E01DC9062;
-		isa = PBXTextBookmark;
-		name = "    Gestalt(gestaltSystemVersion, (long*)&display->release);\n";
-		rLen = 61;
-		rLoc = 3320;
-		rType = 0;
-		vrLen = 1608;
-		vrLoc = 2724;
-	};
-	4C278DAE07F29CBB0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: ComputeIncDecParameters";
-		rLen = 0;
-		rLoc = 4218;
-		rType = 0;
-		vrLen = 1889;
-		vrLoc = 2853;
-	};
-	4C278DAF07F29CBB0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 179";
-		rLen = 0;
-		rLoc = 6127;
-		rType = 0;
-		vrLen = 926;
-		vrLoc = 4974;
-	};
-	4C278DB007F29CBB0034F48B = {
-		fRef = F5375568016C376E01DC9062;
-		isa = PBXTextBookmark;
-		name = "    Gestalt(gestaltSystemVersion, (long*)&display->release);\n";
-		rLen = 61;
-		rLoc = 3320;
-		rType = 0;
-		vrLen = 1608;
-		vrLoc = 2724;
-	};
-	4C278DB107F29CD40034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: ComputeIncDecParameters";
-		rLen = 0;
-		rLoc = 4218;
-		rType = 0;
-		vrLen = 1889;
-		vrLoc = 2853;
-	};
-	4C278DB207F29CD40034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 179";
-		rLen = 0;
-		rLoc = 6127;
-		rType = 0;
-		vrLen = 926;
-		vrLoc = 4974;
-	};
-	4C278DB307F29CD40034F48B = {
-		fRef = F5375568016C376E01DC9062;
-		isa = PBXTextBookmark;
-		name = "    Gestalt(gestaltSystemVersion, (long*)&display->release);\n";
-		rLen = 61;
-		rLoc = 3320;
-		rType = 0;
-		vrLen = 1608;
-		vrLoc = 2724;
-	};
-	4C278DB407F29D9C0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: ComputeIncDecParameters";
-		rLen = 0;
-		rLoc = 4218;
-		rType = 0;
-		vrLen = 1889;
-		vrLoc = 2853;
-	};
-	4C278DB507F29D9C0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 179";
-		rLen = 0;
-		rLoc = 6127;
-		rType = 0;
-		vrLen = 926;
-		vrLoc = 4974;
-	};
-	4C278DB607F29D9C0034F48B = {
-		fRef = F5375568016C376E01DC9062;
-		isa = PBXTextBookmark;
-		name = "    Gestalt(gestaltSystemVersion, (long*)&display->release);\n";
-		rLen = 61;
-		rLoc = 3320;
-		rType = 0;
-		vrLen = 1608;
-		vrLoc = 2724;
-	};
-	4C278DB707F29F4D0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: ComputeIncDecParameters";
-		rLen = 0;
-		rLoc = 4218;
-		rType = 0;
-		vrLen = 1889;
-		vrLoc = 2853;
-	};
-	4C278DB807F29F4D0034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 179";
-		rLen = 0;
-		rLoc = 6127;
-		rType = 0;
-		vrLen = 926;
-		vrLoc = 4974;
-	};
-	4C278DB907F29F4D0034F48B = {
-		fRef = F5375568016C376E01DC9062;
-		isa = PBXTextBookmark;
-		name = "    Gestalt(gestaltSystemVersion, (long*)&display->release);\n";
-		rLen = 61;
-		rLoc = 3320;
-		rType = 0;
-		vrLen = 1608;
-		vrLoc = 2724;
-	};
 	4C278DBA07F29FC40034F48B = {
 		fRef = 4C148E2407ECCFCF0033822E;
 		isa = PBXTextBookmark;
@@ -1946,16 +169,6 @@
 		vrLen = 1889;
 		vrLoc = 2853;
 	};
-	4C278DBB07F29FC40034F48B = {
-		fRef = 4CB2D7CF0619F8EB0081E375;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXScale.c: 252";
-		rLen = 0;
-		rLoc = 6482;
-		rType = 0;
-		vrLen = 2177;
-		vrLoc = 2979;
-	};
 	4C278DBC07F29FC40034F48B = {
 		fRef = 4C148E2407ECCFCF0033822E;
 		isa = PBXTextBookmark;
@@ -1966,66 +179,6 @@
 		vrLen = 1889;
 		vrLoc = 2853;
 	};
-	4C278DBD07F29FC40034F48B = {
-		fRef = 4CB2D7CF0619F8EB0081E375;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXScale.c: 252";
-		rLen = 0;
-		rLoc = 6482;
-		rType = 0;
-		vrLen = 2177;
-		vrLoc = 2979;
-	};
-	4C278DBE07F29FC40034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 179";
-		rLen = 0;
-		rLoc = 6127;
-		rType = 0;
-		vrLen = 926;
-		vrLoc = 4974;
-	};
-	4C278DBF07F29FC40034F48B = {
-		fRef = F5375568016C376E01DC9062;
-		isa = PBXTextBookmark;
-		name = "    Gestalt(gestaltSystemVersion, (long*)&display->release);\n";
-		rLen = 61;
-		rLoc = 3320;
-		rType = 0;
-		vrLen = 1608;
-		vrLoc = 2724;
-	};
-	4C278DC207F29FD30034F48B = {
-		fRef = 4CB2D7CF0619F8EB0081E375;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXScale.c: 252";
-		rLen = 0;
-		rLoc = 6482;
-		rType = 0;
-		vrLen = 2177;
-		vrLoc = 2979;
-	};
-	4C278DC307F29FD30034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 179";
-		rLen = 0;
-		rLoc = 6127;
-		rType = 0;
-		vrLen = 926;
-		vrLoc = 4974;
-	};
-	4C278DC407F29FD30034F48B = {
-		fRef = F5375568016C376E01DC9062;
-		isa = PBXTextBookmark;
-		name = "    Gestalt(gestaltSystemVersion, (long*)&display->release);\n";
-		rLen = 61;
-		rLoc = 3320;
-		rType = 0;
-		vrLen = 1608;
-		vrLoc = 2724;
-	};
 	4C278DC607F2A0260034F48B = {
 		fRef = 4CB2D7CF0619F8EB0081E375;
 		isa = PBXTextBookmark;
@@ -2056,37 +209,7 @@
 		vrLen = 2177;
 		vrLoc = 2979;
 	};
-	4C278DC907F2A0260034F48B = {
-		fRef = F53755CB016C389901DC9062;
-		isa = PBXTextBookmark;
-		name = "tkUnixScale.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1734;
-		vrLoc = 0;
-	};
-	4C278DCA07F2A0260034F48B = {
-		fRef = 4C148E2407ECCFCF0033822E;
-		isa = PBXTextBookmark;
-		name = "tkMacOSXEntry.c: 179";
-		rLen = 0;
-		rLoc = 6127;
-		rType = 0;
-		vrLen = 926;
-		vrLoc = 4974;
-	};
-	4C278DCB07F2A0260034F48B = {
-		fRef = F5375568016C376E01DC9062;
-		isa = PBXTextBookmark;
-		name = "    Gestalt(gestaltSystemVersion, (long*)&display->release);\n";
-		rLen = 61;
-		rLoc = 3320;
-		rType = 0;
-		vrLen = 1608;
-		vrLoc = 2724;
-	};
-	4C278DD007F2A03E0034F48B = {
+	4C278DD607F2A3110034F48B = {
 		fRef = F53755CB016C389901DC9062;
 		isa = PBXTextBookmark;
 		name = "tkUnixScale.c: 1";
@@ -2096,7 +219,7 @@
 		vrLen = 1734;
 		vrLoc = 0;
 	};
-	4C278DD107F2A03E0034F48B = {
+	4C278DD707F2A3110034F48B = {
 		fRef = 4C148E2407ECCFCF0033822E;
 		isa = PBXTextBookmark;
 		name = "tkMacOSXEntry.c: 179";
@@ -2106,7 +229,7 @@
 		vrLen = 926;
 		vrLoc = 4974;
 	};
-	4C278DD207F2A03E0034F48B = {
+	4C278DD807F2A3110034F48B = {
 		fRef = F5375568016C376E01DC9062;
 		isa = PBXTextBookmark;
 		name = "    Gestalt(gestaltSystemVersion, (long*)&display->release);\n";
@@ -2712,213 +835,25 @@
 			4C148E2707ECCFE30033822E = 4C148E2707ECCFE30033822E;
 			4C148E2907ECCFE30033822E = 4C148E2907ECCFE30033822E;
 			4C148E2A07ECCFE30033822E = 4C148E2A07ECCFE30033822E;
-			4C148EA607ED3FB90033822E = 4C148EA607ED3FB90033822E;
 			4C148EA707ED3FB90033822E = 4C148EA707ED3FB90033822E;
 			4C148EA907ED3FB90033822E = 4C148EA907ED3FB90033822E;
 			4C148EAA07ED3FB90033822E = 4C148EAA07ED3FB90033822E;
 			4C148EC207ED443A0033822E = 4C148EC207ED443A0033822E;
 			4C148EC307ED443A0033822E = 4C148EC307ED443A0033822E;
-			4C148EC407ED443A0033822E = 4C148EC407ED443A0033822E;
 			4C148EC507ED443A0033822E = 4C148EC507ED443A0033822E;
 			4C148EC607ED443A0033822E = 4C148EC607ED443A0033822E;
-			4C148ECB07ED48390033822E = 4C148ECB07ED48390033822E;
-			4C278C1007F273070034F48B = 4C278C1007F273070034F48B;
-			4C278C1107F273070034F48B = 4C278C1107F273070034F48B;
-			4C278C1707F273750034F48B = 4C278C1707F273750034F48B;
-			4C278C1F07F275760034F48B = 4C278C1F07F275760034F48B;
-			4C278C2307F275D30034F48B = 4C278C2307F275D30034F48B;
-			4C278C2707F275EC0034F48B = 4C278C2707F275EC0034F48B;
-			4C278C2807F276B40034F48B = 4C278C2807F276B40034F48B;
-			4C278C2B07F276D40034F48B = 4C278C2B07F276D40034F48B;
-			4C278C2C07F276DE0034F48B = 4C278C2C07F276DE0034F48B;
-			4C278C2D07F276E70034F48B = 4C278C2D07F276E70034F48B;
-			4C278C3507F2774F0034F48B = 4C278C3507F2774F0034F48B;
-			4C278C3C07F278180034F48B = 4C278C3C07F278180034F48B;
-			4C278C4407F279210034F48B = 4C278C4407F279210034F48B;
-			4C278C4607F27AEF0034F48B = 4C278C4607F27AEF0034F48B;
-			4C278C4C07F27B8D0034F48B = 4C278C4C07F27B8D0034F48B;
-			4C278C4D07F27B8D0034F48B = 4C278C4D07F27B8D0034F48B;
-			4C278C4E07F27B8D0034F48B = 4C278C4E07F27B8D0034F48B;
-			4C278C5107F27BA00034F48B = 4C278C5107F27BA00034F48B;
-			4C278C5207F27BA00034F48B = 4C278C5207F27BA00034F48B;
-			4C278C5307F27BB40034F48B = 4C278C5307F27BB40034F48B;
-			4C278C5407F27BB40034F48B = 4C278C5407F27BB40034F48B;
-			4C278C5707F27BC90034F48B = 4C278C5707F27BC90034F48B;
-			4C278C5807F27BC90034F48B = 4C278C5807F27BC90034F48B;
-			4C278C5D07F27BE00034F48B = 4C278C5D07F27BE00034F48B;
-			4C278C5E07F27BE00034F48B = 4C278C5E07F27BE00034F48B;
-			4C278C5F07F27C5C0034F48B = 4C278C5F07F27C5C0034F48B;
-			4C278C6207F27C610034F48B = 4C278C6207F27C610034F48B;
-			4C278C6307F27C610034F48B = 4C278C6307F27C610034F48B;
-			4C278C6407F27C720034F48B = 4C278C6407F27C720034F48B;
-			4C278C6507F27C720034F48B = 4C278C6507F27C720034F48B;
-			4C278C6607F27CAC0034F48B = 4C278C6607F27CAC0034F48B;
-			4C278C6707F27CAC0034F48B = 4C278C6707F27CAC0034F48B;
-			4C278C6807F27CFB0034F48B = 4C278C6807F27CFB0034F48B;
-			4C278C6907F27CFB0034F48B = 4C278C6907F27CFB0034F48B;
-			4C278C6C07F27E400034F48B = 4C278C6C07F27E400034F48B;
-			4C278C6D07F27E400034F48B = 4C278C6D07F27E400034F48B;
-			4C278C6E07F27E400034F48B = 4C278C6E07F27E400034F48B;
-			4C278C6F07F27F5C0034F48B = 4C278C6F07F27F5C0034F48B;
-			4C278C7007F27F5C0034F48B = 4C278C7007F27F5C0034F48B;
-			4C278C7107F27F850034F48B = 4C278C7107F27F850034F48B;
-			4C278C7207F27F850034F48B = 4C278C7207F27F850034F48B;
-			4C278C7507F283CB0034F48B = 4C278C7507F283CB0034F48B;
-			4C278C7607F283CB0034F48B = 4C278C7607F283CB0034F48B;
-			4C278C7707F285D40034F48B = 4C278C7707F285D40034F48B;
 			4C278C7807F285D40034F48B = 4C278C7807F285D40034F48B;
-			4C278C7907F285D40034F48B = 4C278C7907F285D40034F48B;
-			4C278C7A07F285E40034F48B = 4C278C7A07F285E40034F48B;
-			4C278C7B07F285E40034F48B = 4C278C7B07F285E40034F48B;
-			4C278C8007F285FE0034F48B = 4C278C8007F285FE0034F48B;
-			4C278C8107F285FE0034F48B = 4C278C8107F285FE0034F48B;
 			4C278C8207F2868D0034F48B = 4C278C8207F2868D0034F48B;
 			4C278C8307F2868D0034F48B = 4C278C8307F2868D0034F48B;
-			4C278C8407F2868D0034F48B = 4C278C8407F2868D0034F48B;
-			4C278C8507F2868D0034F48B = 4C278C8507F2868D0034F48B;
-			4C278C8A07F286A10034F48B = 4C278C8A07F286A10034F48B;
-			4C278C8B07F286A10034F48B = 4C278C8B07F286A10034F48B;
-			4C278C8C07F286C70034F48B = 4C278C8C07F286C70034F48B;
-			4C278C8D07F286C70034F48B = 4C278C8D07F286C70034F48B;
-			4C278C8E07F287030034F48B = 4C278C8E07F287030034F48B;
-			4C278C8F07F287030034F48B = 4C278C8F07F287030034F48B;
-			4C278C9207F2874B0034F48B = 4C278C9207F2874B0034F48B;
-			4C278C9307F287550034F48B = 4C278C9307F287550034F48B;
-			4C278C9407F287550034F48B = 4C278C9407F287550034F48B;
-			4C278C9707F287630034F48B = 4C278C9707F287630034F48B;
-			4C278C9807F287630034F48B = 4C278C9807F287630034F48B;
-			4C278C9907F2884F0034F48B = 4C278C9907F2884F0034F48B;
-			4C278C9A07F2884F0034F48B = 4C278C9A07F2884F0034F48B;
-			4C278C9B07F288F80034F48B = 4C278C9B07F288F80034F48B;
-			4C278C9C07F288F80034F48B = 4C278C9C07F288F80034F48B;
-			4C278C9D07F28A800034F48B = 4C278C9D07F28A800034F48B;
-			4C278C9E07F28A800034F48B = 4C278C9E07F28A800034F48B;
-			4C278CA307F28A960034F48B = 4C278CA307F28A960034F48B;
-			4C278CA407F28A960034F48B = 4C278CA407F28A960034F48B;
-			4C278CA507F28AED0034F48B = 4C278CA507F28AED0034F48B;
-			4C278CA607F28AED0034F48B = 4C278CA607F28AED0034F48B;
-			4C278CA907F28B040034F48B = 4C278CA907F28B040034F48B;
-			4C278CAA07F28B050034F48B = 4C278CAA07F28B050034F48B;
-			4C278CAB07F28B050034F48B = 4C278CAB07F28B050034F48B;
-			4C278CAC07F28B0C0034F48B = 4C278CAC07F28B0C0034F48B;
-			4C278CAD07F28B0C0034F48B = 4C278CAD07F28B0C0034F48B;
-			4C278CAE07F28B700034F48B = 4C278CAE07F28B700034F48B;
-			4C278CAF07F28B700034F48B = 4C278CAF07F28B700034F48B;
-			4C278CB007F28BD90034F48B = 4C278CB007F28BD90034F48B;
-			4C278CB107F28BD90034F48B = 4C278CB107F28BD90034F48B;
-			4C278CB407F28BE80034F48B = 4C278CB407F28BE80034F48B;
-			4C278CB507F28BE80034F48B = 4C278CB507F28BE80034F48B;
-			4C278CBD07F28C060034F48B = 4C278CBD07F28C060034F48B;
-			4C278CBE07F28C060034F48B = 4C278CBE07F28C060034F48B;
-			4C278CC107F28C990034F48B = 4C278CC107F28C990034F48B;
-			4C278CC207F28C990034F48B = 4C278CC207F28C990034F48B;
-			4C278CC507F28CA60034F48B = 4C278CC507F28CA60034F48B;
-			4C278CC607F28CA60034F48B = 4C278CC607F28CA60034F48B;
-			4C278CC707F28CBB0034F48B = 4C278CC707F28CBB0034F48B;
-			4C278CC807F28CBB0034F48B = 4C278CC807F28CBB0034F48B;
-			4C278CC907F28D2D0034F48B = 4C278CC907F28D2D0034F48B;
-			4C278CCA07F28D2D0034F48B = 4C278CCA07F28D2D0034F48B;
-			4C278CCD07F28D3C0034F48B = 4C278CCD07F28D3C0034F48B;
-			4C278CCE07F28D3C0034F48B = 4C278CCE07F28D3C0034F48B;
-			4C278CCF07F28D790034F48B = 4C278CCF07F28D790034F48B;
-			4C278CD007F28D790034F48B = 4C278CD007F28D790034F48B;
-			4C278CD307F28D870034F48B = 4C278CD307F28D870034F48B;
-			4C278CD407F28D870034F48B = 4C278CD407F28D870034F48B;
-			4C278CD507F28E290034F48B = 4C278CD507F28E290034F48B;
-			4C278CD607F28E290034F48B = 4C278CD607F28E290034F48B;
-			4C278CD907F28E360034F48B = 4C278CD907F28E360034F48B;
-			4C278CDA07F28E360034F48B = 4C278CDA07F28E360034F48B;
-			4C278CDB07F28F040034F48B = 4C278CDB07F28F040034F48B;
-			4C278CDC07F28F040034F48B = 4C278CDC07F28F040034F48B;
-			4C278CDF07F28F160034F48B = 4C278CDF07F28F160034F48B;
-			4C278CE007F28F160034F48B = 4C278CE007F28F160034F48B;
-			4C278CE107F28F500034F48B = 4C278CE107F28F500034F48B;
-			4C278CE207F28F500034F48B = 4C278CE207F28F500034F48B;
-			4C278CE307F28F6F0034F48B = 4C278CE307F28F6F0034F48B;
-			4C278CE407F28F6F0034F48B = 4C278CE407F28F6F0034F48B;
-			4C278CE507F28F7A0034F48B = 4C278CE507F28F7A0034F48B;
-			4C278CE607F28F7A0034F48B = 4C278CE607F28F7A0034F48B;
-			4C278CE907F28F8C0034F48B = 4C278CE907F28F8C0034F48B;
-			4C278CEA07F28F8C0034F48B = 4C278CEA07F28F8C0034F48B;
-			4C278CED07F28FCA0034F48B = 4C278CED07F28FCA0034F48B;
-			4C278CEE07F28FCA0034F48B = 4C278CEE07F28FCA0034F48B;
-			4C278CF107F28FD80034F48B = 4C278CF107F28FD80034F48B;
-			4C278CF207F28FD80034F48B = 4C278CF207F28FD80034F48B;
-			4C278CF307F2903F0034F48B = 4C278CF307F2903F0034F48B;
-			4C278CF407F2903F0034F48B = 4C278CF407F2903F0034F48B;
-			4C278CF707F2907E0034F48B = 4C278CF707F2907E0034F48B;
-			4C278CF807F2907E0034F48B = 4C278CF807F2907E0034F48B;
-			4C278CFB07F2908A0034F48B = 4C278CFB07F2908A0034F48B;
-			4C278CFC07F2908A0034F48B = 4C278CFC07F2908A0034F48B;
-			4C278CFD07F291C70034F48B = 4C278CFD07F291C70034F48B;
-			4C278CFE07F291C70034F48B = 4C278CFE07F291C70034F48B;
-			4C278D0107F291D80034F48B = 4C278D0107F291D80034F48B;
-			4C278D0207F291D80034F48B = 4C278D0207F291D80034F48B;
-			4C278D0307F291E90034F48B = 4C278D0307F291E90034F48B;
-			4C278D0407F291E90034F48B = 4C278D0407F291E90034F48B;
-			4C278D0507F292270034F48B = 4C278D0507F292270034F48B;
-			4C278D0607F292270034F48B = 4C278D0607F292270034F48B;
-			4C278D0707F292B50034F48B = 4C278D0707F292B50034F48B;
-			4C278D0807F292B50034F48B = 4C278D0807F292B50034F48B;
-			4C278D0B07F2932B0034F48B = 4C278D0B07F2932B0034F48B;
-			4C278D0C07F2932B0034F48B = 4C278D0C07F2932B0034F48B;
-			4C278D0F07F293390034F48B = 4C278D0F07F293390034F48B;
-			4C278D1007F293390034F48B = 4C278D1007F293390034F48B;
-			4C278D1107F293A60034F48B = 4C278D1107F293A60034F48B;
-			4C278D1207F293A60034F48B = 4C278D1207F293A60034F48B;
-			4C278D1507F295B60034F48B = 4C278D1507F295B60034F48B;
-			4C278D1607F295B60034F48B = 4C278D1607F295B60034F48B;
-			4C278D1907F295C60034F48B = 4C278D1907F295C60034F48B;
-			4C278D1A07F295C60034F48B = 4C278D1A07F295C60034F48B;
-			4C278D1B07F2964B0034F48B = 4C278D1B07F2964B0034F48B;
-			4C278D1C07F2964B0034F48B = 4C278D1C07F2964B0034F48B;
-			4C278D1F07F2965C0034F48B = 4C278D1F07F2965C0034F48B;
-			4C278D2007F2965C0034F48B = 4C278D2007F2965C0034F48B;
-			4C278D2107F296DA0034F48B = 4C278D2107F296DA0034F48B;
-			4C278D2207F296DC0034F48B = 4C278D2207F296DC0034F48B;
-			4C278D2307F296E20034F48B = 4C278D2307F296E20034F48B;
-			4C278D2A07F29A7E0034F48B = 4C278D2A07F29A7E0034F48B;
-			4C278D2B07F29A7E0034F48B = 4C278D2B07F29A7E0034F48B;
-			4C278D9A07F29B4F0034F48B = 4C278D9A07F29B4F0034F48B;
-			4C278D9B07F29B4F0034F48B = 4C278D9B07F29B4F0034F48B;
 			4C278D9C07F29B4F0034F48B = 4C278D9C07F29B4F0034F48B;
-			4C278D9D07F29B4F0034F48B = 4C278D9D07F29B4F0034F48B;
-			4C278DA407F29B630034F48B = 4C278DA407F29B630034F48B;
-			4C278DA507F29B630034F48B = 4C278DA507F29B630034F48B;
-			4C278DA607F29B630034F48B = 4C278DA607F29B630034F48B;
-			4C278DA907F29CA90034F48B = 4C278DA907F29CA90034F48B;
-			4C278DAA07F29CA90034F48B = 4C278DAA07F29CA90034F48B;
-			4C278DAB07F29CA90034F48B = 4C278DAB07F29CA90034F48B;
-			4C278DAE07F29CBB0034F48B = 4C278DAE07F29CBB0034F48B;
-			4C278DAF07F29CBB0034F48B = 4C278DAF07F29CBB0034F48B;
-			4C278DB007F29CBB0034F48B = 4C278DB007F29CBB0034F48B;
-			4C278DB107F29CD40034F48B = 4C278DB107F29CD40034F48B;
-			4C278DB207F29CD40034F48B = 4C278DB207F29CD40034F48B;
-			4C278DB307F29CD40034F48B = 4C278DB307F29CD40034F48B;
-			4C278DB407F29D9C0034F48B = 4C278DB407F29D9C0034F48B;
-			4C278DB507F29D9C0034F48B = 4C278DB507F29D9C0034F48B;
-			4C278DB607F29D9C0034F48B = 4C278DB607F29D9C0034F48B;
-			4C278DB707F29F4D0034F48B = 4C278DB707F29F4D0034F48B;
-			4C278DB807F29F4D0034F48B = 4C278DB807F29F4D0034F48B;
-			4C278DB907F29F4D0034F48B = 4C278DB907F29F4D0034F48B;
 			4C278DBA07F29FC40034F48B = 4C278DBA07F29FC40034F48B;
-			4C278DBB07F29FC40034F48B = 4C278DBB07F29FC40034F48B;
 			4C278DBC07F29FC40034F48B = 4C278DBC07F29FC40034F48B;
-			4C278DBD07F29FC40034F48B = 4C278DBD07F29FC40034F48B;
-			4C278DBE07F29FC40034F48B = 4C278DBE07F29FC40034F48B;
-			4C278DBF07F29FC40034F48B = 4C278DBF07F29FC40034F48B;
-			4C278DC207F29FD30034F48B = 4C278DC207F29FD30034F48B;
-			4C278DC307F29FD30034F48B = 4C278DC307F29FD30034F48B;
-			4C278DC407F29FD30034F48B = 4C278DC407F29FD30034F48B;
 			4C278DC607F2A0260034F48B = 4C278DC607F2A0260034F48B;
 			4C278DC707F2A0260034F48B = 4C278DC707F2A0260034F48B;
 			4C278DC807F2A0260034F48B = 4C278DC807F2A0260034F48B;
-			4C278DC907F2A0260034F48B = 4C278DC907F2A0260034F48B;
-			4C278DCA07F2A0260034F48B = 4C278DCA07F2A0260034F48B;
-			4C278DCB07F2A0260034F48B = 4C278DCB07F2A0260034F48B;
-			4C278DD007F2A03E0034F48B = 4C278DD007F2A03E0034F48B;
-			4C278DD107F2A03E0034F48B = 4C278DD107F2A03E0034F48B;
-			4C278DD207F2A03E0034F48B = 4C278DD207F2A03E0034F48B;
+			4C278DD607F2A3110034F48B = 4C278DD607F2A3110034F48B;
+			4C278DD707F2A3110034F48B = 4C278DD707F2A3110034F48B;
+			4C278DD807F2A3110034F48B = 4C278DD807F2A3110034F48B;
 		};
 		sourceControlManager = 4CDDF1E7052BE83A00D368E9;
 		userBuildSettings = {
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 378fe13..e1ee0ed 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.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: tkMacOSXMenu.c,v 1.17 2005/05/14 20:48:15 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.18 2005/05/15 21:09:34 wolfsuit Exp $
  */
 #include "tkMacOSXInt.h"
 #include "tkMenubutton.h"
@@ -991,7 +991,7 @@ TkpConfigureMenuEntry(
 	char *accelString = (mePtr->accelPtr == NULL) ? ""
 		: Tcl_GetStringFromObj(mePtr->accelPtr, NULL);
 	char *accel = accelString;
-	mePtr->entryFlags |= ~ENTRY_ACCEL_MASK;
+	mePtr->entryFlags &= ~ENTRY_ACCEL_MASK;
 	    
 	mePtr->entryFlags |= ParseAccelerators(&accelString);
 	
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 3746d7f..c6a8e29 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.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: tkMacOSXScrlbr.c,v 1.11 2005/05/15 04:18:36 wolfsuit Exp $
+ * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.12 2005/05/15 21:09:34 wolfsuit Exp $
  */
 
 #include "tkScrollbar.h"
@@ -1092,7 +1092,6 @@ UpdateControlValues(
     controlValue = (SInt32) (SCROLLBAR_SCALING_DVALUE * scrollPtr->firstFraction);
 
     SetControlViewSize(macScrollPtr->sbHandle,viewSize);
-    SetControl32BitValue(macScrollPtr->sbHandle, controlValue);
     SetControl32BitMaximum(macScrollPtr->sbHandle, controlMax);
 
 #if 0             
@@ -1118,6 +1117,7 @@ UpdateControlValues(
             HiliteControl(macScrollPtr->sbHandle, 0);
         }
     }
+    SetControl32BitValue(macScrollPtr->sbHandle, controlValue);
     
     if ( !IsControlVisible (macScrollPtr -> sbHandle) ) {
         SetControlVisibility(macScrollPtr->sbHandle,TRUE,FALSE);
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index f88a4e3..892b4fc 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.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: tkMacOSXXStubs.c,v 1.8 2005/05/14 20:48:15 das Exp $
+ * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.9 2005/05/15 21:09:34 wolfsuit Exp $
  */
 
 #include "tkInt.h"
@@ -761,10 +761,11 @@ TkMacOSXXGetPixel(
     int x,
     int y)
 {
-    CGrafPtr grafPtr;
+    CGrafPtr grafPtr, oldPort;
     RGBColor cPix;
     unsigned long r, g, b, c;
     grafPtr = (CGrafPtr)image->data;
+    GetPort(&oldPort);
     SetPort(grafPtr);
     GetCPixel(x,y,&cPix);
     if (image->obdata) {
@@ -778,6 +779,7 @@ TkMacOSXXGetPixel(
         b = cPix . blue;
     }
     c = (r<<16)|(g<<8)|(b);
+    SetPort(oldPort);
     return c;
 }
 
@@ -788,10 +790,11 @@ TkMacOSXXPutPixel(
     int y,
     unsigned long pixel)
 {
-    CGrafPtr grafPtr;
+    CGrafPtr grafPtr, oldPort;
     RGBColor cPix;
     unsigned long r, g, b;
     grafPtr = (CGrafPtr)image->data;
+    GetPort(&oldPort);
     SetPort(grafPtr);
     r  = (pixel & image->red_mask)>>16;
     g  = (pixel & image->green_mask)>>8;
@@ -807,6 +810,7 @@ TkMacOSXXPutPixel(
         cPix . blue = b;
     }
     SetCPixel(x,y,&cPix);
+    SetPort(oldPort);
     return 0;
 }