Fixing linux bustage.

This commit is contained in:
mcafee%netscape.com 1999-07-27 23:56:04 +00:00
parent edd11a5e8c
commit de03435b9a

View File

@ -693,17 +693,7 @@ NS_METHOD nsWindow::ShowMenuBar(PRBool aShow)
return NS_OK;
}
NS_METHOD nsWindow::IsMenuBarVisible(PRBool *aVisible)
{
*aVisible = PR_TRUE;
return NS_ERROR_FAILURE; // todo: (maybe. method isn't actually used yet.)
}
<<<<<<< nsWindow.cpp
NS_METHOD nsWindow::Move(PRInt32 aX, PRInt32 aY)
=======
NS_METHOD nsWindow::Move(PRUint32 aX, PRUint32 aY)
>>>>>>> 1.135
{
// not implimented for toplevel windows
if (mIsToplevel && mShell)