diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d77c51c32..81b362e4b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -457,10 +457,8 @@ endif()
 
 option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
 if(NOT DISABLE_WX)
-	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-		include(FindwxWidgets OPTIONAL)
-		FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)
-	endif()
+	include(FindwxWidgets OPTIONAL)
+	FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)
 
 	if(wxWidgets_FOUND)
 		EXECUTE_PROCESS(
@@ -471,8 +469,8 @@ if(NOT DISABLE_WX)
 			ERROR_QUIET
 			)
 		message("Found wxWidgets version ${wxWidgets_VERSION}")
-		if(${wxWidgets_VERSION} VERSION_LESS "2.8.9")
-			message("At least 2.8.9 is required; ignoring found version")
+		if(${wxWidgets_VERSION} VERSION_LESS "2.9.4")
+			message("At least 2.9.4 is required; ignoring found version")
 			unset(wxWidgets_FOUND)
 		endif()
 	endif(wxWidgets_FOUND)
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index a8f2349c0a..9a9de8bb40 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -73,8 +73,6 @@
 #include "State.h"
 #include "Movie.h"
 
-#include <ctype.h>
-
 // TODO: ugly, remove
 bool g_aspect_wide;
 
@@ -132,8 +130,9 @@ void DisplayMessage(const char *message, int time_in_ms)
 		SConfig::GetInstance().m_LocalCoreStartupParameter;
 
 	// Actually displaying non-ASCII could cause things to go pear-shaped
-	if (!isascii(message))
-		return;
+	for (const char *c = message; *c != '\0'; ++c)
+		if (*c < ' ')
+			return;
 
 	g_video_backend->Video_AddMessage(message, time_in_ms);