From b1d6d84e6ff074ade183e1d378a2da6c13fff03f Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Thu, 19 May 2022 16:16:42 +1000 Subject: [PATCH] Qt: Get rid of wx module init We're not using any wx thread junk anymore, so this can go. --- pcsx2-qt/QtHost.cpp | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/pcsx2-qt/QtHost.cpp b/pcsx2-qt/QtHost.cpp index 51af52b544..c4d117b583 100644 --- a/pcsx2-qt/QtHost.cpp +++ b/pcsx2-qt/QtHost.cpp @@ -53,7 +53,6 @@ static constexpr u32 SETTINGS_SAVE_DELAY = 1000; // Local function declarations ////////////////////////////////////////////////////////////////////////// namespace QtHost { -static void InitializeWxRubbish(); static bool InitializeConfig(); static bool ShouldUsePortableMode(); static void SetResourcesDirectory(); @@ -84,7 +83,6 @@ bool QtHost::Initialize() qRegisterMetaType(); qRegisterMetaType(); - InitializeWxRubbish(); if (!InitializeConfig()) { Console.WriteLn("Failed to initialize config."); @@ -769,24 +767,3 @@ void QtHost::UpdateLogging() SetSystemConsoleEnabled(system_console_enabled); } - -#include - -#ifdef _WIN32 -extern "C" HINSTANCE wxGetInstance(); -extern void wxSetInstance(HINSTANCE hInst); -#endif - -void QtHost::InitializeWxRubbish() -{ - wxLog::DoCreateOnDemand(); - wxLog::GetActiveTarget(); - -#ifdef _WIN32 - if (!wxGetInstance()) - wxSetInstance(::GetModuleHandle(NULL)); -#endif // _WIN32 - - wxModule::RegisterModules(); - wxModule::InitializeModules(); -}