From 92ad3d2c38be1e004cfd3e5924853301b9318922 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 20 Mar 2005 20:23:10 +0000
Subject: [PATCH] Store OptionRow metrics in the screen to make it easier for a
 screen to customize these

---
 stepmania/src/ScreenOptions.cpp | 3 +--
 stepmania/src/ScreenOptions.h   | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 8897baa55e..91c73d00dd 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -103,7 +103,6 @@ ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sCla
 	SHOW_EXIT_ROW					(m_sName,"ShowExitRow"),
 	SEPARATE_EXIT_ROW				(m_sName,"SeparateExitRow"),
 	SEPARATE_EXIT_ROW_Y				(m_sName,"SeparateExitRowY"),
-	OPTION_ROW_TYPE					(m_sName,"OptionRowType"),
 	SHOW_EXPLANATIONS				(m_sName,"ShowExplanations"),
 	THEME_TITLES					(m_sName,"ThemeTitles")
 {
@@ -214,7 +213,7 @@ void ScreenOptions::InitMenu( InputMode im, const vector<OptionRowDefinition> &v
 		// TRICKY:  Add "EXIT" item
 		m_Rows.push_back( new OptionRow() );
 		OptionRow &row = *m_Rows.back();
-		row.LoadMetrics( OPTION_ROW_TYPE );
+		row.LoadMetrics( m_sName );
 		row.LoadExit();
 		m_framePage.AddChild( &row );
 	}
diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h
index 08d079268b..7007792cc5 100644
--- a/stepmania/src/ScreenOptions.h
+++ b/stepmania/src/ScreenOptions.h
@@ -140,7 +140,6 @@ protected:
 	ThemeMetric<bool>				SHOW_EXIT_ROW;
 	ThemeMetric<bool>				SEPARATE_EXIT_ROW;
 	ThemeMetric<float>				SEPARATE_EXIT_ROW_Y;
-	ThemeMetric<CString>			OPTION_ROW_TYPE;
 	ThemeMetric<bool>				SHOW_EXPLANATIONS;
 	ThemeMetric<bool>				THEME_TITLES;