From b657027ad6e5c8e59c5d90c112420f48af61c4d1 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 22 Aug 2002 04:14:24 +0000
Subject: [PATCH] Before/AfterRowChange -> ChangeSelectedRow

---
 stepmania/src/ScreenEditMenu.cpp | 18 ++++++------------
 stepmania/src/ScreenEditMenu.h   |  4 +---
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp
index 90c6163abc..5c0b2f8f69 100644
--- a/stepmania/src/ScreenEditMenu.cpp
+++ b/stepmania/src/ScreenEditMenu.cpp
@@ -100,8 +100,7 @@ ScreenEditMenu::ScreenEditMenu()
 
 
 	// data structures
-	m_SelectedRow = ROW_GROUP;
-	AfterRowChange();
+	ChangeSelectedRow(ROW_GROUP);
 
 	SONGMAN->GetGroupNames( m_sGroups );
 	GAMEMAN->GetNotesTypesForGame( GAMESTATE->m_CurGame, m_NotesTypes );
@@ -216,17 +215,16 @@ void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM )
 	}
 }
 	
-void ScreenEditMenu::BeforeRowChange()
+void ScreenEditMenu::ChangeSelectedRow( SelectedRow row )
 {
 	m_textGroup.SetEffectNone();
 	m_sprArrowLeft.SetDiffuseColor( D3DXCOLOR(1,1,1,0) );
 	m_sprArrowRight.SetDiffuseColor( D3DXCOLOR(1,1,1,0) );
 	m_textNotesType.SetEffectNone();
 	m_textNotes.SetEffectNone();
-}
 
-void ScreenEditMenu::AfterRowChange()
-{
+	m_SelectedRow = row;
+	
 	switch( m_SelectedRow )
 	{
 	case ROW_GROUP:			m_textGroup.SetEffectGlowing();			break;
@@ -295,9 +293,7 @@ void ScreenEditMenu::MenuUp( const PlayerNumber p )
 	if( m_SelectedRow == 0 )	// can't go up any further
 		return;	
 
-	BeforeRowChange();
-	m_SelectedRow = SelectedRow(m_SelectedRow-1);
-	AfterRowChange();
+	ChangeSelectedRow(SelectedRow(m_SelectedRow-1));
 }
 
 void ScreenEditMenu::MenuDown( const PlayerNumber p )
@@ -305,9 +301,7 @@ void ScreenEditMenu::MenuDown( const PlayerNumber p )
 	if( m_SelectedRow == NUM_ROWS-1 )	// can't go down any further
 		return;	
 
-	BeforeRowChange();
-	m_SelectedRow = SelectedRow(m_SelectedRow+1);
-	AfterRowChange();
+	ChangeSelectedRow(SelectedRow(m_SelectedRow+1));
 }
 
 void ScreenEditMenu::MenuLeft( const PlayerNumber p )
diff --git a/stepmania/src/ScreenEditMenu.h b/stepmania/src/ScreenEditMenu.h
index 8638e4b9bf..09474f237c 100644
--- a/stepmania/src/ScreenEditMenu.h
+++ b/stepmania/src/ScreenEditMenu.h
@@ -33,9 +33,6 @@ public:
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
 private:
-	void BeforeRowChange();
-	void AfterRowChange();
-
 	void OnGroupChange();
 	void OnSongChange();
 	void OnNotesTypeChange();
@@ -86,6 +83,7 @@ private:
 	RandomSample	m_soundChangeMusic;
 	RandomSample	m_soundSelect;
 
+	void ChangeSelectedRow( SelectedRow row );
 };