diff options
| author | nyamatongwe <nyamatongwe@gmail.com> | 2012-03-13 09:55:50 +1100 |
|---|---|---|
| committer | nyamatongwe <nyamatongwe@gmail.com> | 2012-03-13 09:55:50 +1100 |
| commit | 6c09422ce1490a0cc526bf5178f38d1b8858441b (patch) | |
| tree | f49c951dfa2964f61490727c89e87f49b717795b /cocoa/InfoBar.mm | |
| parent | 2efefe44e279e03fd3af914818a5f788278e175a (diff) | |
| download | scintilla-mirror-6c09422ce1490a0cc526bf5178f38d1b8858441b.tar.gz | |
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.
Diffstat (limited to 'cocoa/InfoBar.mm')
| -rw-r--r-- | cocoa/InfoBar.mm | 6 |
1 files changed, 3 insertions, 3 deletions
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]; } } |