The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-13 00:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

revert

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1511 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
omegadox
2008-12-12 11:27:50 +00:00
parent 13acef8793
commit 8149e1481a
3 changed files with 88 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
Source/Core/Common/Src/Common.cpp
View File

@ -19,7 +19,6 @@
#include "Common.h"
#include "StringUtil.h"
#include <wx/msgdlg.h>
namespace
{
@ -31,100 +30,104 @@ void RegisterPanicAlertHandler(PanicAlertHandler handler)
panic_handler = handler;
}
void PanicAlert(const char* format, ...)
{
va_list args;
va_start(args, format);
if (panic_handler)
{
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "PANIC: %s", buffer);
panic_handler(buffer, false);
}
else
{
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "PANIC: %s", buffer);
#if defined(HAVE_WX) && HAVE_WX
wxMessageBox(wxString::FromAscii(buffer), wxT("PANIC!"), wxICON_EXCLAMATION);
#else
vprintf(format, args);
printf("\n");
#endif
}
va_end(args);
}
void SuccessAlert(const char* format, ...)
{
va_list args;
va_start(args, format);
va_list args;
va_start(args, format);
if (panic_handler)
{
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "SUCCESS: %s", buffer);
panic_handler(buffer, false);
}
else
{
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "SUCCESS: %s", buffer);
#if defined(HAVE_WX) && HAVE_WX
wxMessageBox(wxString::FromAscii(buffer), wxT("SUCCESS!"), wxICON_EXCLAMATION);
#else
vprintf(format, args);
printf("\n");
if (panic_handler)
{
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "SUCCESS: %s", buffer);
panic_handler(buffer, false);
}
else
{
#ifdef _WIN32
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "SUCCESS: %s", buffer);
MessageBox(0, buffer, "SUCCESS!", MB_ICONWARNING);
#elif __GNUC__
//#error Do a messagebox!
vprintf(format, args);
printf("\n");
// asm ("int $3") ;
#endif
}
}
va_end(args);
}
va_end(args);
void PanicAlert(const char* format, ...)
{
va_list args;
va_start(args, format);
if (panic_handler)
{
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "PANIC: %s", buffer);
panic_handler(buffer, false);
}
else
{
#ifdef _WIN32
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "PANIC: %s", buffer);
MessageBox(0, buffer, "PANIC!", MB_ICONWARNING);
#elif __GNUC__
//#error Do a messagebox!
vprintf(format, args);
printf("\n");
// asm ("int $3") ;
#endif
}
va_end(args);
}
bool PanicYesNo(const char* format, ...)
{
va_list args;
va_start(args, format);
bool retval;
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "PANIC: %s", buffer);
#if defined(HAVE_WX) && HAVE_WX
retval = wxYES == wxMessageBox(wxString::FromAscii(buffer), wxT("PANIC! Continue?"), wxICON_QUESTION | wxYES_NO);
#else
vprintf(format, args);
printf("\n");
va_list args;
va_start(args, format);
bool retval;
#ifdef _WIN32
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "PANIC: %s", buffer);
retval = IDYES == MessageBox(0, buffer, "PANIC! Continue?", MB_ICONQUESTION | MB_YESNO);
#elif __GNUC__
//vprintf(format, args);
return(true); //#error Do a messagebox!
#endif
va_end(args);
return(retval);
va_end(args);
return(retval);
}
bool AskYesNo(const char* format, ...)
{
va_list args;
va_start(args, format);
bool retval;
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "ASK: %s", buffer);
#if defined(HAVE_WX) && HAVE_WX
retval = wxYES == wxMessageBox(wxString::FromAscii(buffer), wxT("Dolphin"), wxICON_QUESTION | wxYES_NO);
#else
vprintf(format, args);
printf("\n");
va_list args;
va_start(args, format);
bool retval;
#ifdef _WIN32
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "ASK: %s", buffer);
retval = IDYES == MessageBox(0, buffer, "Dolphin", MB_ICONQUESTION | MB_YESNO);
#elif __GNUC__
//vprintf(format, args);
return(true); //#error Do a messagebox!
#endif
va_end(args);
return(retval);
va_end(args);
return(retval);
}
// Standard implementation of logging - simply print to standard output.