actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Having a separate class which does nothing is no better than just having the base class do nothing. Remove LW_Null.

Browse Source
This commit is contained in:
Steve Checkoway
2007-05-08 12:14:21 +00:00
parent 2853fd09fc
commit 53b5a1f5e2
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/LoadingWindow/LoadingWindow.cpp
+3 -5
View File
@@ -7,9 +7,9 @@
LoadingWindow *LoadingWindow::Create() LoadingWindow *LoadingWindow::Create()
{ {
if( !PREFSMAN->m_bShowLoadingWindow ) if( !PREFSMAN->m_bShowLoadingWindow )
return new LoadingWindow_Null; return new LoadingWindow;
#if defined(UNIX) && !defined(HAVE_GTK) #if defined(UNIX) && !defined(HAVE_GTK)
return new LoadingWindow_Null; return new LoadingWindow;
#endif #endif
/* Don't load NULL by default. */ /* Don't load NULL by default. */
const RString drivers = "xbox,win32,cocoa,gtk"; const RString drivers = "xbox,win32,cocoa,gtk";
@@ -31,15 +31,13 @@ LoadingWindow *LoadingWindow::Create()
#ifdef USE_LOADING_WINDOW_GTK #ifdef USE_LOADING_WINDOW_GTK
if( !DriversToTry[i].CompareNoCase("Gtk") ) ret = new LoadingWindow_Gtk; if( !DriversToTry[i].CompareNoCase("Gtk") ) ret = new LoadingWindow_Gtk;
#endif #endif
#ifdef USE_LOADING_WINDOW_NULL
if( !DriversToTry[i].CompareNoCase("Null") ) ret = new LoadingWindow_Null;
#endif
#ifdef USE_LOADING_WINDOW_WIN32 #ifdef USE_LOADING_WINDOW_WIN32
if( !DriversToTry[i].CompareNoCase("Win32") ) ret = new LoadingWindow_Win32; if( !DriversToTry[i].CompareNoCase("Win32") ) ret = new LoadingWindow_Win32;
#endif #endif
#ifdef USE_LOADING_WINDOW_XBOX #ifdef USE_LOADING_WINDOW_XBOX
if( !DriversToTry[i].CompareNoCase("Xbox") ) ret = new LoadingWindow_Xbox; if( !DriversToTry[i].CompareNoCase("Xbox") ) ret = new LoadingWindow_Xbox;
#endif #endif
if( !DriversToTry[i].CompareNoCase("Null") ) ret = new LoadingWindow;
if( ret == NULL ) if( ret == NULL )
stepmania/src/arch/LoadingWindow/LoadingWindow.h
+2 -2
View File
@@ -12,8 +12,8 @@ public:
virtual RString Init() { return RString(); } virtual RString Init() { return RString(); }
virtual ~LoadingWindow() { } virtual ~LoadingWindow() { }
virtual void Paint() { }; virtual void Paint() { }
virtual void SetText( RString str ) = 0; virtual void SetText( RString str ) { }
virtual void SetIcon( const RageSurface *pIcon ) { } virtual void SetIcon( const RageSurface *pIcon ) { }
}; };