common: move some gui stuff into the main project (#4751)

* common: move ThreadingDialogs and wxAppWithHelpers to main project
* common: move CheckedStaticBox to the main project
* common: move pxCheckBox to the main project
* common: move pxRadioPanel to the main project
* common: move pxEvents.h to main project

common/CMakeLists.txt

@@ -13,7 +13,6 @@ target_sources(common PRIVATE
 	VirtualMemory.cpp
 	EventSource.inl
 	SafeArray.inl
-	CheckedStaticBox.cpp
 	Console.cpp
 	EventSource.cpp
 	Exceptions.cpp
@@ -23,8 +22,6 @@ target_sources(common PRIVATE
 	PathUtils.cpp
 	PrecompiledHeader.cpp
 	Perf.cpp
-	pxCheckBox.cpp
-	pxRadioPanel.cpp
 	pxStaticText.cpp
 	pxStreams.cpp
 	pxTranslate.cpp
@@ -32,9 +29,7 @@ target_sources(common PRIVATE
 	RwMutex.cpp
 	Semaphore.cpp
 	StringHelpers.cpp
-	ThreadingDialogs.cpp
 	ThreadTools.cpp
-	wxAppWithHelpers.cpp
 	wxGuiTools.cpp
 	wxHelpers.cpp
 	emitter/bmi.cpp
@@ -64,7 +59,6 @@ target_sources(common PRIVATE
 target_sources(common PRIVATE
 	Assertions.h
 	boost_spsc_queue.hpp
-	CheckedStaticBox.h
 	Console.h
 	Dependencies.h
 	EventSource.h
@@ -75,9 +69,7 @@ target_sources(common PRIVATE
 	Path.h
 	PageFaultSource.h
 	PrecompiledHeader.h
-	pxCheckBox.h
 	pxForwardDefs.h
-	pxRadioPanel.h
 	pxStaticText.h
 	pxStreams.h
 	RedtapeWindows.h
@@ -87,9 +79,7 @@ target_sources(common PRIVATE
 	ScopedPtrMT.h
 	StringHelpers.h
 	Threading.h
-	ThreadingDialogs.h
 	TraceLog.h
-	wxAppWithHelpers.h
 	wxBaseTools.h
 	wxGuiTools.h
 	emitter/cpudetect_internal.h

common/common.vcxproj

@@ -40,7 +40,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="AlignedMalloc.cpp" />
-    <ClCompile Include="CheckedStaticBox.cpp" />
     <ClCompile Include="Console.cpp" />
     <ClCompile Include="Exceptions.cpp" />
     <ClCompile Include="FastFormatString.cpp" />
@@ -48,7 +47,6 @@
     <ClCompile Include="pxStreams.cpp" />
     <ClCompile Include="pxTranslate.cpp" />
     <ClCompile Include="pxWindowTextWriter.cpp" />
-    <ClCompile Include="ThreadingDialogs.cpp" />
     <ClCompile Include="VirtualMemory.cpp" />
     <ClCompile Include="x86\MemcpyFast.cpp" />
     <ClCompile Include="PathUtils.cpp" />
@@ -56,11 +54,8 @@
     <ClCompile Include="PrecompiledHeader.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="pxCheckBox.cpp" />
-    <ClCompile Include="pxRadioPanel.cpp" />
     <ClCompile Include="pxStaticText.cpp" />
     <ClCompile Include="StringHelpers.cpp" />
-    <ClCompile Include="wxAppWithHelpers.cpp" />
     <ClCompile Include="wxGuiTools.cpp" />
     <ClCompile Include="wxHelpers.cpp" />
     <ClCompile Include="Linux\LnxHostSys.cpp" />
@@ -95,7 +90,6 @@
     <ClInclude Include="ScopedAlloc.h" />
     <ClInclude Include="ThreadingInternal.h" />
     <ClInclude Include="Assertions.h" />
-    <ClInclude Include="CheckedStaticBox.h" />
     <ClInclude Include="Console.h" />
     <ClInclude Include="Dependencies.h" />
     <ClInclude Include="EventSource.h" />
@@ -105,14 +99,10 @@
     <ClInclude Include="MemcpyFast.h" />
     <ClInclude Include="Path.h" />
     <ClInclude Include="PrecompiledHeader.h" />
-    <ClInclude Include="pxCheckBox.h" />
-    <ClInclude Include="pxEvents.h" />
-    <ClInclude Include="pxRadioPanel.h" />
     <ClInclude Include="pxStaticText.h" />
     <ClInclude Include="RedtapeWindows.h" />
     <ClInclude Include="SafeArray.h" />
     <ClInclude Include="StringHelpers.h" />
-    <ClInclude Include="wxAppWithHelpers.h" />
     <ClInclude Include="wxBaseTools.h" />
     <ClInclude Include="wxGuiTools.h" />
     <ClInclude Include="Threading.h" />

common/common.vcxproj.filters

@@ -7,9 +7,6 @@
     <ClCompile Include="emitter\bmi.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="CheckedStaticBox.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Console.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -70,12 +67,6 @@
     <ClCompile Include="PrecompiledHeader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="pxCheckBox.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pxRadioPanel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="pxStaticText.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -100,9 +91,6 @@
     <ClCompile Include="StringHelpers.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ThreadingDialogs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="ThreadTools.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -121,9 +109,6 @@
     <ClCompile Include="Windows\WinThreads.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="wxAppWithHelpers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="wxGuiTools.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -144,9 +129,6 @@
     <ClInclude Include="boost_spsc_queue.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CheckedStaticBox.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Console.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -219,15 +201,6 @@
     <ClInclude Include="PrecompiledHeader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="pxCheckBox.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pxEvents.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pxRadioPanel.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="pxStaticText.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -276,9 +249,6 @@
     <ClInclude Include="wxBaseTools.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="wxAppWithHelpers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="wxGuiTools.h">
       <Filter>Header Files</Filter>
     </ClInclude>

pcsx2/CMakeLists.txt

@@ -969,6 +969,7 @@ set(pcsx2GuiSources
 	gui/AppInit.cpp
 	gui/AppMain.cpp
 	gui/AppRes.cpp
+	gui/CheckedStaticBox.cpp
 	gui/ConsoleLogger.cpp
 	gui/CpuUsageProvider.cpp
 	gui/Dialogs/AboutBoxDialog.cpp
@@ -1017,10 +1018,14 @@ set(pcsx2GuiSources
 	gui/Panels/PathsPanel.cpp
 	gui/Panels/SpeedhacksPanel.cpp
 	gui/Panels/VideoPanel.cpp
+	gui/pxCheckBox.cpp
+	gui/pxRadioPanel.cpp
 	gui/RecentIsoList.cpp
 	gui/Saveslots.cpp
 	gui/SysState.cpp
+	gui/ThreadingDialogs.cpp
 	gui/UpdateUI.cpp
+	gui/wxAppWithHelpers.cpp
 	)
 
 # gui headers
@@ -1035,6 +1040,7 @@ set(pcsx2GuiHeaders
 	gui/App.h
 	gui/ApplyState.h
 	gui/AppSaveStates.h
+	gui/CheckedStaticBox.h
 	gui/ConsoleLogger.h
 	gui/CpuUsageProvider.h
 	gui/Debugger/BreakpointWindow.h
@@ -1059,9 +1065,14 @@ set(pcsx2GuiHeaders
 	gui/Panels/ConfigurationPanels.h
 	gui/Panels/LogOptionsPanels.h
 	gui/Panels/MemoryCardPanels.h
+	gui/pxCheckBox.h
+	gui/pxEvents.h
 	gui/pxEventThread.h
+	gui/pxRadioPanel.h
 	gui/RecentIsoList.h
 	gui/Saveslots.h
+	gui/ThreadingDialogs.h
+	gui/ThreadingDialogs.cpp
 	)
 
 # Warning: the declaration of the .h are mandatory in case of resources files. It will ensure the creation

pcsx2/gui/App.h

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "common/wxAppWithHelpers.h"
+#include "gui/wxAppWithHelpers.h"
 
 #include <wx/fileconf.h>
 #include <wx/apptrait.h>

pcsx2/gui/AppCommon.h

@@ -20,10 +20,10 @@
 #include "common/PersistentThread.h"
 
 #include "common/wxGuiTools.h"
-#include "common/pxRadioPanel.h"
+#include "gui/pxRadioPanel.h"
-#include "common/pxCheckBox.h"
+#include "gui/pxCheckBox.h"
 #include "common/pxStaticText.h"
-#include "common/CheckedStaticBox.h"
+#include "gui/CheckedStaticBox.h"
 
 #include "AppForwardDefs.h"
 #include "AppConfig.h"

pcsx2/gui/AppEventListeners.h

@@ -16,7 +16,7 @@
 #pragma once
 
 #include "common/EventSource.h"
-#include "common/pxEvents.h"
+#include "gui/pxEvents.h"
 #include "common/IniInterface.h"
 
 enum CoreThreadStatus

pcsx2/gui/CheckedStaticBox.cpp

@@ -13,7 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common/CheckedStaticBox.h"
+#include "PrecompiledHeader.h"
+#include "gui/CheckedStaticBox.h"
 
 CheckedStaticBox::CheckedStaticBox(wxWindow* parent, int orientation, const wxString& title)
 	: wxPanelWithHelpers(parent, wxVERTICAL)

pcsx2/gui/Dialogs/LogOptionsDialog.h

@@ -19,7 +19,7 @@
 #include "ConfigurationDialog.h"
 
 #include "common/wxGuiTools.h"
-#include "common/CheckedStaticBox.h"
+#include "gui/CheckedStaticBox.h"
 
 namespace Dialogs {
 

pcsx2/gui/ThreadingDialogs.cpp

@@ -13,7 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common/ThreadingDialogs.h"
+#include "PrecompiledHeader.h"
+#include "gui/ThreadingDialogs.h"
 #include "common/pxStaticText.h"
 
 using namespace pxSizerFlags;

pcsx2/gui/ThreadingDialogs.h

@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include "Threading.h"
+#include "common/Threading.h"
-#include "wxAppWithHelpers.h"
+#include "pcsx2/gui/wxAppWithHelpers.h"
 
 wxDECLARE_EVENT(pxEvt_ThreadedTaskComplete, wxCommandEvent);
 

pcsx2/gui/pxCheckBox.cpp

@@ -13,7 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common/pxCheckBox.h"
+#include "PrecompiledHeader.h"
+#include "gui/pxCheckBox.h"
 #include "common/pxStaticText.h"
 
 using namespace pxSizerFlags;

pcsx2/gui/pxEventThread.h

@@ -16,7 +16,7 @@
 #pragma once
 
 #include "common/PersistentThread.h"
-#include "common/pxEvents.h"
+#include "gui/pxEvents.h"
 
 #include <wx/timer.h>
 #include <memory>

pcsx2/gui/pxRadioPanel.cpp

@@ -13,7 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common/pxRadioPanel.h"
+#include "PrecompiledHeader.h"
+#include "gui/pxRadioPanel.h"
 #include "common/pxStaticText.h"
 #include "common/SafeArray.inl"
 

pcsx2/gui/wxAppWithHelpers.cpp

@@ -13,7 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common/wxAppWithHelpers.h"
+#include "PrecompiledHeader.h"
+#include "gui/wxAppWithHelpers.h"
 #include "common/ThreadingInternal.h"
 #include "common/PersistentThread.h"
 

pcsx2/gui/wxAppWithHelpers.h

@@ -19,7 +19,7 @@
 
 #include "common/Threading.h"
 #include "common/wxGuiTools.h"
-#include "common/pxEvents.h"
+#include "gui/pxEvents.h"
 #include "common/AppTrait.h"
 
 using namespace Threading;

pcsx2/pcsx2.vcxproj

@@ -301,6 +301,7 @@
     <ClCompile Include="Gif_Unit.cpp" />
     <ClCompile Include="gui\AppGameDatabase.cpp" />
     <ClCompile Include="gui\AppUserMode.cpp" />
+    <ClCompile Include="gui\CheckedStaticBox.cpp" />
     <ClCompile Include="gui\Debugger\BreakpointWindow.cpp" />
     <ClCompile Include="gui\Debugger\CtrlDisassemblyView.cpp" />
     <ClCompile Include="gui\Debugger\CtrlMemView.cpp" />
@@ -313,6 +314,10 @@
     <ClCompile Include="gui\Dialogs\McdConfigDialog.cpp" />
     <ClCompile Include="gui\DriveList.cpp" />
     <ClCompile Include="gui\Panels\MemoryCardListView.cpp" />
+    <ClCompile Include="gui\pxCheckBox.cpp" />
+    <ClCompile Include="gui\pxRadioPanel.cpp" />
+    <ClCompile Include="gui\ThreadingDialogs.cpp" />
+    <ClCompile Include="gui\wxAppWithHelpers.cpp" />
     <ClCompile Include="IopGte.cpp" />
     <ClCompile Include="IPC.cpp" />
     <ClCompile Include="FW.cpp" />
@@ -743,8 +748,12 @@
     <ClInclude Include="GameDatabase.h" />
     <ClInclude Include="Gif_Unit.h" />
     <ClInclude Include="gui\AppGameDatabase.h" />
+    <ClInclude Include="gui\CheckedStaticBox.h" />
     <ClInclude Include="gui\i18n.h" />
     <ClInclude Include="gui\DriveList.h" />
+    <ClInclude Include="gui\pxCheckBox.h" />
+    <ClInclude Include="gui\pxEvents.h" />
+    <ClInclude Include="gui\pxRadioPanel.h" />
     <ClInclude Include="gui\Saveslots.h" />
     <ClInclude Include="gui\Debugger\BreakpointWindow.h" />
     <ClInclude Include="gui\Debugger\CtrlDisassemblyView.h" />
@@ -754,6 +763,8 @@
     <ClInclude Include="gui\Debugger\DebuggerLists.h" />
     <ClInclude Include="gui\Debugger\DisassemblyDialog.h" />
     <ClInclude Include="gui\Panels\MemoryCardPanels.h" />
+    <ClInclude Include="gui\ThreadingDialogs.h" />
+    <ClInclude Include="gui\wxAppWithHelpers.h" />
     <ClInclude Include="IopGte.h" />
     <ClInclude Include="IPC.h" />
     <ClInclude Include="FW.h" />

pcsx2/pcsx2.vcxproj.filters

@@ -1640,6 +1640,21 @@
     <ClCompile Include="GS\Window\GSWnd.cpp">
       <Filter>System\Ps2\GS\Window</Filter>
     </ClCompile>
+    <ClCompile Include="gui\wxAppWithHelpers.cpp">
+      <Filter>AppHost</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\ThreadingDialogs.cpp">
+      <Filter>AppHost</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\CheckedStaticBox.cpp">
+      <Filter>AppHost</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\pxCheckBox.cpp">
+      <Filter>AppHost</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\pxRadioPanel.cpp">
+      <Filter>AppHost</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Patch.h">
@@ -2713,6 +2728,24 @@
     <ClInclude Include="GS\Window\GSWnd.h">
       <Filter>System\Ps2\GS\Window</Filter>
     </ClInclude>
+    <ClInclude Include="gui\wxAppWithHelpers.h">
+      <Filter>AppHost</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\ThreadingDialogs.h">
+      <Filter>AppHost</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\CheckedStaticBox.h">
+      <Filter>AppHost</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\pxCheckBox.h">
+      <Filter>AppHost</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\pxRadioPanel.h">
+      <Filter>AppHost</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\pxEvents.h">
+      <Filter>AppHost</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="windows\wxResources.rc">