From 1fbf2e38c4770010674a507def25dd4be2074206 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Sat, 17 Mar 2012 18:13:02 -0700
Subject: [PATCH] wxw implements wxEVT_THREAD itself now

---
 SConstruct                              | 2 --
 Source/Core/DolphinWX/Src/NetWindow.cpp | 1 -
 Source/Core/DolphinWX/Src/NetWindow.h   | 2 --
 3 files changed, 5 deletions(-)

diff --git a/SConstruct b/SConstruct
index 0dd5aadeec..fb4acbaf3d 100755
--- a/SConstruct
+++ b/SConstruct
@@ -109,9 +109,7 @@ if sys.platform == 'darwin':
     env['CCFLAGS'] += ['-march=core2', '-mdynamic-no-pic']
     env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof']
     env['CC'] = 'clang'
-    env['CC'] = 'llvm-gcc'
     env['CXX'] = 'clang++'
-    env['CXX'] = 'llvm-g++'
     env['CXXFLAGS'] += ['-x', 'objective-c++']
     env['LINKFLAGS'] += ccld
     env['LINKFLAGS'] += ['-Wl,-dead_strip,-dead_strip_dylibs']
diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp
index 0e17e70bae..0347385e73 100644
--- a/Source/Core/DolphinWX/Src/NetWindow.cpp
+++ b/Source/Core/DolphinWX/Src/NetWindow.cpp
@@ -29,7 +29,6 @@
 
 #define NETPLAY_TITLEBAR	"Dolphin NetPlay"
 
-DEFINE_EVENT_TYPE(wxEVT_THREAD)
 BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame)
 	EVT_COMMAND(wxID_ANY, wxEVT_THREAD, NetPlayDiag::OnThread)
 END_EVENT_TABLE()
diff --git a/Source/Core/DolphinWX/Src/NetWindow.h b/Source/Core/DolphinWX/Src/NetWindow.h
index 0e70d352e8..974a52e79d 100644
--- a/Source/Core/DolphinWX/Src/NetWindow.h
+++ b/Source/Core/DolphinWX/Src/NetWindow.h
@@ -114,8 +114,6 @@ private:
 	static NetPlayDiag* npd;
 };
 
-DECLARE_EVENT_TYPE(wxEVT_THREAD, -1)
-
 class ChangeGameDiag : public wxDialog
 {
 public: