From e3eb9b4e507b5009eb7269f7bf81e96b2b69f307 Mon Sep 17 00:00:00 2001
From: Sean Burke <hellfyre@users.sourceforge.net>
Date: Tue, 8 Jul 2003 23:41:07 +0000
Subject: [PATCH] Make LoadingWindow_Gtk work better in general.

---
 stepmania/src/Makefile.am                              | 5 ++++-
 stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp | 8 +++++---
 stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h   | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am
index a0370bc492..bd97eb70e2 100644
--- a/stepmania/src/Makefile.am
+++ b/stepmania/src/Makefile.am
@@ -7,7 +7,7 @@ AM_CFLAGS =
 if DARWIN
 AM_LDFLAGS += -framework Cocoa -framework Quicktime -framework Carbon -framework OpenGL -framework IOKit
 else
-AM_CXXFLAGS += -DLINUX
+AM_CXXFLAGS += -DLINUX -DDATADIR=\"$(datadir)\"
 endif
 
 AM_CXXFLAGS += -O2 -ISDL-1.2.5/include -ISDL_sound-1.0.0
@@ -214,3 +214,6 @@ stepmania_LDADD = \
 
 INCLUDES = $(SDL_CFLAGS)
 # -O0 -g
+
+smpixmapdir = $(datadir)/pixmaps/stepmania
+smpixmap_DATA = arch/LoadingWindow/loading.xpm
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp b/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp
index c1ce7d699b..4b86c5e9b2 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp
@@ -7,15 +7,18 @@ void CreateGtkLoadingWindow() {
   GtkWidget *vbox;
   GtkWidget *loadimage;
   char **argv;
+  gchar *filename;
   int argc;
 
   argc = 1;
   argv[0] = "stepmania";
   gtk_init(&argc,&argv);
-  loadimage = gtk_image_new_from_file("loading.xpm");
+  filename = g_build_filename(DATADIR,"pixmaps","stepmania","loading.xpm",NULL);
+  loadimage = gtk_image_new_from_file(filename);
+  g_free(filename);
   label = gtk_label_new(NULL);
   gtk_label_set_justify(GTK_LABEL(label),GTK_JUSTIFY_CENTER);
-  vbox = gtk_vbox_new(FALSE,0);
+  vbox = gtk_vbox_new(FALSE,5);
   window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_container_add(GTK_CONTAINER(window),vbox);
   gtk_box_pack_start(GTK_BOX(vbox),loadimage,FALSE,FALSE,0);
@@ -28,7 +31,6 @@ void CreateGtkLoadingWindow() {
 }
 
 void DestroyGtkLoadingWindow() {
-  gtk_main_quit();
 }
 
 void SetGtkLoadingWindowText(const char *s) {
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h b/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h
index 802bfae595..fcad3ef8c7 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.h
@@ -16,7 +16,7 @@ public:
 	void Paint() { }
 };
 
-/* #undef ARCH_LOADING_WINDOW
- * #define ARCH_LOADING_WINDOW LoadingWindow_Gtk */
+#undef ARCH_LOADING_WINDOW
+#define ARCH_LOADING_WINDOW LoadingWindow_Gtk
 
 #endif