From a358c9057f45e9856fc7410753104bba265f6cc1 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 5 Jun 2004 02:00:12 +0000
Subject: [PATCH] simplify

---
 stepmania/src/ScreenJukeboxMenu.cpp | 26 ++------------------------
 stepmania/src/ScreenJukeboxMenu.h   |  2 --
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/stepmania/src/ScreenJukeboxMenu.cpp b/stepmania/src/ScreenJukeboxMenu.cpp
index effaebb6eb..c01129b24c 100644
--- a/stepmania/src/ScreenJukeboxMenu.cpp
+++ b/stepmania/src/ScreenJukeboxMenu.cpp
@@ -15,7 +15,6 @@
 #include "ScreenManager.h"
 #include "GameConstantsAndTypes.h"
 #include "RageUtil.h"
-#include "PrefsManager.h"
 #include "GameManager.h"
 #include "RageLog.h"
 #include "GameState.h"
@@ -27,10 +26,7 @@
 //
 // Defines specific to ScreenJukeboxMenu
 //
-#define EXPLANATION_X				THEME->GetMetricF("ScreenJukeboxMenu","ExplanationX")
-#define EXPLANATION_Y				THEME->GetMetricF("ScreenJukeboxMenu","ExplanationY")
 #define EXPLANATION_TEXT			THEME->GetMetric("ScreenJukeboxMenu","ExplanationText")
-#define HELP_TEXT					THEME->GetMetric("ScreenJukeboxMenu","HelpText")
 
 
 ScreenJukeboxMenu::ScreenJukeboxMenu( CString sClassName ) : ScreenWithMenuElements( sClassName )
@@ -47,10 +43,10 @@ ScreenJukeboxMenu::ScreenJukeboxMenu( CString sClassName ) : ScreenWithMenuEleme
 	this->AddChild( &m_Selector );
 
 
+	m_textExplanation.SetName( "Explanation" );
 	m_textExplanation.LoadFromFont( THEME->GetPathToF("Common normal") );
-	m_textExplanation.SetXY( EXPLANATION_X, EXPLANATION_Y );
 	m_textExplanation.SetText( EXPLANATION_TEXT );
-	m_textExplanation.SetZoom( 0.7f );
+	SET_XY_AND_ON_COMMAND( m_textExplanation );
 	this->AddChild( &m_textExplanation );
 
 	this->SortByDrawOrder();
@@ -64,11 +60,6 @@ ScreenJukeboxMenu::~ScreenJukeboxMenu()
 	LOG->Trace( "ScreenJukeboxMenu::~ScreenJukeboxMenu()" );
 }
 
-void ScreenJukeboxMenu::DrawPrimitives()
-{
-	Screen::DrawPrimitives();
-}
-
 void ScreenJukeboxMenu::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
 {
 	LOG->Trace( "ScreenJukeboxMenu::Input()" );
@@ -79,19 +70,6 @@ void ScreenJukeboxMenu::Input( const DeviceInput& DeviceI, const InputEventType
 	Screen::Input( DeviceI, type, GameI, MenuI, StyleI );
 }
 
-void ScreenJukeboxMenu::HandleScreenMessage( const ScreenMessage SM )
-{
-	switch( SM )
-	{
-	case SM_GoToPrevScreen:
-		SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
-		break;
-	case SM_GoToNextScreen:
-		SCREENMAN->SetNewScreen( "ScreenJukebox" );
-		break;
-	}
-}
-	
 void ScreenJukeboxMenu::MenuUp( PlayerNumber pn )
 {
 	m_Selector.Up();
diff --git a/stepmania/src/ScreenJukeboxMenu.h b/stepmania/src/ScreenJukeboxMenu.h
index 53d9762894..217f1a46fe 100644
--- a/stepmania/src/ScreenJukeboxMenu.h
+++ b/stepmania/src/ScreenJukeboxMenu.h
@@ -20,9 +20,7 @@ public:
 	ScreenJukeboxMenu( CString sName );
 	virtual ~ScreenJukeboxMenu();
 
-	virtual void DrawPrimitives();
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
-	virtual void HandleScreenMessage( const ScreenMessage SM );
 
 private: