Change name of the 'layout' method of ScintillaView and InfoBar to 'positionSubViews'

as 'layout' has been added to their superclass NSView in OS X 10.7. The existing
'layout' method interfered with the new automatic layout feature.

4 files changed, 11 insertions, 11 deletions

diff --git a/cocoa/InfoBar.h b/cocoa/InfoBar.h
index a83a92c9b..efde17944 100644
--- a/cocoa/InfoBar.h
+++ b/cocoa/InfoBar.h
@@ -45,7 +45,7 @@
 - (void) setCallback: (id <InfoBarCommunicator>) callback;
 
 - (void) createItems;
-- (void) layout;
+- (void) positionSubViews;
 - (void) setDisplay: (IBDisplay) display;
 - (void) zoomItemAction: (id) sender;
 - (void) setScaleFactor: (float) newScaleFactor adjustPopup: (BOOL) flag;
diff --git a/cocoa/InfoBar.mm b/cocoa/InfoBar.mm
index 0d4a7a750..d3acf0097 100644
--- a/cocoa/InfoBar.mm
+++ b/cocoa/InfoBar.mm
@@ -294,12 +294,12 @@ static float BarFontSize = 10.0;
 - (void) setFrame: (NSRect) newFrame
 {
   [super setFrame: newFrame];
-  [self layout];
+  [self positionSubViews];
 }
 
 //--------------------------------------------------------------------------------------------------
 
-- (void) layout
+- (void) positionSubViews
 {
   NSRect currentBounds = {0, 0, 0, [self frame].size.height};
   if (mDisplayMask & IBShowZoom)
@@ -345,7 +345,7 @@ static float BarFontSize = 10.0;
   if (mDisplayMask != display)
   {
     mDisplayMask = display;
-    [self layout];
+    [self positionSubViews];
     [self needsDisplay];
   }  
 }
diff --git a/cocoa/ScintillaView.h b/cocoa/ScintillaView.h
index 4dac0ad06..bcbd1eea0 100644
--- a/cocoa/ScintillaView.h
+++ b/cocoa/ScintillaView.h
@@ -69,7 +69,7 @@ extern NSString *SCIUpdateUINotification;
 }
 
 - (void) dealloc;
-- (void) layout;
+- (void) positionSubViews;
 
 - (void) sendNotification: (NSString*) notificationName;
 - (void) notify: (NotificationType) type message: (NSString*) message location: (NSPoint) location
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index 2a3546b7b..67d79665e 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -876,7 +876,7 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
 {
   [super viewDidMoveToWindow];
   
-  [self layout];
+  [self positionSubViews];
   
   // Enable also mouse move events for our window (and so this view).
   [[self window] setAcceptsMouseMovedEvents: YES];
@@ -887,7 +887,7 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
 /**
  * Used to position and size the parts of the editor (content, scrollers, info bar).
  */
-- (void) layout
+- (void) positionSubViews
 {
   int scrollerWidth = [NSScroller scrollerWidth];
 
@@ -1000,7 +1000,7 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
     [mVerticalScroller setHidden: hideScroller];
     if (!hideScroller)
       [mVerticalScroller setFloatValue: 0];
-    [self layout];
+    [self positionSubViews];
   }
   
   if (!hideScroller)
@@ -1050,7 +1050,7 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
   {
     result = YES;
     [mHorizontalScroller setHidden: hideScroller];
-    [self layout];
+    [self positionSubViews];
   }
   
   if (!hideScroller)
@@ -1101,7 +1101,7 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
 - (void) setFrame: (NSRect) newFrame
 {
   [super setFrame: newFrame];
-  [self layout];
+  [self positionSubViews];
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1478,7 +1478,7 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
       mInitialInfoBarWidth = [mInfoBar frame].size.width;
     }
     
-    [self layout];
+    [self positionSubViews];
   }
 }