Fix up Linux again.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2255 96395faa-99c1-11dd-bbfe-3dabce05a288

common/src/Utilities/Linux/LnxThreads.cpp

@@ -18,7 +18,7 @@
 #include "Threading.h"
 #include "x86emitter/tools.h"
 
-#if !defined(__LINUX__) || !defined(__WXMAC__)
+#if !defined(__LINUX__) && !defined(__WXMAC__)
 
 #	pragma message( "LnxThreads.cpp should only be compiled by projects or makefiles targeted at Linux/Mac distros.")
 
@@ -61,7 +61,7 @@ void pxYieldToMain()
 
 	// (FIXME : Find a more correct implementation for this?)
 	
-	Sleep( 2 );
+	Threading::Sleep( 2 );
 }
 
 #endif

common/src/Utilities/wxHelpers.cpp

@@ -108,7 +108,7 @@ void wxDialogWithHelpers::AddOkCancel( wxSizer &sizer, bool hasApply )
 	{
 		SetExtraStyle( wxDIALOG_EX_CONTEXTHELP );
 #ifndef __WXMSW__
-		m_extraButtonSizer += new wxContextHelpButton(this);
+		s_buttons += new wxContextHelpButton(this);
 #endif
 	}