re-add layout code commented out in r13583

diff --git a/macosx/AddMagnetWindowController.m b/macosx/AddMagnetWindowController.m
index 8ab7fbe021214e515e30a96f82cc6e02f70e3fce..9f7604ace3bca0c316bc56c9bcc795b04932b303 100644 (file)
--- a/macosx/AddMagnetWindowController.m
+++ b/macosx/AddMagnetWindowController.m
@@ -95,8 +95,6 @@
         [fLocationImageView setImage: nil];
     }
     
-    #warning enable after 2.7 
-    /*
     #warning when 10.7-only, switch to auto layout
     [fMagnetLinkLabel sizeToFit];
     
@@ -138,7 +136,6 @@
     const CGFloat minButtonWidth = 82.0;
     const CGFloat oldAddButtonWidth = [fAddButton bounds].size.width;
     const CGFloat oldCancelButtonWidth = [fCancelButton bounds].size.width;
-    #warning add "extra" width that sizeToFit loses
     [fAddButton sizeToFit];
     [fCancelButton sizeToFit];
     NSRect addButtonFrame = [fAddButton frame];
@@ -154,7 +151,6 @@
     [fCancelButton setFrame: cancelButtonFrame];
     
     [fStartCheck sizeToFit];
-     */
 }
 
 - (void) windowDidLoad

diff --git a/macosx/InfoActivityViewController.m b/macosx/InfoActivityViewController.m
index 5fdba6ebf70398210d2eb9898eeeb152296470d7..8d191f3f1b89a3aeeb46ae3578b6540321086313 100644 (file)
--- a/macosx/InfoActivityViewController.m
+++ b/macosx/InfoActivityViewController.m
@@ -57,8 +57,7 @@
 {
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updatePiecesView) name: @"UpdatePiecesView" object: nil];
     
-    #warning remove when 10.7-only with auto layout
-    /*[fTransferSectionLabel sizeToFit];
+    [fTransferSectionLabel sizeToFit];
     [fDatesSectionLabel sizeToFit];
     [fTimeSectionLabel sizeToFit];
     
@@ -95,7 +94,7 @@
         frame.origin.x += widthIncrease;
         frame.size.width -= widthIncrease;
         [field setFrame: frame];
-    }*/
+    }
 }
 
 - (void) dealloc

diff --git a/macosx/InfoGeneralViewController.m b/macosx/InfoGeneralViewController.m
index 9c97b2acae09b791aa03db4d659483eb560f489e..cc24ba6fb045412c42ab7761dd649366e841508b 100644 (file)
--- a/macosx/InfoGeneralViewController.m
+++ b/macosx/InfoGeneralViewController.m
@@ -51,8 +51,6 @@
     [super dealloc];
 }
 
-#warning enable after 2.7
-/*
 - (void) awakeFromNib
 {
     #warning remove when 10.7-only with auto layout
@@ -93,7 +91,7 @@
         frame.size.width -= widthIncrease;
         [field setFrame: frame];
     }
-}*/
+}
 
 - (void) setInfoForTorrents: (NSArray *) torrents
 {

diff --git a/macosx/InfoOptionsViewController.m b/macosx/InfoOptionsViewController.m
index 2201150848e37bb6e6b6587bf3bf83fda83125cd..e752e269ea14a4fe773d53fc7dd70a595038d523 100644 (file)
--- a/macosx/InfoOptionsViewController.m
+++ b/macosx/InfoOptionsViewController.m
@@ -63,8 +63,6 @@
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(setGlobalLabels) name: @"UpdateGlobalOptions" object: nil];
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateOptionsNotification:) name: @"UpdateOptionsNotification" object: nil];
     
-    #warning enable after 2.7
-    /*
     #warning remove when 10.7-only with auto layout
     const CGFloat padding = 6.0; //this shows as 8 in IB
     [fPrioritySectionLabel sizeToFit];
@@ -130,7 +128,7 @@
     [fPeersConnectLabel sizeToFit];
     NSRect peersConnectLabelFrame = [fPeersConnectLabel frame];
     peersConnectLabelFrame.origin.x = NSMaxX(peersConnectFrame) + padding;
-    [fPeersConnectLabel setFrame: peersConnectLabelFrame];*/
+    [fPeersConnectLabel setFrame: peersConnectLabelFrame];
 }
 
 - (void) dealloc