From 962eaa31b4f6d3d5f6dbaaeab014c03ef356940f Mon Sep 17 00:00:00 2001 From: Sean Burke Date: Wed, 9 Jul 2003 08:34:16 +0000 Subject: [PATCH] Make LoadingWindow_Gtk include loading.xpm so that I don't have to make it install. --- stepmania/src/Makefile.am | 3 --- .../src/arch/LoadingWindow/LoadingWindow_Gtk.cpp | 11 ++++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index bd97eb70e2..2dd9c2c97e 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -214,6 +214,3 @@ 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 4b86c5e9b2..fc3f3a3299 100644 --- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp +++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp @@ -1,25 +1,26 @@ #include +#include "loading.xpm" static GtkWidget *label; static GtkWidget *window; void CreateGtkLoadingWindow() { + GdkPixmap *loadmap; GtkWidget *vbox; GtkWidget *loadimage; char **argv; - gchar *filename; int argc; argc = 1; argv[0] = "stepmania"; gtk_init(&argc,&argv); - filename = g_build_filename(DATADIR,"pixmaps","stepmania","loading.xpm",NULL); - loadimage = gtk_image_new_from_file(filename); - g_free(filename); + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_widget_realize(window); + loadmap = gdk_pixmap_create_from_xpm_d(window->window,NULL,NULL,loading); + loadimage = gtk_image_new_from_pixmap(loadmap,NULL); label = gtk_label_new(NULL); gtk_label_set_justify(GTK_LABEL(label),GTK_JUSTIFY_CENTER); 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); gtk_box_pack_end(GTK_BOX(vbox),label,TRUE,TRUE,0);