Bring outline view branch up to date with trunk (r3056:r3162).

11 files changed, 94 insertions, 82 deletions

diff --git a/Frameworks/BWToolkitFramework.framework/Versions/A/BWToolkitFramework b/Frameworks/BWToolkitFramework.framework/Versions/A/BWToolkitFramework
index 8fea2fcd..81254dd3 100755
--- a/Frameworks/BWToolkitFramework.framework/Versions/A/BWToolkitFramework
+++ b/Frameworks/BWToolkitFramework.framework/Versions/A/BWToolkitFramework
diff --git a/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSplitView.h b/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSplitView.h
index ed9731a6..e0d32f67 100644
--- a/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSplitView.h
+++ b/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSplitView.h
@@ -16,6 +16,7 @@
 	NSMutableDictionary *minValues, *maxValues, *minUnits, *maxUnits;
 	NSMutableDictionary *resizableSubviewPreferredProportion, *nonresizableSubviewPreferredSize;
 	NSArray *stateForLastPreferredCalculations;
+	NSMutableArray *uncollapsedSizes;
 	int collapsiblePopupSelection;
 	float uncollapsedSize;
 	
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
index af5e6123..3556e9d7 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
@@ -1899,13 +1899,14 @@ void pingThreadCleanup(MCPConnectionPingDetails *pingDetails)
 }
 
 /**
- * Returns the number of affected rows by the last query.
+ * Returns the number of affected rows by the last query.  Only actual queries
+ * supplied via queryString:, streamingQueryString:, streamingQueryString:useLowMemoryBlockingStreaming:
+ * or queryString:usingEncoding:streamingResult: will have their affected rows
+ * returned, not any "meta" type queries.
  */
 - (my_ulonglong)affectedRows
 {
-	if (mConnected) {
-		return mysql_affected_rows(mConnection);
-	}
+	if (mConnected) return lastQueryAffectedRows;
 	
 	return 0;
 }
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPGeometryData.m b/Frameworks/MCPKit/MCPFoundationKit/MCPGeometryData.m
index aafdba0e..00d7d44f 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPGeometryData.m
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPGeometryData.m
@@ -103,11 +103,12 @@
 - (NSString*)wktString
 {
 	char byteOrder;
-	UInt32 geoType, srid, numberOfItems, numberOfSubItems, numberOfSubSubItems, numberOfCollectionItems;
+	uint32_t geoType, numberOfItems, numberOfSubItems, numberOfSubSubItems, numberOfCollectionItems;
+	int32_t srid;
 	st_point_2d aPoint;
 
-	NSUInteger i, j, k, n;          // Loop counter for numberOf...Items
-	NSUInteger ptr = BUFFER_START;  // pointer to geoBuffer while parsing
+	uint32_t i, j, k, n;          // Loop counter for numberOf...Items
+	uint32_t ptr = BUFFER_START;  // pointer to geoBuffer while parsing
 
 	NSMutableString *wkt = [NSMutableString string];
 
@@ -130,28 +131,28 @@
 
 		case wkb_point:
 		memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
-		return [NSString stringWithFormat:@"POINT(%.16g %.16g)%@", aPoint.x, aPoint.y, (srid) ? [NSString stringWithFormat:@",%u",srid]: @""];
+		return [NSString stringWithFormat:@"POINT(%.16g %.16g)%@", aPoint.x, aPoint.y, (srid) ? [NSString stringWithFormat:@",%d",srid]: @""];
 		break;
 
 		case wkb_linestring:
 		[wkt setString:@"LINESTRING("];
-		numberOfItems = geoBuffer[ptr];
+		memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 		ptr += SIZEOF_STORED_UINT32;
 		for(i=0; i < numberOfItems; i++) {
 			memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
 			[wkt appendFormat:@"%.16g %.16g%@", aPoint.x, aPoint.y, (i < numberOfItems-1) ? @"," : @""];
 			ptr += POINT_DATA_SIZE;
 		}
-		[wkt appendFormat:@")%@", (srid) ? [NSString stringWithFormat:@",%u",srid]: @""];
+		[wkt appendFormat:@")%@", (srid) ? [NSString stringWithFormat:@",%d",srid]: @""];
 		return wkt;
 		break;
 
 		case wkb_polygon:
 		[wkt setString:@"POLYGON("];
-		numberOfItems = geoBuffer[ptr];
+		memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 		ptr += SIZEOF_STORED_UINT32;
 		for(i=0; i < numberOfItems; i++) {
-			numberOfSubItems = geoBuffer[ptr];
+			memcpy(&numberOfSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 			ptr += SIZEOF_STORED_UINT32;
 			[wkt appendString:@"("];
 			for(j=0; j < numberOfSubItems; j++) {
@@ -161,29 +162,29 @@
 			}
 			[wkt appendFormat:@")%@", (i < numberOfItems-1) ? @"," : @""];
 		}
-		[wkt appendFormat:@")%@", (srid) ? [NSString stringWithFormat:@",%u",srid]: @""];
+		[wkt appendFormat:@")%@", (srid) ? [NSString stringWithFormat:@",%d",srid]: @""];
 		return wkt;
 		break;
 
 		case wkb_multipoint:
 		[wkt setString:@"MULTIPOINT("];
-		numberOfItems = geoBuffer[ptr];
+		memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 		ptr += SIZEOF_STORED_UINT32+WKB_HEADER_SIZE;
 		for(i=0; i < numberOfItems; i++) {
 			memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
 			[wkt appendFormat:@"%.16g %.16g%@", aPoint.x, aPoint.y, (i < numberOfItems-1) ? @"," : @""];
 			ptr += POINT_DATA_SIZE+WKB_HEADER_SIZE;
 		}
-		[wkt appendFormat:@")%@", (srid) ? [NSString stringWithFormat:@",%u",srid]: @""];
+		[wkt appendFormat:@")%@", (srid) ? [NSString stringWithFormat:@",%d",srid]: @""];
 		return wkt;
 		break;
 
 		case wkb_multilinestring:
 		[wkt setString:@"MULTILINESTRING("];
-		numberOfItems = geoBuffer[ptr];
+		memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 		ptr += SIZEOF_STORED_UINT32+WKB_HEADER_SIZE;
 		for(i=0; i < numberOfItems; i++) {
-			numberOfSubItems = geoBuffer[ptr];
+			memcpy(&numberOfSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 			ptr += SIZEOF_STORED_UINT32;
 			[wkt appendString:@"("];
 			for(j=0; j < numberOfSubItems; j++) {
@@ -194,20 +195,20 @@
 			ptr += WKB_HEADER_SIZE;
 			[wkt appendFormat:@")%@", (i < numberOfItems-1) ? @"," : @""];
 		}
-		[wkt appendFormat:@")%@", (srid) ? [NSString stringWithFormat:@",%u",srid]: @""];
+		[wkt appendFormat:@")%@", (srid) ? [NSString stringWithFormat:@",%d",srid]: @""];
 		return wkt;
 		break;
 
 		case wkb_multipolygon:
 		[wkt setString:@"MULTIPOLYGON("];
-		numberOfItems = geoBuffer[ptr];
+		memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 		ptr += SIZEOF_STORED_UINT32+WKB_HEADER_SIZE;
 		for(i=0; i < numberOfItems; i++) {
-			numberOfSubItems = geoBuffer[ptr];
+			memcpy(&numberOfSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 			ptr += SIZEOF_STORED_UINT32;
 			[wkt appendString:@"("];
 			for(j=0; j < numberOfSubItems; j++) {
-				numberOfSubSubItems = geoBuffer[ptr];
+				memcpy(&numberOfSubSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 				ptr += SIZEOF_STORED_UINT32;
 				[wkt appendString:@"("];
 				for(k=0; k < numberOfSubSubItems; k++) {
@@ -220,7 +221,7 @@
 			ptr += WKB_HEADER_SIZE;
 			[wkt appendFormat:@")%@", (i < numberOfItems-1) ? @"," : @""];
 		}
-		[wkt appendFormat:@")%@", (srid) ? [NSString stringWithFormat:@",%u",srid]: @""];
+		[wkt appendFormat:@")%@", (srid) ? [NSString stringWithFormat:@",%d",srid]: @""];
 		return wkt;
 		break;
 
@@ -250,7 +251,7 @@
 
 				case wkb_linestring:
 				[wkt appendString:@"LINESTRING("];
-				numberOfItems = geoBuffer[ptr];
+				memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 				ptr += SIZEOF_STORED_UINT32;
 				for(i=0; i < numberOfItems; i++) {
 					memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
@@ -262,10 +263,10 @@
 
 				case wkb_polygon:
 				[wkt appendString:@"POLYGON("];
-				numberOfItems = geoBuffer[ptr];
+				memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 				ptr += SIZEOF_STORED_UINT32;
 				for(i=0; i < numberOfItems; i++) {
-					numberOfSubItems = geoBuffer[ptr];
+					memcpy(&numberOfSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 					ptr += SIZEOF_STORED_UINT32;
 					[wkt appendString:@"("];
 					for(j=0; j < numberOfSubItems; j++) {
@@ -280,7 +281,7 @@
 
 				case wkb_multipoint:
 				[wkt appendString:@"MULTIPOINT("];
-				numberOfItems = geoBuffer[ptr];
+				memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 				ptr += SIZEOF_STORED_UINT32+WKB_HEADER_SIZE;
 				for(i=0; i < numberOfItems; i++) {
 					memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
@@ -293,10 +294,10 @@
 
 				case wkb_multilinestring:
 				[wkt appendString:@"MULTILINESTRING("];
-				numberOfItems = geoBuffer[ptr];
+				memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 				ptr += SIZEOF_STORED_UINT32+WKB_HEADER_SIZE;
 				for(i=0; i < numberOfItems; i++) {
-					numberOfSubItems = geoBuffer[ptr];
+					memcpy(&numberOfSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 					ptr += SIZEOF_STORED_UINT32;
 					[wkt appendString:@"("];
 					for(j=0; j < numberOfSubItems; j++) {
@@ -313,14 +314,14 @@
 
 				case wkb_multipolygon:
 				[wkt appendString:@"MULTIPOLYGON("];
-				numberOfItems = geoBuffer[ptr];
+				memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 				ptr += SIZEOF_STORED_UINT32+WKB_HEADER_SIZE;
 				for(i=0; i < numberOfItems; i++) {
-					numberOfSubItems = geoBuffer[ptr];
+					memcpy(&numberOfSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 					ptr += SIZEOF_STORED_UINT32;
 					[wkt appendString:@"("];
 					for(j=0; j < numberOfSubItems; j++) {
-						numberOfSubSubItems = geoBuffer[ptr];
+						memcpy(&numberOfSubSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 						ptr += SIZEOF_STORED_UINT32;
 						[wkt appendString:@"("];
 						for(k=0; k < numberOfSubSubItems; k++) {
@@ -342,7 +343,7 @@
 			}
 			[wkt appendString:(n < numberOfCollectionItems-1) ? @"," : @""];
 		}
-		[wkt appendFormat:@")%@", (srid) ? [NSString stringWithFormat:@",%u",srid]: @""];
+		[wkt appendFormat:@")%@", (srid) ? [NSString stringWithFormat:@",%d",srid]: @""];
 		return wkt;
 		break;
 
@@ -362,16 +363,17 @@
 {
 
 	char byteOrder;
-	UInt32 geoType, srid, numberOfItems, numberOfSubItems, numberOfSubSubItems, numberOfCollectionItems;
+	uint32_t geoType, numberOfItems, numberOfSubItems, numberOfSubSubItems, numberOfCollectionItems;
+	int32_t srid;
 	st_point_2d aPoint;
 
-	NSUInteger i, j, k, n;          // Loop counter for numberOf...Items
-	NSUInteger ptr = BUFFER_START;  // pointer to geoBuffer while parsing
+	uint32_t i, j, k, n;          // Loop counter for numberOf...Items
+	uint32_t ptr = BUFFER_START;  // pointer to geoBuffer while parsing
 
-	double x_min = 1e999;
-	double x_max = -1e999;
-	double y_min = 1e999;
-	double y_max = -1e999;
+	double x_min = 1e998;
+	double x_max = -1e998;
+	double y_min = 1e998;
+	double y_max = -1e998;
 
 	NSMutableArray *coordinates = [NSMutableArray array];
 	NSMutableArray *subcoordinates = [NSMutableArray array];
@@ -413,13 +415,13 @@
 				[NSNumber numberWithDouble:y_max],
 				nil], @"bbox",
 			coordinates, @"coordinates",
-			[NSNumber numberWithUnsignedInt:srid], @"srid",
+			[NSNumber numberWithInt:srid], @"srid",
 			@"POINT", @"type",
 			nil];
 		break;
 
 		case wkb_linestring:
-		numberOfItems = geoBuffer[ptr];
+		memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 		ptr += SIZEOF_STORED_UINT32;
 		for(i=0; i < numberOfItems; i++) {
 			memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
@@ -443,10 +445,10 @@
 		break;
 
 		case wkb_polygon:
-		numberOfItems = geoBuffer[ptr];
+		memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 		ptr += SIZEOF_STORED_UINT32;
 		for(i=0; i < numberOfItems; i++) {
-			numberOfSubItems = geoBuffer[ptr];
+			memcpy(&numberOfSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 			ptr += SIZEOF_STORED_UINT32;
 			for(j=0; j < numberOfSubItems; j++) {
 				memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
@@ -468,13 +470,13 @@
 				[NSNumber numberWithDouble:y_max],
 				nil], @"bbox",
 			coordinates, @"coordinates",
-			[NSNumber numberWithUnsignedInt:srid], @"srid",
+			[NSNumber numberWithInt:srid], @"srid",
 			@"POLYGON", @"type",
 			nil];
 		break;
 
 		case wkb_multipoint:
-		numberOfItems = geoBuffer[ptr];
+		memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 		ptr += SIZEOF_STORED_UINT32+WKB_HEADER_SIZE;
 		for(i=0; i < numberOfItems; i++) {
 			memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
@@ -493,16 +495,16 @@
 				[NSNumber numberWithDouble:y_max],
 				nil], @"bbox",
 			coordinates, @"coordinates",
-			[NSNumber numberWithUnsignedInt:srid], @"srid",
+			[NSNumber numberWithInt:srid], @"srid",
 			@"MULTIPOINT", @"type",
 			nil];
 		break;
 		
 		case wkb_multilinestring:
-		numberOfItems = geoBuffer[ptr];
+		memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 		ptr += SIZEOF_STORED_UINT32+WKB_HEADER_SIZE;
 		for(i=0; i < numberOfItems; i++) {
-			numberOfSubItems = geoBuffer[ptr];
+			memcpy(&numberOfSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 			ptr += SIZEOF_STORED_UINT32;
 			for(j=0; j < numberOfSubItems; j++) {
 				memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
@@ -525,19 +527,19 @@
 				[NSNumber numberWithDouble:y_max],
 				nil], @"bbox",
 			coordinates, @"coordinates",
-			[NSNumber numberWithUnsignedInt:srid], @"srid",
+			[NSNumber numberWithInt:srid], @"srid",
 			@"MULTILINESTRING", @"type",
 			nil];
 		break;
 		
 		case wkb_multipolygon:
-		numberOfItems = geoBuffer[ptr];
+		memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 		ptr += SIZEOF_STORED_UINT32+WKB_HEADER_SIZE;
 		for(i=0; i < numberOfItems; i++) {
-			numberOfSubItems = geoBuffer[ptr];
+			memcpy(&numberOfSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 			ptr += SIZEOF_STORED_UINT32;
 			for(j=0; j < numberOfSubItems; j++) {
-				numberOfSubSubItems = geoBuffer[ptr];
+				memcpy(&numberOfSubSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 				ptr += SIZEOF_STORED_UINT32;
 				for(k=0; k < numberOfSubSubItems; k++) {
 					memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
@@ -561,7 +563,7 @@
 				[NSNumber numberWithDouble:y_max],
 				nil], @"bbox",
 			coordinates, @"coordinates",
-			[NSNumber numberWithUnsignedInt:srid], @"srid",
+			[NSNumber numberWithInt:srid], @"srid",
 			@"MULTIPOLYGON", @"type",
 			nil];
 		break;
@@ -594,7 +596,7 @@
 				break;
 		
 				case wkb_linestring:
-				numberOfItems = geoBuffer[ptr];
+				memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 				ptr += SIZEOF_STORED_UINT32;
 				for(i=0; i < numberOfItems; i++) {
 					memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
@@ -610,10 +612,10 @@
 				break;
 		
 				case wkb_polygon:
-				numberOfItems = geoBuffer[ptr];
+				memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 				ptr += SIZEOF_STORED_UINT32;
 				for(i=0; i < numberOfItems; i++) {
-					numberOfSubItems = geoBuffer[ptr];
+					memcpy(&numberOfSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 					ptr += SIZEOF_STORED_UINT32;
 					for(j=0; j < numberOfSubItems; j++) {
 						memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
@@ -630,7 +632,7 @@
 				break;
 		
 				case wkb_multipoint:
-				numberOfItems = geoBuffer[ptr];
+				memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 				ptr += SIZEOF_STORED_UINT32+WKB_HEADER_SIZE;
 				for(i=0; i < numberOfItems; i++) {
 					memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
@@ -645,10 +647,10 @@
 				break;
 		
 				case wkb_multilinestring:
-				numberOfItems = geoBuffer[ptr];
+				memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 				ptr += SIZEOF_STORED_UINT32+WKB_HEADER_SIZE;
 				for(i=0; i < numberOfItems; i++) {
-					numberOfSubItems = geoBuffer[ptr];
+					memcpy(&numberOfSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 					ptr += SIZEOF_STORED_UINT32;
 					for(j=0; j < numberOfSubItems; j++) {
 						memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
@@ -667,13 +669,13 @@
 				break;
 		
 				case wkb_multipolygon:
-				numberOfItems = geoBuffer[ptr];
+				memcpy(&numberOfItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 				ptr += SIZEOF_STORED_UINT32+WKB_HEADER_SIZE;
 				for(i=0; i < numberOfItems; i++) {
-					numberOfSubItems = geoBuffer[ptr];
+					memcpy(&numberOfSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 					ptr += SIZEOF_STORED_UINT32;
 					for(j=0; j < numberOfSubItems; j++) {
-						numberOfSubSubItems = geoBuffer[ptr];
+						memcpy(&numberOfSubSubItems, &geoBuffer[ptr], SIZEOF_STORED_UINT32);
 						ptr += SIZEOF_STORED_UINT32;
 						for(k=0; k < numberOfSubSubItems; k++) {
 							memcpy(&aPoint, &geoBuffer[ptr], POINT_DATA_SIZE);
diff --git a/Frameworks/PSMTabBar/PSMTabBarControl.m b/Frameworks/PSMTabBar/PSMTabBarControl.m
index a9268a78..8debd774 100644
--- a/Frameworks/PSMTabBar/PSMTabBarControl.m
+++ b/Frameworks/PSMTabBar/PSMTabBarControl.m
@@ -265,8 +265,8 @@
 	}
 	
     if (aWindow) {
-		[center addObserver:self selector:@selector(windowStatusDidChange:) name:NSWindowDidBecomeKeyNotification object:aWindow];
-		[center addObserver:self selector:@selector(windowStatusDidChange:) name:NSWindowDidResignKeyNotification object:aWindow];
+		[center addObserver:self selector:@selector(windowStatusDidChange:) name:NSWindowDidBecomeMainNotification object:aWindow];
+		[center addObserver:self selector:@selector(windowStatusDidChange:) name:NSWindowDidResignMainNotification object:aWindow];
 		[center addObserver:self selector:@selector(windowDidUpdate:) name:NSWindowDidUpdateNotification object:aWindow];
 		[center addObserver:self selector:@selector(windowDidMove:) name:NSWindowDidMoveNotification object:aWindow];
     }
diff --git a/Frameworks/PSMTabBar/Styles/PSMAdiumTabStyle.m b/Frameworks/PSMTabBar/Styles/PSMAdiumTabStyle.m
index be5cf82d..3bda9cf5 100644
--- a/Frameworks/PSMTabBar/Styles/PSMAdiumTabStyle.m
+++ b/Frameworks/PSMTabBar/Styles/PSMAdiumTabStyle.m
@@ -399,7 +399,7 @@
 	// Paragraph Style for Truncating Long Text
 	static NSMutableParagraphStyle *TruncatingTailParagraphStyle = nil;
 	if (!TruncatingTailParagraphStyle) {
-		TruncatingTailParagraphStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
+		TruncatingTailParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
 		[TruncatingTailParagraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
 	}
 	[attrStr addAttribute:NSParagraphStyleAttributeName value:TruncatingTailParagraphStyle range:range];
@@ -995,11 +995,12 @@
 		NSMutableParagraphStyle *centeredParagraphStyle = nil;
 		
 		if (!centeredParagraphStyle) {
-			centeredParagraphStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
+			centeredParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
 			[centeredParagraphStyle setAlignment:NSCenterTextAlignment];
 		}
 		
 		[attrStr addAttribute:NSParagraphStyleAttributeName value:centeredParagraphStyle range:range];
+		[centeredParagraphStyle release];
 		[attrStr drawInRect:labelRect];
 		return;
 	}
diff --git a/Frameworks/PSMTabBar/Styles/PSMAquaTabStyle.m b/Frameworks/PSMTabBar/Styles/PSMAquaTabStyle.m
index f2618fe5..901f3b4a 100644
--- a/Frameworks/PSMTabBar/Styles/PSMAquaTabStyle.m
+++ b/Frameworks/PSMTabBar/Styles/PSMAquaTabStyle.m
@@ -312,12 +312,12 @@
     // Paragraph Style for Truncating Long Text
     static NSMutableParagraphStyle *TruncatingTailParagraphStyle = nil;
     if (!TruncatingTailParagraphStyle) {
-        TruncatingTailParagraphStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
+        TruncatingTailParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
         [TruncatingTailParagraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
         [TruncatingTailParagraphStyle setAlignment:NSCenterTextAlignment];
     }
     [attrStr addAttribute:NSParagraphStyleAttributeName value:TruncatingTailParagraphStyle range:range];
-    
+
     return attrStr;	
 }
 
@@ -414,10 +414,11 @@
         [attrStr addAttribute:NSFontAttributeName value:[NSFont systemFontOfSize:11.0] range:range];
         NSMutableParagraphStyle *centeredParagraphStyle = nil;
         if (!centeredParagraphStyle) {
-            centeredParagraphStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
+            centeredParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
             [centeredParagraphStyle setAlignment:NSCenterTextAlignment];
         }
         [attrStr addAttribute:NSParagraphStyleAttributeName value:centeredParagraphStyle range:range];
+        [centeredParagraphStyle release];
         [attrStr drawInRect:labelRect];
         return;
     }
diff --git a/Frameworks/PSMTabBar/Styles/PSMCardTabStyle.m b/Frameworks/PSMTabBar/Styles/PSMCardTabStyle.m
index 31da000c..56c3a173 100644
--- a/Frameworks/PSMTabBar/Styles/PSMCardTabStyle.m
+++ b/Frameworks/PSMTabBar/Styles/PSMCardTabStyle.m
@@ -298,11 +298,11 @@
     // Paragraph Style for Truncating Long Text
     static NSMutableParagraphStyle *TruncatingTailParagraphStyle = nil;
     if (!TruncatingTailParagraphStyle) {
-        TruncatingTailParagraphStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
+        TruncatingTailParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
         [TruncatingTailParagraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
     }
     [attrStr addAttribute:NSParagraphStyleAttributeName value:TruncatingTailParagraphStyle range:range];
-    
+
     return attrStr;	
 }
 
diff --git a/Frameworks/PSMTabBar/Styles/PSMMetalTabStyle.m b/Frameworks/PSMTabBar/Styles/PSMMetalTabStyle.m
index 443179ce..db9bbd86 100644
--- a/Frameworks/PSMTabBar/Styles/PSMMetalTabStyle.m
+++ b/Frameworks/PSMTabBar/Styles/PSMMetalTabStyle.m
@@ -327,7 +327,7 @@
     // Paragraph Style for Truncating Long Text
     static NSMutableParagraphStyle *TruncatingTailParagraphStyle = nil;
     if (!TruncatingTailParagraphStyle) {
-        TruncatingTailParagraphStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
+        TruncatingTailParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
         [TruncatingTailParagraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
         [TruncatingTailParagraphStyle setAlignment:NSCenterTextAlignment];
     }
@@ -592,10 +592,11 @@
         [attrStr addAttribute:NSFontAttributeName value:[NSFont systemFontOfSize:11.0] range:range];
         NSMutableParagraphStyle *centeredParagraphStyle = nil;
         if (!centeredParagraphStyle) {
-            centeredParagraphStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
+            centeredParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
             [centeredParagraphStyle setAlignment:NSCenterTextAlignment];
         }
         [attrStr addAttribute:NSParagraphStyleAttributeName value:centeredParagraphStyle range:range];
+        [centeredParagraphStyle release];
         [attrStr drawInRect:labelRect];
         return;
     }
diff --git a/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m b/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m
index 9ec84db8..48db93c3 100644
--- a/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m
+++ b/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m
@@ -337,7 +337,7 @@
     // Paragraph Style for Truncating Long Text
     static NSMutableParagraphStyle *TruncatingTailParagraphStyle = nil;
     if (!TruncatingTailParagraphStyle) {
-        TruncatingTailParagraphStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
+        TruncatingTailParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
         [TruncatingTailParagraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
         [TruncatingTailParagraphStyle setAlignment:NSCenterTextAlignment];
     }
@@ -375,10 +375,11 @@
         NSMutableParagraphStyle *centeredParagraphStyle = nil;
         
 		if (!centeredParagraphStyle) {
-            centeredParagraphStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
+            centeredParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
             [centeredParagraphStyle setAlignment:NSCenterTextAlignment];
         }
         [attrStr addAttribute:NSParagraphStyleAttributeName value:centeredParagraphStyle range:range];
+        [centeredParagraphStyle release];
         [attrStr drawInRect:labelRect];
         return;
     }
@@ -409,7 +410,7 @@
 
 	// When the window is in the background, tone down the colours
 	if (![[tabBar window] isMainWindow] || ![NSApp isActive]) {
-		backgroundCalibratedWhite = 0.685;
+		backgroundCalibratedWhite = 0.73;
 		lineCalibratedWhite = 0.49;
 		shadowAlpha = 0.3;
 	}
@@ -514,7 +515,7 @@
 			fillColor = [NSColor colorWithCalibratedWhite:0.81 alpha:1.0];
 			shadowColor = [NSColor colorWithCalibratedWhite:0.0 alpha:0.4];
 		} else {
-			fillColor = [NSColor colorWithCalibratedWhite:0.685 alpha:1.0];
+			fillColor = [NSColor colorWithCalibratedWhite:0.73 alpha:1.0];
 			shadowColor = [NSColor colorWithCalibratedWhite:0.0 alpha:0.7];
 		}
 	}
@@ -533,7 +534,7 @@
 	topLeftArcCenter = NSMakePoint(aRect.origin.x - kPSMSequelProTabCornerRadius + 0.5, aRect.origin.y + kPSMSequelProTabCornerRadius);
 	topRightArcCenter = NSMakePoint(aRect.origin.x + aRect.size.width + kPSMSequelProTabCornerRadius + 0.5, aRect.origin.y + kPSMSequelProTabCornerRadius);
 	bottomLeftArcCenter = NSMakePoint(aRect.origin.x + kPSMSequelProTabCornerRadius + 0.5, aRect.origin.y + aRect.size.height - kPSMSequelProTabCornerRadius);
-	bottomRightArcCenter = NSMakePoint(aRect.origin.x + aRect.size.width - kPSMSequelProTabCornerRadius + 0.5, aRect.origin.y + aRect.size.height - kPSMSequelProTabCornerRadius );
+	bottomRightArcCenter = NSMakePoint(aRect.origin.x + aRect.size.width - kPSMSequelProTabCornerRadius + 0.5, aRect.origin.y + aRect.size.height - kPSMSequelProTabCornerRadius);
 
 	// Construct the outline path
 	if (drawLeftEdge) {
@@ -594,6 +595,7 @@
 		[shadow setShadowOffset:NSMakeSize(0, 1)];
 		[shadow set];
 		[outlineBezier stroke];
+		[shadow release];
 
 	// Add the shadow over the tops of background tabs
 	} else if (drawLeftEdge || drawRightEdge) {
@@ -632,12 +634,14 @@
 
 		// Draw, and then restore the previous graphics state
 		[outlineBezier stroke];
+		[shadow release];
 		CGContextRestoreGState(context);
 	}
 	
 	[NSGraphicsContext restoreGraphicsState];
 	
-    [self drawInteriorWithTabCell:cell inView:[cell controlView]];
+	[self drawInteriorWithTabCell:cell inView:[cell controlView]];
+
 }
 
 
diff --git a/Frameworks/PSMTabBar/Styles/PSMUnifiedTabStyle.m b/Frameworks/PSMTabBar/Styles/PSMUnifiedTabStyle.m
index 13fb0994..76b5efc1 100644
--- a/Frameworks/PSMTabBar/Styles/PSMUnifiedTabStyle.m
+++ b/Frameworks/PSMTabBar/Styles/PSMUnifiedTabStyle.m
@@ -297,11 +297,11 @@
     // Paragraph Style for Truncating Long Text
     static NSMutableParagraphStyle *TruncatingTailParagraphStyle = nil;
     if (!TruncatingTailParagraphStyle) {
-        TruncatingTailParagraphStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
+        TruncatingTailParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
         [TruncatingTailParagraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
     }
     [attrStr addAttribute:NSParagraphStyleAttributeName value:TruncatingTailParagraphStyle range:range];
-    
+
     return attrStr;	
 }
 
@@ -540,10 +540,11 @@
         [attrStr addAttribute:NSFontAttributeName value:[NSFont systemFontOfSize:11.0] range:range];
         NSMutableParagraphStyle *centeredParagraphStyle = nil;
         if (!centeredParagraphStyle) {
-            centeredParagraphStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
+            centeredParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
             [centeredParagraphStyle setAlignment:NSCenterTextAlignment];
         }
         [attrStr addAttribute:NSParagraphStyleAttributeName value:centeredParagraphStyle range:range];
+        [centeredParagraphStyle release];
         [attrStr drawInRect:labelRect];
         return;
     }