From c06763db85c29952b520e2ae5da5253fd85a98e4 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 11 Jun 2011 09:30:49 -0400 Subject: [PATCH] Make linux compile the loading window code. NOTE: The actual loading window code is stubbed. I do not know GTK window code yet, so hopefully this won't crash yet. --- src/Makefile.am | 1 + src/arch/LoadingWindow/LoadingWindow_Gtk.cpp | 15 +++++++++++++++ src/arch/LoadingWindow/LoadingWindow_Gtk.h | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 2abcf7c4be..7b7c57d5ab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -340,6 +340,7 @@ DualScrollBar.cpp DualScrollBar.h \ EditMenu.cpp EditMenu.h FadingBanner.cpp FadingBanner.h \ GradeDisplay.cpp GradeDisplay.h GraphDisplay.cpp GraphDisplay.h \ GrooveRadar.cpp GrooveRadar.h HelpDisplay.cpp HelpDisplay.h \ +InGameLoadingWindow.cpp InGameLoadingWindow.h \ MemoryCardDisplay.cpp MemoryCardDisplay.h \ MenuTimer.cpp MenuTimer.h \ ModIcon.cpp ModIcon.h ModIconRow.cpp ModIconRow.h \ diff --git a/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp b/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp index c27a6f3cb2..d7f542b2e9 100644 --- a/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp +++ b/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp @@ -56,6 +56,21 @@ void LoadingWindow_Gtk::SetText( RString s ) Module_SetText( s ); } +void LoadingWindow_Gtk::SetProgress( const int progress ) +{ + ; // stub, needs to be finished. +} + +void LoadingWindow_Gtk::SetTotalWork( const int totalWork ) +{ + ; // stub, needs to be finished. +} + +void LoadingWindow_Gtk::SetIndeterminate( bool indeterminate ) +{ + ; // stub, needs to be finished. +} + /* * (c) 2003-2004 Glenn Maynard, Sean Burke * All rights reserved. diff --git a/src/arch/LoadingWindow/LoadingWindow_Gtk.h b/src/arch/LoadingWindow/LoadingWindow_Gtk.h index 14752cc58a..6abeb87b4d 100644 --- a/src/arch/LoadingWindow/LoadingWindow_Gtk.h +++ b/src/arch/LoadingWindow/LoadingWindow_Gtk.h @@ -11,8 +11,10 @@ public: LoadingWindow_Gtk(); RString Init(); ~LoadingWindow_Gtk(); - void SetText( RString str ); + void SetProgress( const int progress ); + void SetTotalWork( const int totalWork ); + void SetIndeterminate( bool indeterminate ); }; #define USE_LOADING_WINDOW_GTK