From 58e58f4770748b982ca739519b8089b2a6c9648c Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sat, 8 Jan 2005 12:37:21 +0000
Subject: [PATCH] remove frame element.  Use ScreenWithMenuElements::Overlay
 instead

---
 stepmania/src/ScreenOptions.cpp | 14 ++++----------
 stepmania/src/ScreenOptions.h   |  1 -
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index b0a0b6c73e..8d2cf76bb3 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -96,7 +96,7 @@ const float ITEM_X[NUM_PLAYERS] = { 260, 420 };
  * in player options menus, but it should in the options menu.
  */
 
-//REGISTER_SCREEN_CLASS( ScreenOptions );
+//REGISTER_SCREEN_CLASS( ScreenOptions );	// can't be instantiated
 ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sClassName)
 {
 	LOG->Trace( "ScreenOptions::ScreenOptions()" );
@@ -434,17 +434,11 @@ void ScreenOptions::InitMenu( InputMode im, OptionRowData OptionRows[], int iNum
 		m_framePage.AddChild( m_sprDisqualify[p] );
 	}
 
-	m_sprFrame.Load( THEME->GetPathToG( "ScreenOptions frame") );
-	m_sprFrame->SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
-	m_framePage.AddChild( m_sprFrame );
-
 	// poke once at all the explanation metrics so that we catch missing ones early
+	for( int r=0; r<(int)m_Rows.size(); r++ )		// foreach row
 	{
-		for( int r=0; r<(int)m_Rows.size(); r++ )		// foreach row
-		{
-			GetExplanationText( r );
-			GetExplanationTitle( r );
-		}
+		GetExplanationText( r );
+		GetExplanationTitle( r );
 	}
 
 	CHECKPOINT;
diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h
index 733eb165dd..c78756ae3f 100644
--- a/stepmania/src/ScreenOptions.h
+++ b/stepmania/src/ScreenOptions.h
@@ -149,7 +149,6 @@ protected:
 
 	ActorFrame		m_framePage;
 	AutoActor		m_sprPage;
-	AutoActor		m_sprFrame;
 
 	OptionsCursor	m_Highlight[NUM_PLAYERS];
 	Sprite			m_sprLineHighlight[NUM_PLAYERS];