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

g_pNullDriver -> g_NullDriver

Browse Source
This commit is contained in:
Glenn Maynard
2004-09-05 01:22:09 +00:00
parent 3c7aa0bf7f
commit 9a29be40d5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Dialog/Dialog.cpp
+6 -6
View File
@@ -17,7 +17,7 @@
#endif #endif
static DialogDriver *g_pImpl = NULL; static DialogDriver *g_pImpl = NULL;
static DialogDriver_Null g_pNullDriver; static DialogDriver_Null g_NullDriver;
static bool g_bWindowed = false; static bool g_bWindowed = false;
static bool g_bIsShowingDialog = false; static bool g_bIsShowingDialog = false;
@@ -132,7 +132,7 @@ void Dialog::OK( CString sMessage, CString ID )
// only show Dialog if windowed // only show Dialog if windowed
if( !g_bWindowed ) if( !g_bWindowed )
g_pNullDriver.OK( sMessage, ID ); g_NullDriver.OK( sMessage, ID );
else else
g_pImpl->OK( sMessage, ID ); // call derived version g_pImpl->OK( sMessage, ID ); // call derived version
@@ -144,14 +144,14 @@ Dialog::Result Dialog::AbortRetryIgnore( CString sMessage, CString ID )
Dialog::Init(); Dialog::Init();
if( ID != "" && MessageIsIgnored( ID ) ) if( ID != "" && MessageIsIgnored( ID ) )
return g_pNullDriver.AbortRetryIgnore( sMessage, ID ); return g_NullDriver.AbortRetryIgnore( sMessage, ID );
g_bIsShowingDialog = true; g_bIsShowingDialog = true;
// only show Dialog if windowed // only show Dialog if windowed
Dialog::Result ret; Dialog::Result ret;
if( !g_bWindowed ) if( !g_bWindowed )
ret = g_pNullDriver.AbortRetryIgnore( sMessage, ID ); ret = g_NullDriver.AbortRetryIgnore( sMessage, ID );
else else
ret = g_pImpl->AbortRetryIgnore( sMessage, ID ); // call derived version ret = g_pImpl->AbortRetryIgnore( sMessage, ID ); // call derived version
@@ -165,14 +165,14 @@ Dialog::Result Dialog::RetryCancel( CString sMessage, CString ID )
Dialog::Init(); Dialog::Init();
if( ID != "" && MessageIsIgnored( ID ) ) if( ID != "" && MessageIsIgnored( ID ) )
return g_pNullDriver.RetryCancel( sMessage, ID ); return g_NullDriver.RetryCancel( sMessage, ID );
g_bIsShowingDialog = true; g_bIsShowingDialog = true;
// only show Dialog if windowed // only show Dialog if windowed
Dialog::Result ret; Dialog::Result ret;
if( !g_bWindowed ) if( !g_bWindowed )
ret = g_pNullDriver.RetryCancel( sMessage, ID ); ret = g_NullDriver.RetryCancel( sMessage, ID );
else else
ret = g_pImpl->RetryCancel( sMessage, ID ); // call derived version ret = g_pImpl->RetryCancel( sMessage, ID ); // call derived version