From 58f5140233963944341fdbd7d6d1b7f585003196 Mon Sep 17 00:00:00 2001
From: Soren Jorvang <soren.jorvang@gmail.com>
Date: Tue, 4 Jan 2011 02:07:17 +0000
Subject: [PATCH] Retire the workaround for wxWidgets using the Objective-C
 reserved keyword "id" in the public auibar.h header.

You now need at least r66546 of wxWidgets to build on OS X.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6735 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DSPCore/Src/DSPEmitter.cpp                      | 2 +-
 Source/Core/DolphinWX/Src/Frame.h                           | 4 ----
 Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.h | 4 ----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/Source/Core/DSPCore/Src/DSPEmitter.cpp b/Source/Core/DSPCore/Src/DSPEmitter.cpp
index 8d36465ee8..ebe8bee40f 100644
--- a/Source/Core/DSPCore/Src/DSPEmitter.cpp
+++ b/Source/Core/DSPCore/Src/DSPEmitter.cpp
@@ -351,7 +351,7 @@ void DSPEmitter::Compile(u16 start_addr)
 			if (!unresolvedJumps[i].empty())
 			{
 				// Check if there were any blocks waiting for this block to be linkable
-				int size = unresolvedJumps[i].size();
+				unsigned int size = unresolvedJumps[i].size();
 				unresolvedJumps[i].remove(start_addr);
 				if (unresolvedJumps[i].size() < size)
 				{
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index 24a0d0d31f..04068bf30c 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -24,10 +24,6 @@
 #include <wx/mstream.h>
 #include <wx/listctrl.h>
 #include <wx/artprov.h>
-#if defined(__APPLE__)
-//id is an objective-c++ type, wx team need to change this
-#define id toolid
-#endif
 #include <wx/aui/aui.h>
 #include <string>
 #include <vector>
diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.h b/Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.h
index 1d256e562f..7eaf5a226f 100644
--- a/Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.h
+++ b/Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.h
@@ -33,10 +33,6 @@
 #include <wx/sizer.h>
 #include <wx/listctrl.h>
 #include <wx/statline.h>
-#if defined(__APPLE__)
-//id is an objective-c++ type, wx team need to change this
-#define id toolid
-#endif
 #include <wx/aui/aui.h>
 
 #include "disassemble.h"