From 0d732a8c62803fdf6fc911b507de4cc3cd3a3467 Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Tue, 1 Jun 2010 03:34:51 +0000
Subject: [PATCH] wxWidgets/msw: Kill off some warnings introduced when I
 excluded some unused packages from the wx lib.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3137 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 3rdparty/wxWidgets/src/common/image.cpp | 11 +++++++----
 3rdparty/wxWidgets/src/msw/main.cpp     |  9 +++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/3rdparty/wxWidgets/src/common/image.cpp b/3rdparty/wxWidgets/src/common/image.cpp
index 7885d6486c..aa817211bc 100644
--- a/3rdparty/wxWidgets/src/common/image.cpp
+++ b/3rdparty/wxWidgets/src/common/image.cpp
@@ -167,18 +167,21 @@ wxImage::wxImage(const char* const* xpmData)
     Create(xpmData);
 }
 
+#if wxUSE_XPM
 bool wxImage::Create(const char* const* xpmData)
 {
-#if wxUSE_XPM
     UnRef();
 
     wxXPMDecoder decoder;
     (*this) = decoder.ReadData(xpmData);
     return Ok();
-#else
-    return false;
-#endif
 }
+#else
+bool wxImage::Create( const char* const* WXUNUSED(xpmData) )
+{
+    return false;
+}
+#endif
 
 bool wxImage::Create( int width, int height, bool clear )
 {
diff --git a/3rdparty/wxWidgets/src/msw/main.cpp b/3rdparty/wxWidgets/src/msw/main.cpp
index a857b77deb..fa18d9c69d 100644
--- a/3rdparty/wxWidgets/src/msw/main.cpp
+++ b/3rdparty/wxWidgets/src/msw/main.cpp
@@ -211,19 +211,20 @@ int wxEntry(int& argc, wxChar **argv)
     wxSEH_HANDLE(-1)
 }
 
-#else // !wxUSE_ON_FATAL_EXCEPTION
-
+// PCSX2: Moved this to inside the wxUSE_ON_FATAL_EXCEPTION condition --air
 #if defined(__VISUALC__) && !defined(__WXWINCE__)
 
 static void
 wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS * WXUNUSED(ep))
 {
-    // see wxSETranslator() version for wxUSE_ON_FATAL_EXCEPTION above
-    throw;
+	// see wxSETranslator() version for wxUSE_ON_FATAL_EXCEPTION above
+	throw;
 }
 
 #endif // __VISUALC__
 
+#else // !wxUSE_ON_FATAL_EXCEPTION
+
 int wxEntry(int& argc, wxChar **argv)
 {
     DisableAutomaticSETranslator();