unimplemented functions shouldn't return NS_OK (mac menu code). b=294317 r=hwaara

This commit is contained in:
joshmoz%gmail.com 2006-09-14 17:47:24 +00:00
parent d779ffdcc5
commit dda64c23fb
5 changed files with 15 additions and 19 deletions

View File

@ -748,7 +748,7 @@ NS_IMETHODIMP nsMenuBarX::GetMenuAt(const PRUint32 aCount, nsIMenu *& aMenu)
//-------------------------------------------------------------------------
NS_IMETHODIMP nsMenuBarX::InsertMenuAt(const PRUint32 aCount, nsIMenu *& aMenu)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
//-------------------------------------------------------------------------
@ -762,7 +762,7 @@ NS_IMETHODIMP nsMenuBarX::RemoveMenu(const PRUint32 aCount)
//-------------------------------------------------------------------------
NS_IMETHODIMP nsMenuBarX::RemoveAll()
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
//-------------------------------------------------------------------------
@ -775,7 +775,7 @@ NS_IMETHODIMP nsMenuBarX::GetNativeData(void *& aData)
//-------------------------------------------------------------------------
NS_IMETHODIMP nsMenuBarX::SetNativeData(void* aData)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
//-------------------------------------------------------------------------

View File

@ -198,13 +198,13 @@ NS_IMETHODIMP nsMenuX::SetLabel(const nsAString &aText)
NS_IMETHODIMP nsMenuX::GetAccessKey(nsString &aText)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP nsMenuX::SetAccessKey(const nsAString &aText)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
@ -313,13 +313,13 @@ NS_IMETHODIMP nsMenuX::GetItemAt(const PRUint32 aPos, nsISupports *& aMenuItem)
NS_IMETHODIMP nsMenuX::InsertItemAt(const PRUint32 aPos, nsISupports * aMenuItem)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP nsMenuX::RemoveItem(const PRUint32 aPos)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}

View File

@ -606,7 +606,7 @@ NS_METHOD nsMenuBarX::GetMenuAt(const PRUint32 aCount, nsIMenu *& aMenu)
//-------------------------------------------------------------------------
NS_METHOD nsMenuBarX::InsertMenuAt(const PRUint32 aCount, nsIMenu *& aMenu)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
//-------------------------------------------------------------------------
@ -621,8 +621,7 @@ NS_METHOD nsMenuBarX::RemoveMenu(const PRUint32 aCount)
//-------------------------------------------------------------------------
NS_METHOD nsMenuBarX::RemoveAll()
{
NS_ASSERTION(0, "Not implemented!");
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
//-------------------------------------------------------------------------
@ -635,7 +634,7 @@ NS_METHOD nsMenuBarX::GetNativeData(void *& aData)
//-------------------------------------------------------------------------
NS_METHOD nsMenuBarX::SetNativeData(void* aData)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
//-------------------------------------------------------------------------

View File

@ -196,8 +196,7 @@ NS_METHOD nsMenuItemX::GetMenuItemType(EMenuItemType *aType)
//-------------------------------------------------------------------------
NS_METHOD nsMenuItemX::GetNativeData(void *& aData)
{
//aData = (void *)mMenu;
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
//-------------------------------------------------------------------------

View File

@ -225,13 +225,13 @@ NS_METHOD nsMenuX::SetLabel(const nsAString &aText)
//-------------------------------------------------------------------------
NS_METHOD nsMenuX::GetAccessKey(nsString &aText)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
//-------------------------------------------------------------------------
NS_METHOD nsMenuX::SetAccessKey(const nsAString &aText)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
//-------------------------------------------------------------------------
@ -408,15 +408,13 @@ NS_METHOD nsMenuX::GetItemAt(const PRUint32 aPos, nsISupports *& aMenuItem)
//-------------------------------------------------------------------------
NS_METHOD nsMenuX::InsertItemAt(const PRUint32 aPos, nsISupports * aMenuItem)
{
NS_ASSERTION(0, "Not implemented");
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
//-------------------------------------------------------------------------
NS_METHOD nsMenuX::RemoveItem(const PRUint32 aPos)
{
NS_WARNING("Not implemented");
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
//-------------------------------------------------------------------------