wxGui branch: [linux] Minor fixes to the GUI -- Ok/Cancel buttons line up where they should now. :)

CodeBlocks Project Changes:
 * Fixed some absolute folder specifications (/home/pubuntu/) which went unnoticed.
 * Enabled Precompiled header support (speeds up compilation about 40% for me).

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

3rdparty/SoundTouch/SoundTouch.cbp

@@ -9,7 +9,7 @@
 			<Target title="Debug">
 				<Option output="../../deps/debug/libsoundtouch-dbg" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/SoundTouch/.objs/debug" />
+				<Option object_output="./.objs/debug" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -21,7 +21,7 @@
 			<Target title="Release">
 				<Option output="../../deps/libsoundtouch" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/SoundTouch/.objs/release" />
+				<Option object_output="./.objs/release" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -37,7 +37,7 @@
 			<Target title="Devel">
 				<Option output="../../deps/devel/libsoundtouch-dev" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/SoundTouch/.objs/devel" />
+				<Option object_output="./.objs/devel" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />

3rdparty/bzip2/bzip2.cbp

@@ -9,7 +9,7 @@
 			<Target title="Debug">
 				<Option output="../../deps/debug/libbzip2-dbg" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/bzip2/.objs/debug" />
+				<Option object_output="./.objs/debug" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -21,7 +21,7 @@
 			<Target title="Release">
 				<Option output="../../deps/libbzip2" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/bzip2/.objs/release" />
+				<Option object_output="./.objs/release" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -37,7 +37,7 @@
 			<Target title="Devel">
 				<Option output="../../deps/devel/libbzip2-dev" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/bzip2/.objs/devel" />
+				<Option object_output="./.objs/devel" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />

3rdparty/zlib/zlib.cbp

@@ -9,7 +9,7 @@
 			<Target title="Debug">
 				<Option output="../../deps/debug/zlib-dbg" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs/debug" />
+				<Option object_output="./.objs/debug" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -22,7 +22,7 @@
 			<Target title="Release">
 				<Option output="../../deps/zlib" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs/release" />
+				<Option object_output="./.objs/release" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -35,7 +35,7 @@
 			<Target title="Devel">
 				<Option output="../../deps/devel/zlib-dev" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs/devel" />
+				<Option object_output="./.objs/devel" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />

common/include/PS2Etypes.h

@@ -18,6 +18,8 @@
 #ifndef __PS2ETYPES_H__
 #define __PS2ETYPES_H__
 
+#include <stddef.h>
+
 #if defined (__linux__) && !defined(__LINUX__)  // some distributions are lower case
 #define __LINUX__
 #endif

common/include/Pcsx2Defs.h

@@ -19,12 +19,14 @@
 #ifndef __PCSX2DEFS_H__
 #define __PCSX2DEFS_H__
 
-#if defined (__linux__) && !defined(__LINUX__)  // some distributions are lower case
+#ifndef __LINUX__
-#define __LINUX__
+#	if defined (__linux__)   // some distributions are lower case
-#endif
+#		define __LINUX__
+#	endif
 
-#ifdef __CYGWIN__
+#	ifdef __CYGWIN__
-#define __LINUX__
+#		define __LINUX__
+#	endif
 #endif
 
 // Renamed ARRAYSIZE to ArraySize -- looks nice and gets rid of Windows.h conflicts (air)

pcsx2/NewGUI/CheckedStaticBox.cpp

@@ -21,27 +21,19 @@
 
 CheckedStaticBox::CheckedStaticBox( wxWindow* parent, int orientation, const wxString& title, int id ) :
 	wxPanel( parent ),
-	m_StaticBoxSizer( *new wxStaticBoxSizer( wxVERTICAL, this ) ),
+	m_MasterSizer( *new wxBoxSizer( wxVERTICAL ) ),
-	ThisToggle( *new wxCheckBox( this, id, title, wxPoint( 8, 1 ) ) ),
+	ThisToggle( *new wxCheckBox( this, id, title, wxPoint( 8, 0 ) ) ),
-	ThisSizer( ( orientation != wxVERTICAL ) ? *new wxBoxSizer( orientation ) : m_StaticBoxSizer )
+	ThisSizer( *new wxStaticBoxSizer( orientation, this ) )
 {
-	// Note on initializers above: Spacer required!
+	m_MasterSizer.Add( &ThisToggle );
-	// The checkbox uses more room than a standard group box label, so we need to insert some space
+	m_MasterSizer.Add( &ThisSizer, wxSizerFlags().Expand() );
-	// between the top of the groupbox and the first item.  If the user is wanting a horizontal sizer
-	// then we'll need to create a vertical sizer to act as a container for the spacer:
-
-	ThisToggle.SetSize( ThisToggle.GetSize() + wxSize( 8, 0 ) );
-
-	m_StaticBoxSizer.AddSpacer( 7 );
-	SetSizer( &m_StaticBoxSizer );
-
-	if( &ThisSizer != &m_StaticBoxSizer )
-		m_StaticBoxSizer.Add( &ThisSizer );
 
 	// Ensure that the right-side of the static group box isn't too cozy:
-	m_StaticBoxSizer.SetMinSize( ThisToggle.GetSize() + wxSize( 22, 1 ) );
+	m_MasterSizer.SetMinSize( ThisToggle.GetSize() + wxSize( 32, 0 ) );
 
-	Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CheckedStaticBox::MainToggle_Click ) );
+	SetSizer( &m_MasterSizer );
+
+	Connect( id, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CheckedStaticBox::MainToggle_Click ) );
 }
 
 // Adds a checkbox to this group panel's base sizer.
@@ -54,10 +46,6 @@ wxCheckBox& CheckedStaticBox::AddCheckBox( const wxString& label, wxWindowID id
 
 //////////////////////////////////////////////////////////////////////////////////////////
 //
-/*BEGIN_EVENT_TABLE(CheckedStaticBox, wxPanel)
-	EVT_CHECKBOX(wxID_ANY, MainToggle_Click)
-END_EVENT_TABLE()*/
-
 void CheckedStaticBox::MainToggle_Click( wxCommandEvent& evt )
 {
 	SetValue( evt.IsChecked() );

pcsx2/NewGUI/CheckedStaticBox.h

@@ -23,7 +23,7 @@
 class CheckedStaticBox : public wxPanel
 {
 protected:
-	wxStaticBoxSizer& m_StaticBoxSizer;
+	wxBoxSizer& m_MasterSizer;
 
 public:
 	wxBoxSizer& ThisSizer;		// Boxsizer which holds all child items.
@@ -37,9 +37,6 @@ public:
 
 	wxCheckBox& AddCheckBox( const wxString& label, wxWindowID id=wxID_ANY );
 
-protected:
-	//DECLARE_EVENT_TABLE();
-
 public:
 	// Event handler for click events for the main checkbox (default behavior: enables/disables all child controls)
 	// This function can be overridden to implement custom handling of check enable/disable behavior.

pcsx2/NewGUI/LogOptionsDialog.cpp

@@ -128,11 +128,15 @@ LogOptionsDialog::LogOptionsDialog(wxWindow* parent, int id, const wxPoint& pos,
 	wxBoxSizer& mainsizer = *new wxBoxSizer( wxVERTICAL );
 	wxBoxSizer& topSizer = *new wxBoxSizer( wxHORIZONTAL );
 
-	topSizer.Add( &eeBox, stdSpacingFlags );
+	// Expand comments below are form an attempt of mine to make the dialog box resiable, but it
-	topSizer.Add( &iopSizer, stdSpacingFlags );
+	// only wanted to work right for the miscSizer and I couldn't figure out why the CheckStaticBox
+	// panel wouldn't also resize to fit the window.. :(  -- air
 
-	mainsizer.Add( &topSizer );		// topsizer has it's own padding.
+	topSizer.Add( &eeBox, stdSpacingFlags ); //.Expand() );
-	mainsizer.Add( &miscSizer, stdSpacingFlags );
+	topSizer.Add( &iopSizer, stdSpacingFlags ); //.Expand() );
+
+	mainsizer.Add( &topSizer ); //, wxSizerFlags().Expand() );		// topsizer has it's own padding.
+	mainsizer.Add( &miscSizer, stdSpacingFlags ); //.Expand() );
 
 	AddOkCancel( mainsizer );
 

pcsx2/NewGUI/wxHelpers.cpp

@@ -43,11 +43,16 @@ namespace wxHelpers
 //////////////////////////////////////////////////////////////////////////////////////////
 //
 wxDialogWithHelpers::wxDialogWithHelpers( wxWindow* parent, int id,  const wxString& title, bool hasContextHelp, const wxPoint& pos, const wxSize& size ) :
-	wxDialog( parent, id, title, pos, size ),
+	wxDialog( parent, id, title, pos, size ), //, (wxCAPTION | wxMAXIMIZE | wxCLOSE_BOX | wxRESIZE_BORDER) ),	// flags for resizable dialogs, currently unused.
 	m_hasContextHelp( hasContextHelp )
 {
 	if( hasContextHelp )
 		wxHelpProvider::Set( new wxSimpleHelpProvider() );
+
+	// Note: currently the Close (X) button doesn't appear to work in dialogs.  Docs indicate
+	// that is should so I presume the problem is in wxWidgets and that (hopefully!) an updated
+	// version will fix it later.  I treid to fix it using a manual Connect but it didn't do
+	// any good.
 }
 
 wxCheckBox& wxDialogWithHelpers::AddCheckBox( wxBoxSizer& sizer, const wxString& label, wxWindowID id )
@@ -65,9 +70,11 @@ void wxDialogWithHelpers::AddOkCancel( wxBoxSizer &sizer )
 		SetExtraStyle( wxDIALOG_EX_CONTEXTHELP );
 
 #ifndef __WXMSW__
-		// create a sizer to hold the help and ok/cancel buttons.
+		// create a sizer to hold the help and ok/cancel buttons, for platforms
+		// that need a custom help icon.  [fixme: help icon prolly better off somewhere else]
 		buttonSizer = new wxBoxSizer( wxHORIZONTAL );
 		buttonSizer->Add( new wxContextHelpButton(this), wxHelpers::stdButtonSizerFlags.Align( wxALIGN_LEFT ) );
+		sizer.Add( buttonSizer, wxSizerFlags().Center() );
 #endif
 	}
 	buttonSizer->Add( CreateStdDialogButtonSizer( wxOK | wxCANCEL ), wxHelpers::stdButtonSizerFlags );

pcsx2/PrecompiledHeader.h

@@ -1,4 +1,7 @@
-#pragma once
+#ifndef PCSX2_PRECOMPILED_HEADER
+#define PCSX2_PRECOMPILED_HEADER
+
+//#pragma once
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Microsoft specific STL extensions for bounds checking and stuff: Enabled in devbuilds,
@@ -15,11 +18,6 @@
 
 #define NOMINMAX		// Disables other libs inclusion of their own min/max macros (we use std instead)
 
-// __LINUX__ defined in wxWidgets.
-//#if defined (__linux__)  // some distributions are lower case
-//#	define __LINUX__
-//#endif
-
 #ifdef _WIN32
 // disable warning C4244: '=' : conversion from 'big' to 'small', possible loss of data
 #	pragma warning(disable:4244)
@@ -184,3 +182,5 @@ static __forceinline u32 timeGetTime()
 	static const bool IsDebugBuild = false;
 
 #endif
+
+#endif

pcsx2/SafeArray.h

@@ -16,8 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef __SAFEARRAY_H__
+#pragma once
-#define __SAFEARRAY_H__
 
 extern void* __fastcall pcsx2_aligned_malloc(size_t size, size_t align);
 extern void* __fastcall pcsx2_aligned_realloc(void* handle, size_t size, size_t align);
@@ -432,5 +431,3 @@ public:
 // For lack of a better place for now (they depend on SafeList so they can't go in StringUtil)
 extern void SplitString( SafeList<wxString>& dest, const wxString& src, const wxString& delims );
 extern void JoinString( wxString& dest, const SafeList<wxString>& src, const wxString& separator );
-
-#endif

pcsx2/System.h

@@ -16,10 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef __SYSTEM_H__
+#pragma once
-#define __SYSTEM_H__
 
-#include "PS2Etypes.h"
 #include "Pcsx2Config.h"
 #include "SafeArray.h"
 #include "Misc.h"
@@ -201,5 +199,3 @@ using Console::Color_Magenta;
 using Console::Color_Cyan;
 using Console::Color_Yellow;
 using Console::Color_White;
-
-#endif /* __SYSTEM_H__ */

pcsx2/windows/SamplProf.cpp

@@ -1,5 +1,6 @@
 
-#include "Win32.h"
+#include "PrecompiledHeader.h"
+#include "RedtapeWindows.h"
 
 #include "SamplProf.h"
 #include <map>

pcsx2/windows/VCprojects/pcsx2_2008.vcproj

@@ -270,410 +270,6 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="OldGUI"
-			>
-			<File
-				RelativePath="..\AdvancedDlg.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\ConfigDlg.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\CpuDlg.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\ini.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\McdConfigDlg.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\PatchBrowser.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\WindowsPCH.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\WinSysExec.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<Filter
-				Name="Debugger"
-				>
-				<File
-					RelativePath=".\..\Debugger.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="Win32.h"
-							PrecompiledHeaderFile="$(IntDir)\win32.pch"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="Win32.h"
-							PrecompiledHeaderFile="$(IntDir)\win32.pch"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\..\Debugger.h"
-					>
-				</File>
-				<File
-					RelativePath=".\..\DebugMemory.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="Win32.h"
-							PrecompiledHeaderFile="$(IntDir)\Win32.pch"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="Win32.h"
-							PrecompiledHeaderFile="$(IntDir)\Win32.pch"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\..\Debugreg.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="Win32.h"
-							PrecompiledHeaderFile="$(IntDir)\Win32.pch"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="Win32.h"
-							PrecompiledHeaderFile="$(IntDir)\Win32.pch"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="Resources"
-				>
-				<File
-					RelativePath="..\Cdrom02.ico"
-					>
-				</File>
-				<File
-					RelativePath="..\debugger.rc"
-					>
-				</File>
-				<File
-					RelativePath="..\pcsx2.rc"
-					>
-				</File>
-				<File
-					RelativePath="..\..\pcsxAbout.bmp"
-					>
-				</File>
-				<File
-					RelativePath="..\ps2_silver.bmp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Include"
-				>
-				<File
-					RelativePath="..\..\HostGui.h"
-					>
-				</File>
-				<File
-					RelativePath="..\McdsDlg.h"
-					>
-				</File>
-				<File
-					RelativePath="..\resource.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Win32.h"
-					>
-				</File>
-				<File
-					RelativePath="..\WinDebugResource.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
 		<Filter
 			Name="Elf"
 			>
@@ -792,24 +388,6 @@
 			<File
 				RelativePath="..\WinMisc.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
 			</File>
 			<Filter
 				Name="TinyXML"
@@ -1151,315 +729,7 @@
 				Name="Linux"
 				>
 				<File
-					RelativePath="..\..\Linux\AboutDlg.cpp"
+					RelativePath="..\..\Linux\HostGui.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\AdvancedDlg.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\ConfigDlg.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\CpuDlg.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\DebugDlg.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\HacksDlg.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\LnxConsole.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\LnxMain.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\LnxMisc.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\LnxSysExec.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\LnxThreads.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\Pref.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1517,22 +787,6 @@
 				<Filter
 					Name="Include"
 					>
-					<File
-						RelativePath="..\..\Linux\ConfigDlg.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\Linux\DebugDlg.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\Linux\LnxMain.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\Linux\LnxSysExec.h"
-						>
-					</File>
 					<File
 						RelativePath="..\..\Linux\memzero.h"
 						>
@@ -2919,33 +2173,6 @@
 			<File
 				RelativePath="..\SamplProf.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\Saveslots.cpp"
@@ -2997,33 +2224,6 @@
 			<File
 				RelativePath="..\WinThreads.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
 			</File>
 			<Filter
 				Name="Include"
@@ -3032,6 +2232,10 @@
 					RelativePath="..\..\Exceptions.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\HostGui.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\MemcpyFast.h"
 					>
@@ -3071,7 +2275,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Dynarec Emitter"
+			Name="x86Emitter"
 			>
 			<File
 				RelativePath="..\..\x86\ix86\ix86.cpp"

pcsx2/windows/Win32.h

@@ -16,8 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef _PCSX2_WIN32_H__
+#pragma once
-#define _PCSX2_WIN32_H__
 
 #include "RedtapeWindows.h"		// our "safe" include of windows (sets version and undefs uselessness)
 #include <commctrl.h>
@@ -171,5 +170,3 @@ extern bool StreamException_LogLastError( const wxString& streamname, const wxCh
 // to already decompressed files).
 extern void NTFS_CompressFile( const wxString& file, bool compressStatus=true );
 
-#endif
-

pcsx2/windows/WinMisc.cpp

@@ -16,7 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
  
-#include "Win32.h"
+#include "PrecompiledHeader.h"
+#include "RedtapeWindows.h"
 #include "cdvd.h"
 
 static LARGE_INTEGER lfreq;

pcsx2/windows/WinThreads.cpp

@@ -17,7 +17,8 @@
  */
 
 
-#include "Win32.h"
+#include "PrecompiledHeader.h"
+#include "RedtapeWindows.h"
 
 #include "System.h"
 #include "ix86/ix86_types.h"