From 082ceeecaa323bf4608de0317f7121237c3c2445 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 15 Jul 2005 23:27:51 +0000
Subject: [PATCH] EditMenu::GetRowSize

---
 stepmania/src/EditMenu.cpp | 29 +++++++++++++++++------------
 stepmania/src/EditMenu.h   |  1 +
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp
index b4fe38edef..c5417553a1 100644
--- a/stepmania/src/EditMenu.cpp
+++ b/stepmania/src/EditMenu.cpp
@@ -246,20 +246,25 @@ bool EditMenu::CanGoLeft()
 	return m_iSelection[m_SelectedRow] != 0;
 }
 
+int EditMenu::GetRowSize( EditMenuRow er ) const
+{
+	switch( er )
+	{
+	case ROW_GROUP: return m_sGroups.size();
+	case ROW_SONG: return m_pSongs.size();
+	case ROW_STEPS_TYPE: return m_StepsTypes.size();
+	case ROW_STEPS: return m_vpSteps.size();
+	case ROW_SOURCE_STEPS_TYPE: return m_StepsTypes.size();
+	case ROW_SOURCE_STEPS: return m_vpSourceSteps.size();
+	case ROW_ACTION: return m_Actions.size();
+	default: FAIL_M( ssprintf("%i", er) );
+	}
+}
+
+
 bool EditMenu::CanGoRight()
 {
-	int num_values[NUM_EDIT_MENU_ROWS] = 
-	{
-		m_sGroups.size(),
-		m_pSongs.size(),
-		m_StepsTypes.size(),
-		m_vpSteps.size(),
-		m_StepsTypes.size(),
-		m_vpSourceSteps.size(),
-		m_Actions.size()
-	};
-
-	return m_iSelection[m_SelectedRow] != (num_values[m_SelectedRow]-1);
+	return m_iSelection[m_SelectedRow] != GetRowSize(m_SelectedRow)-1;
 }
 
 void EditMenu::Up()
diff --git a/stepmania/src/EditMenu.h b/stepmania/src/EditMenu.h
index 6c7d3abbd6..c64be14d34 100644
--- a/stepmania/src/EditMenu.h
+++ b/stepmania/src/EditMenu.h
@@ -83,6 +83,7 @@ private:
 
 	EditMenuRow m_SelectedRow;
 	EditMenuRow GetFirstRow() const { return SHOW_GROUPS.GetValue()? ROW_GROUP:ROW_SONG; }
+	int GetRowSize( EditMenuRow er ) const;
 	int			m_iSelection[NUM_EDIT_MENU_ROWS];
 	BitmapText	m_textLabel[NUM_EDIT_MENU_ROWS];
 	BitmapText	m_textValue[NUM_EDIT_MENU_ROWS];