From 8149e1481a8b7dcd524de9d82d30ae712a4f75f6 Mon Sep 17 00:00:00 2001
From: omegadox <omegadox@gmail.com>
Date: Fri, 12 Dec 2008 11:27:50 +0000
Subject: [PATCH] revert

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1511 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Common/Common.vcproj  |  12 +--
 Source/Core/Common/Src/Common.cpp | 157 +++++++++++++++---------------
 Source/Core/Common/Src/Common.h   |   4 +-
 3 files changed, 88 insertions(+), 85 deletions(-)

diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj
index 26c32bb0e0..3a2aefca7f 100644
--- a/Source/Core/Common/Common.vcproj
+++ b/Source/Core/Common/Common.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="../../PluginSpecs"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0;LOGGING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -117,7 +117,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="../../PluginSpecs"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -192,7 +192,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="../../PluginSpecs"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -267,7 +267,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="../../PluginSpecs"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -340,7 +340,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="3"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="../../PluginSpecs"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;LOGGING"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -412,7 +412,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="3"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="../../PluginSpecs"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
 				RuntimeLibrary="0"
 				FloatingPointModel="0"
diff --git a/Source/Core/Common/Src/Common.cpp b/Source/Core/Common/Src/Common.cpp
index fc39f4893f..78b697365b 100644
--- a/Source/Core/Common/Src/Common.cpp
+++ b/Source/Core/Common/Src/Common.cpp
@@ -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.
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index d6161e2f4c..0b7cb106cc 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -190,8 +190,8 @@ inline u64 swap64(u64 data) {return(((u64)swap32(data) << 32) | swap32(data >> 3
 
 // Utility functions
 
-void PanicAlert(const char* format, ...);
-void SuccessAlert(const char* format, ...);
+void PanicAlert(const char* text, ...);
+void SuccessAlert(const char* text, ...);
 bool PanicYesNo(const char* text, ...);
 bool AskYesNo(const char* text, ...);