Merge backout of bug 403174

This commit is contained in:
Markus Stange 2008-09-22 10:22:49 +02:00
commit c8381816e6

View File

@ -1736,12 +1736,6 @@ NS_IMETHODIMP nsCocoaWindow::EndSecureKeyboardInput()
// we respond to it just in case. // we respond to it just in case.
if ([self respondsToSelector:@selector(setBottomCornerRounded:)]) if ([self respondsToSelector:@selector(setBottomCornerRounded:)])
[self setBottomCornerRounded:NO]; [self setBottomCornerRounded:NO];
// This method only exists on Leopard.
if ([self respondsToSelector:@selector(setAutorecalculatesContentBorderThickness:forEdge:)]) {
[self setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
[self setContentBorderThickness:0.0f forEdge:NSMaxYEdge];
}
} }
return self; return self;
@ -1803,8 +1797,6 @@ NS_IMETHODIMP nsCocoaWindow::EndSecureKeyboardInput()
if (mUnifiedToolbarHeight == aToolbarHeight) if (mUnifiedToolbarHeight == aToolbarHeight)
return; return;
mUnifiedToolbarHeight = aToolbarHeight; mUnifiedToolbarHeight = aToolbarHeight;
if ([self respondsToSelector:@selector(setContentBorderThickness:forEdge:)])
[self setContentBorderThickness:aToolbarHeight forEdge:NSMaxYEdge];
[self redrawTitlebar]; [self redrawTitlebar];
} }