From 2853fd09fc12dcc7f2ea11daecf06bbf22c7f3f0 Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Tue, 8 May 2007 12:06:50 +0000
Subject: [PATCH] Make SetText pure virtual instead of Paint().

---
 stepmania/src/arch/LoadingWindow/LoadingWindow.h       | 4 ++--
 stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.h | 1 -
 stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h   | 3 +--
 stepmania/src/arch/LoadingWindow/LoadingWindow_Null.h  | 9 +++------
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow.h b/stepmania/src/arch/LoadingWindow/LoadingWindow.h
index 1a28ad4a34..36d69428be 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() = 0;
-	virtual void SetText(RString str) { }
+	virtual void Paint() { };
+	virtual void SetText( RString str ) = 0;
 	virtual void SetIcon( const RageSurface *pIcon ) { }
 };
 
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.h b/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.h
index 19915c235a..9bc918e5d4 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.h
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.h
@@ -30,7 +30,6 @@ public:
 	}
 	~LoadingWindow_Cocoa() { DisposeOfCocoaWindow(); }
 
-	void Paint() { } /* Not needed but pure virtual*/
 	void SetText( RString str ) { SetCocoaWindowText( str ); }
 };
 #define USE_LOADING_WINDOW_COCOA
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h b/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h
index 99dda78ab2..14752cc58a 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h
@@ -12,8 +12,7 @@ public:
 	RString Init();
 	~LoadingWindow_Gtk();
 
-	void SetText(RString str);
-	void Paint() { }
+	void SetText( RString str );
 };
 #define USE_LOADING_WINDOW_GTK
 
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Null.h b/stepmania/src/arch/LoadingWindow/LoadingWindow_Null.h
index e6d21f9dda..1ca5d89341 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Null.h
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Null.h
@@ -3,13 +3,10 @@
 
 #include "LoadingWindow.h"
 
-class LoadingWindow_Null: public LoadingWindow {
+class LoadingWindow_Null: public LoadingWindow
+{
 public:
-	LoadingWindow_Null() { }
-	~LoadingWindow_Null() { }
-
-	void SetText(RString str) { }
-	void Paint() { }
+	void SetText( RString str ) { }
 };
 #define USE_LOADING_WINDOW_NULL