wx 2.9 works in 64bit with snow leopard

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4374 8ced0084-cf51-0410-be5f-012b33b47a6e

SConstruct

@@ -275,7 +275,6 @@ if conf.CheckPKG('sfml-network') and conf.CheckCXXHeader("SFML/Network/Ftp.hpp")
 #osx 64 specifics
 if sys.platform == 'darwin':
     if env['osx'] == '64cocoa':
-        env['nowx'] = True
         compileFlags += ['-arch' , 'x86_64', '-m64' ]
         conf.Define('MAP_32BIT', 0)
     if env['osx'] == '32cocoa':

Source/Core/DolphinWX/Src/Frame.h

@@ -24,6 +24,10 @@
 #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 "CDUtils.h"

Source/Core/DolphinWX/Src/Main.cpp

@@ -311,12 +311,14 @@ bool DolphinApp::OnInit()
 			//TODO : if not exist copy game config dir in user dir and detect the revision to upgrade if necessary
 			//TODO : if not exist copy maps dir in user dir and detect revision to upgrade if necessary
 			
+#if !wxCHECK_VERSION(2, 9, 0)
 			// HACK: Get rid of bogus osx param
 			if (argc > 1 && wxString(argv[argc - 1]).StartsWith(_("-psn_"))) {
 				delete argv[argc-1];
 				argv[argc-1] = NULL;
 				argc--;
 			}        
+#endif
 		#endif
 
 		// Gets the passed media files from command line

Source/Core/DolphinWX/Src/SConscript

@@ -67,13 +67,10 @@ if wxenv['HAVE_COCOA']:
     wxenv.Append(
 	CXXFLAGS = compileFlags,
        	LINKFLAGS = [
-               	'-pthread',
+               	'-pthread', '-framework', 'IOKit'
                	],
        	LIBS = libs
        	)
-    if not wxenv['HAVE_WX']:
-	wxenv.Append(
-	    LINKFLAGS = ['-framework', 'IOKit'])
 else:
     wxenv.Append(
        	LINKFLAGS = [