From 9975ef73fb7ef4195a39b9ab476daa70f52e8130 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 16 Aug 2003 21:16:02 +0000
Subject: [PATCH] Simplify.

---
 stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp | 10 ++++++----
 stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h   | 10 +++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp b/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp
index 23ea5fe0f4..ad4f7c5aa2 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp
@@ -1,4 +1,6 @@
 #include "global.h"
+#include "LoadingWindow_Gtk.h"
+
 #include "StepMania.h"
 #include <gtk/gtk.h>
 #include "loading.xpm"
@@ -6,7 +8,7 @@
 static GtkWidget *label;
 static GtkWidget *window;
 
-void CreateGtkLoadingWindow()
+LoadingWindow_Gtk::LoadingWindow_Gtk()
 {
 	GdkPixmap *loadmap;
 	GtkWidget *vbox;
@@ -30,13 +32,13 @@ void CreateGtkLoadingWindow()
 	gtk_main_iteration_do(FALSE);
 }
 
-void DestroyGtkLoadingWindow()
+LoadingWindow_Gtk::~LoadingWindow_Gtk()
 {
 }
 
-void SetGtkLoadingWindowText(const char *s)
+void LoadingWindow_Gtk::SetText( CString s )
 {
-	gtk_label_set_text(GTK_LABEL(label),s);
+	gtk_label_set_text(GTK_LABEL(label), s);
 	gtk_widget_show(label);
 	gtk_main_iteration_do(FALSE);
 }
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h b/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h
index 2b650ea074..c3887ca20d 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h
@@ -3,16 +3,12 @@
 
 #include "LoadingWindow.h"
 
-void CreateGtkLoadingWindow();
-void DestroyGtkLoadingWindow();
-void SetGtkLoadingWindowText(const char *s);
-
 class LoadingWindow_Gtk : public LoadingWindow {
 public:
-	LoadingWindow_Gtk() { CreateGtkLoadingWindow(); }
-	~LoadingWindow_Gtk() { DestroyGtkLoadingWindow(); }
+	LoadingWindow_Gtk();
+	~LoadingWindow_Gtk();
 
-	void SetText(CString str) { SetGtkLoadingWindowText(str.c_str()); }
+	void SetText(CString str);
 	void Paint() { }
 };