From 53b5a1f5e285decdf272b13eaee1162c08f6e6f5 Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Tue, 8 May 2007 12:14:21 +0000
Subject: [PATCH] Having a separate class which does nothing is no better than
 just having the base class do nothing. Remove LW_Null.

---
 stepmania/src/arch/LoadingWindow/LoadingWindow.cpp | 10 ++++------
 stepmania/src/arch/LoadingWindow/LoadingWindow.h   |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow.cpp b/stepmania/src/arch/LoadingWindow/LoadingWindow.cpp
index 644fdd0fa6..2122c141f5 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow.cpp
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow.cpp
@@ -7,9 +7,9 @@
 LoadingWindow *LoadingWindow::Create()
 {
 	if( !PREFSMAN->m_bShowLoadingWindow )
-		return new LoadingWindow_Null;
+		return new LoadingWindow;
 #if defined(UNIX) && !defined(HAVE_GTK)
-	return new LoadingWindow_Null;
+	return new LoadingWindow;
 #endif
 	/* Don't load NULL by default. */
 	const RString drivers = "xbox,win32,cocoa,gtk";
@@ -31,15 +31,13 @@ LoadingWindow *LoadingWindow::Create()
 #ifdef USE_LOADING_WINDOW_GTK
 		if( !DriversToTry[i].CompareNoCase("Gtk") )	ret = new LoadingWindow_Gtk;
 #endif
-#ifdef USE_LOADING_WINDOW_NULL
-		if( !DriversToTry[i].CompareNoCase("Null") )	ret = new LoadingWindow_Null;
-#endif
 #ifdef USE_LOADING_WINDOW_WIN32
 		if( !DriversToTry[i].CompareNoCase("Win32") )	ret = new LoadingWindow_Win32;
 #endif
 #ifdef USE_LOADING_WINDOW_XBOX
 		if( !DriversToTry[i].CompareNoCase("Xbox") )	ret = new LoadingWindow_Xbox;
 #endif
+		if( !DriversToTry[i].CompareNoCase("Null") )	ret = new LoadingWindow;
 
 			
 		if( ret == NULL )
@@ -53,7 +51,7 @@ LoadingWindow *LoadingWindow::Create()
 		}
 	}
 	
-	if(ret)
+	if( ret )
 		LOG->Info( "Loading window: %s", Driver.c_str() );
 	
 	return ret;
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow.h b/stepmania/src/arch/LoadingWindow/LoadingWindow.h
index 36d69428be..c850ac3702 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow.h
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow.h
@@ -12,8 +12,8 @@ public:
 	virtual RString Init() { return RString(); }
 	virtual ~LoadingWindow() { }
 
-	virtual void Paint() { };
-	virtual void SetText( RString str ) = 0;
+	virtual void Paint() { }
+	virtual void SetText( RString str ) { }
 	virtual void SetIcon( const RageSurface *pIcon ) { }
 };