Now items are removed correctly. All RemoveItem() call pass now through the private RemoveItems() method. ComputeLayout now uses a switch block, and prints a warning if B_ITEMS_IN_MATRIX is used, since it's not supported yet. Some cleanups.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10555 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/kits/interface/Menu.cpp

@@ -354,21 +354,24 @@ BMenu::AddSeparatorItem()
 bool
 BMenu::RemoveItem(BMenuItem *item)
 {
-	return fItems.RemoveItem(item);
+	// TODO: Check if item is also deleted
+	return RemoveItems(0, 0, item, false);
 }
 
 
 BMenuItem *
 BMenu::RemoveItem(int32 index)
 {
-	return static_cast<BMenuItem *>(fItems.RemoveItem(index));
+	BMenuItem *item = ItemAt(index);
+	RemoveItems(index, 1, NULL, false);
+	return item;
 }
 
 
 bool
 BMenu::RemoveItems(int32 index, int32 count, bool del)
 {
-	return false;
+	return RemoveItems(index, count, NULL, del);	
 }
 
 
@@ -377,7 +380,7 @@ BMenu::RemoveItem(BMenu *submenu)
 {
 	for (int i = 0; i < fItems.CountItems(); i++)
 		if (static_cast<BMenuItem *>(fItems.ItemAt(i))->Submenu() == submenu)
-			return fItems.RemoveItem(fItems.ItemAt(i));
+			return RemoveItems(i, 1, NULL, false);
 
 	return false;
 }
@@ -722,8 +725,7 @@ BMenu::ResolveSpecifier(BMessage *msg, int32 index,
 	BPropertyInfo propInfo(sPropList);
 	BHandler *target = NULL;
 
-	switch (propInfo.FindMatch(msg, 0, specifier, form, property))
+	switch (propInfo.FindMatch(msg, 0, specifier, form, property)) {
-	{
 		case B_ERROR:
 			break;
 
@@ -880,13 +882,13 @@ void
 BMenu::GetItemMargins(float *left, float *top, float *right,
 						   float *bottom) const
 {
-	if (left)
+	if (left != NULL)
 		*left = fPad.left;
-	if (top)
+	if (top != NULL)
 		*top = fPad.top;
-	if (right)
+	if (right != NULL)
 		*right = fPad.right;
-	if (bottom)
+	if (bottom != NULL)
 		*bottom = fPad.bottom;
 }
 
@@ -1086,9 +1088,40 @@ BMenu::_AddItem(BMenuItem *item, int32 index)
 
 
 bool
-BMenu::RemoveItems(int32 index, int32 count, BMenuItem *item, bool del)
+BMenu::RemoveItems(int32 index, int32 count, BMenuItem *_item, bool del)
 {
-	return false;
+	bool result = false;
+	 
+	// The plan is simple: If we're given a BMenuItem directly, we use it
+	// and ignore index and count. Otherwise, we use them instead.
+	if (_item != NULL) {
+		// TODO: Check if this is enough.
+		fItems.RemoveItem(_item);
+		_item->Uninstall();
+		if (del)
+			delete _item;
+		result = true;
+	} else {
+		BMenuItem *item = NULL;	
+		// We iterate backwards because it's simpler
+		// TODO: We should check if index and count are in bounds.
+		for (int32 i = index + count - 1; i >= index; i--) {
+			item = static_cast<BMenuItem *>(fItems.ItemAt(index));
+			if (item != NULL) {
+				// TODO: Check if this is enough.
+				fItems.RemoveItem(item);
+				item->Uninstall();
+				if (del)
+					delete item;
+				if (!result)
+					result = true;
+			}
+		}
+	}	
+	
+	LayoutItems(0);
+	
+	return result;
 }
 
 
@@ -1114,12 +1147,13 @@ BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems,
 	float iWidth, iHeight;
 	BMenuItem *item;
 
-	if (fLayout == B_ITEMS_IN_COLUMN) {
+	switch (fLayout) {
+		case B_ITEMS_IN_COLUMN:
+		{
 			frame = BRect(0.0f, 0.0f, 0.0f, 2.0f);
 
-		for (int i = 0; i < fItems.CountItems(); i++) {
+			for (int32 i = 0; i < fItems.CountItems(); i++) {
 				item = static_cast<BMenuItem *>(fItems.ItemAt(i));			
-			
 				item->GetContentSize(&iWidth, &iHeight);
 
 				if (item->fModifiers && item->fShortcutChar)
@@ -1133,21 +1167,23 @@ BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems,
 				frame.bottom = item->fBounds.bottom + 1.0f;
 			}
 
-		for (int i = 0; i < fItems.CountItems(); i++)
+			for (int32 i = 0; i < fItems.CountItems(); i++)
 				ItemAt(i)->fBounds.right = frame.right;
 
 			frame.right = (float)ceil(frame.right) + 2.0f;
 			frame.bottom += 1.0f;
+			break;
+		}
 		
-	} else if (fLayout == B_ITEMS_IN_ROW) {
+		case B_ITEMS_IN_ROW:
+		{
 			font_height fh;
 			GetFontHeight(&fh);
 			frame = BRect(0.0f, 0.0f, 0.0f,
 				(float)ceil(fh.ascent) + (float)ceil(fh.descent) + fPad.top + fPad.bottom);
 
-		for (int i = 0; i < fItems.CountItems(); i++) {
+			for (int32 i = 0; i < fItems.CountItems(); i++) {
 				item = static_cast<BMenuItem *>(fItems.ItemAt(i));
-			
 				item->GetContentSize(&iWidth, &iHeight);
 
 				item->fBounds.left = frame.right;
@@ -1162,6 +1198,17 @@ BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems,
 				ItemAt(i)->fBounds.bottom = frame.bottom;
 
 			frame.right = (float)ceil(frame.right) + 8.0f;
+			break;
+		}
+		
+		case B_ITEMS_IN_MATRIX:
+		{
+			printf("BMenu: B_ITEMS_IN_MATRIX not yet implemented\n");
+			break;
+		}
+		
+		default:
+			break;
 	}
 	
 	if ((ResizingMode() & B_FOLLOW_LEFT_RIGHT) == B_FOLLOW_LEFT_RIGHT) {