get WTL out of dsp_hle

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1902 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Plugins/Plugin_DSP_HLE/Plugin_DSP_HLE.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="Plugin_DSP_HLE"
 	ProjectGUID="{D6E56527-BBB9-4EAD-A6EC-49D4BF6AFCD8}"
 	RootNamespace="Plugin_DSP"
@@ -45,7 +45,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;../../../Externals/WTL80;../../Core/Common/Src;../../PluginSpecs"
+				AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;_SECURE_SCL=0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="dxguid.lib dsound.lib Rpcrt4.lib"
+				AdditionalDependencies="dxguid.lib dsound.lib Rpcrt4.lib comctl32.lib"
 				OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_HLED.dll"
 				LinkIncremental="2"
 				GenerateManifest="false"
@@ -130,7 +130,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\Externals\wxWidgets\Include; ..\..\..\Externals\wxWidgets\Include\msvc;../../../Externals/WTL80;../../Core/Common/Src;../../PluginSpecs"
+				AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="LOGGING;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;_SECURE_SCL=0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -154,7 +154,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="dxguid.lib dsound.lib Rpcrt4.lib"
+				AdditionalDependencies="dxguid.lib dsound.lib Rpcrt4.lib comctl32.lib"
 				OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_HLED.dll"
 				LinkIncremental="2"
 				GenerateManifest="false"
@@ -218,7 +218,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;../../../Externals/WTL80;../../Core/Common/Src;../../PluginSpecs"
+				AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;_SECURE_SCL=0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -242,7 +242,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="dxguid.lib dsound.lib"
+				AdditionalDependencies="dxguid.lib dsound.lib comctl32.lib"
 				OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_HLE.dll"
 				LinkIncremental="1"
 				GenerateManifest="false"
@@ -308,7 +308,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../../Externals/WTL80;../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;_SECURE_SCL=0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -331,7 +331,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="dxguid.lib dsound.lib"
+				AdditionalDependencies="dxguid.lib dsound.lib comctl32.lib"
 				OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_HLE.dll"
 				LinkIncremental="1"
 				GenerateManifest="false"
@@ -396,7 +396,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;../../../Externals/WTL80;../../Core/Common/Src;../../PluginSpecs"
+				AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="DEBUGFAST;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;_SECURE_SCL=0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -420,7 +420,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="dxguid.lib dsound.lib"
+				AdditionalDependencies="dxguid.lib dsound.lib comctl32.lib"
 				OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_HLEDF.dll"
 				LinkIncremental="1"
 				GenerateManifest="false"
@@ -486,7 +486,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;../../../Externals/WTL80;../../Core/Common/Src;../../PluginSpecs"
+				AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="LOGGING;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;DEBUGFAST;_SECURE_SCL=0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -509,7 +509,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="dxguid.lib dsound.lib"
+				AdditionalDependencies="dxguid.lib dsound.lib comctl32.lib"
 				OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_HLEDF.dll"
 				LinkIncremental="1"
 				GenerateManifest="false"
@@ -548,20 +548,6 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\Src\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Src\resource.rc"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="PCHW"
 			>
@@ -749,10 +735,6 @@
 				RelativePath=".\Src\Debugger\File.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Src\Debugger\Logging.cpp"
-				>
-			</File>
 		</Filter>
 		<File
 			RelativePath=".\Src\Config.cpp"

Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp

@@ -15,66 +15,70 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "resource.h"
 
 #include "Config.h"
 #include "ConfigDlg.h"
 
-LRESULT
+BEGIN_EVENT_TABLE(ConfigDialog, wxDialog)
-CConfigDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
+EVT_BUTTON(wxID_OK, ConfigDialog::SettingsChanged)
+EVT_CHECKBOX(ID_ENABLE_HLE_AUDIO, ConfigDialog::SettingsChanged)
+EVT_CHECKBOX(ID_ENABLE_DTK_MUSIC, ConfigDialog::SettingsChanged)
+EVT_CHECKBOX(ID_ENABLE_THROTTLE, ConfigDialog::SettingsChanged)
+END_EVENT_TABLE()
+
+ConfigDialog::ConfigDialog(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style)
+: wxDialog(parent, id, title, position, size, style)
 {
 	// Load config settings
 	g_Config.Load();
 
 	// Center window
-	//CenterWindow(this->GetParent());
+	CenterOnParent();
-	CenterWindow(GetParent());
 
-	// Get button handles
+	m_OK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	m_buttonEnableHLEAudio = GetDlgItem(IDC_ENABLE_HLE_AUDIO);
+
-	m_buttonEnableDTKMusic = GetDlgItem(IDC_ENABLE_DTK_MUSIC);
+	// Create items
-	m_buttonEnableThrottle = GetDlgItem(IDC_ENABLE_THROTTLE);
+	m_buttonEnableHLEAudio = new wxCheckBox(this, ID_ENABLE_HLE_AUDIO, wxT("Enable HLE Audio"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	m_buttonEnableDTKMusic = new wxCheckBox(this, ID_ENABLE_DTK_MUSIC, wxT("Enable DTK Music"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	m_buttonEnableThrottle = new wxCheckBox(this, ID_ENABLE_THROTTLE, wxT("Enable Other Audio (Throttle)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 
 	// Update checkboxes
-	m_buttonEnableHLEAudio.SetCheck(g_Config.m_EnableHLEAudio ? BST_CHECKED : BST_UNCHECKED);
+	m_buttonEnableHLEAudio->SetValue(g_Config.m_EnableHLEAudio ? true : false);
-	m_buttonEnableDTKMusic.SetCheck(g_Config.m_EnableDTKMusic ? BST_CHECKED : BST_UNCHECKED);
+	m_buttonEnableDTKMusic->SetValue(g_Config.m_EnableDTKMusic ? true : false);
-	m_buttonEnableThrottle.SetCheck(g_Config.m_EnableThrottle ? BST_CHECKED : BST_UNCHECKED);
+	m_buttonEnableThrottle->SetValue(g_Config.m_EnableThrottle ? true : false);
 
 	// Add tooltips
-	CToolTipCtrl ToolTips;
+	m_buttonEnableHLEAudio->SetToolTip(wxT("This is the most common sound type"));
-	ToolTips.Create(m_hWnd);
+	m_buttonEnableDTKMusic->SetToolTip(wxT("This is sometimes used to play music tracks from the disc"));
-	ToolTips.Activate(true);
+	m_buttonEnableThrottle->SetToolTip(wxT("This is sometimes used together with pre-rendered movies.\n"
-	ToolTips.SetMaxTipWidth(220); // limit the width
+		"Disabling this also disables the speed throttle which this causes,\n"
-	ToolTips.SetDelayTime(TTDT_AUTOPOP, 20 * 1000); // give us time to read it
+		"meaning that there will be no upper limit on your FPS."));
-	CToolInfo tiHLE(TTF_SUBCLASS, m_buttonEnableHLEAudio, 0, NULL,
-		"This is the most common sound type");
-	CToolInfo tiDTK(TTF_SUBCLASS, m_buttonEnableDTKMusic, 0, NULL,
-		"This is sometimes used to play music tracks from the disc");
-	CToolInfo tiOther(TTF_SUBCLASS, m_buttonEnableThrottle, 0, NULL,
-		"This is sometimes used together with pre-rendered movies. Disabling this"
-		" also disables the speed throttle that is causes. Meaning that"
-		" there will be no upper limit on your FPS.");
-	ToolTips.AddTool(tiHLE);
-	ToolTips.AddTool(tiDTK);
-	ToolTips.AddTool(tiOther);
 
-	return(TRUE);
+	// Create sizer and add items to dialog
+	wxBoxSizer *sMain = new wxBoxSizer(wxVERTICAL);
+	wxStaticBoxSizer *sbSettings = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Sound Settings"));
+	sbSettings->Add(m_buttonEnableHLEAudio, 0, wxALL, 5);
+	sbSettings->Add(m_buttonEnableDTKMusic, 0, wxALL, 5);
+	sbSettings->Add(m_buttonEnableThrottle, 0, wxALL, 5);
+	sMain->Add(sbSettings, 0, wxEXPAND|wxALL, 5);
+	wxBoxSizer *sButtons = new wxBoxSizer(wxHORIZONTAL);
+	sButtons->Add(150, 0); // Lazy way to make the dialog as wide as we want it
+	sButtons->Add(m_OK, 0, wxALL, 5);
+	sMain->Add(sButtons, 0, wxEXPAND);
+	this->SetSizerAndFit(sMain);
 }
 
-
+ConfigDialog::~ConfigDialog()
-LRESULT
-CConfigDlg::OnCloseCmd(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
 {
-	// Save settings
+}
-	if (wID == IDOK)
+
-	{
+void ConfigDialog::SettingsChanged(wxCommandEvent& event)
-		g_Config.m_EnableHLEAudio = (m_buttonEnableHLEAudio.GetCheck() == BST_CHECKED) ? true : false;
+{
-		g_Config.m_EnableDTKMusic = (m_buttonEnableDTKMusic.GetCheck() == BST_CHECKED) ? true : false;
+	g_Config.m_EnableHLEAudio = m_buttonEnableHLEAudio->GetValue();
-		g_Config.m_EnableThrottle = (m_buttonEnableThrottle.GetCheck() == BST_CHECKED) ? true : false;
+	g_Config.m_EnableDTKMusic = m_buttonEnableDTKMusic->GetValue();
-		g_Config.Save();
+	g_Config.m_EnableThrottle = m_buttonEnableThrottle->GetValue();
-	}
+	g_Config.Save();
-
+
-	EndDialog(wID);
+	if (event.GetId() == wxID_OK)
-	g_Config.Save();
+		EndModal(wxID_OK);
-	return(0);
 }

Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h

@@ -15,32 +15,43 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#pragma once
+#ifndef __DSP_HLE_CONFIGDIALOG_h__
+#define __DSP_HLE_CONFIGDIALOG_h__
 
-class CConfigDlg
+#include <wx/wx.h>
-	: public CDialogImpl<CConfigDlg>
+#include <wx/dialog.h>
+#include <wx/button.h>
+#include <wx/statbox.h>
+
+class ConfigDialog : public wxDialog
 {
-	public:
+public:
+	ConfigDialog(wxWindow *parent,
+		wxWindowID id = 1,
+		const wxString &title = wxT("Dolphin DSP-HLE Plugin Settings"),
+		const wxPoint& pos = wxDefaultPosition,
+		const wxSize& size = wxDefaultSize,
+		long style = wxDEFAULT_DIALOG_STYLE);
+	virtual ~ConfigDialog();
 
-		enum { IDD = IDD_SETTINGS };
+private:
+	DECLARE_EVENT_TABLE();
 
-		BEGIN_MSG_MAP(CConfigDlg)
+	wxButton *m_OK;
-		MESSAGE_HANDLER(WM_INITDIALOG,  OnInitDialog)
+	wxCheckBox *m_buttonEnableHLEAudio;
-		COMMAND_ID_HANDLER(IDOK,        OnCloseCmd)
+	wxCheckBox *m_buttonEnableDTKMusic;
-		COMMAND_ID_HANDLER(IDCANCEL,    OnCloseCmd)
+	wxCheckBox *m_buttonEnableThrottle;
-		END_MSG_MAP()
 
-	private:
+	enum
+	{
+		wxID_OK,
+		ID_ENABLE_HLE_AUDIO,
+		ID_ENABLE_DTK_MUSIC,
+		ID_ENABLE_THROTTLE
+	};
 
-		CButton m_buttonEnableHLEAudio;
+	void OnOK(wxCommandEvent& event);
-		CButton m_buttonEnableDTKMusic;
+	void SettingsChanged(wxCommandEvent& event);
-		CButton m_buttonEnableThrottle;
-
-		// Handler prototypes (uncomment arguments if needed):
-		//	LRESULT MessageHandler(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
-		//	LRESULT CommandHandler(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
-		//	LRESULT NotifyHandler(int /*idCtrl*/, LPNMHDR /*pnmh*/, BOOL& /*bHandled*/)
-
-		LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL & /*bHandled*/);
-		LRESULT OnCloseCmd(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL & /*bHandled*/);
 };
+
+#endif //__DSP_HLE_CONFIGDIALOG_h__

Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.h

@@ -143,7 +143,7 @@ class CDebugger : public wxDialog
 
 		std::vector<std::string> all_all_files, all_files, gc_files, wii_files;
 
-		// WARNING: Make sure these are not also elsewhere, for example in resource.h.
+		// WARNING: Make sure these are not also elsewhere
 		enum
 		{
 			IDC_CHECK0 = 2000,

Source/Plugins/Plugin_DSP_HLE/Src/SConscript

@@ -32,6 +32,7 @@ dspenv = env.Clone()
 
 if dspenv['HAVE_WX']:
     files += [
+		'ConfigDlg.cpp',
         'Debugger/Debugger.cpp',
         'Debugger/PBView.cpp',
         'Debugger/Mails.cpp',

Source/Plugins/Plugin_DSP_HLE/Src/main.cpp

@@ -22,7 +22,15 @@
 #include <iostream>
 
 #include "Globals.h" // Local
+
+#ifdef _WIN32
+	#include "PCHW/DSoundStream.h"
+#else
+	#include "PCHW/AOSoundStream.h"
+#endif
+
 #if defined(HAVE_WX) && HAVE_WX
+	#include "ConfigDlg.h"
 	#include "Debugger/File.h" // For file logging
 	#include "Debugger/Debugger.h" // For the CDebugger class
 	CDebugger* m_frame;
@@ -31,20 +39,9 @@
 #include "ConsoleWindow.h" // Common: For the Windows console
 #include "ChunkFile.h"
 #include "WaveFile.h"
-
-#include "resource.h"
-#ifdef _WIN32
-	#include "PCHW/DSoundStream.h"
-	#include "ConfigDlg.h"
-#else
-	#include "PCHW/AOSoundStream.h"
-#endif
 #include "PCHW/Mixer.h"
 #include "DSPHandler.h"
 #include "Config.h"
-
-
-
 ///////////////////////////////
 
 
@@ -222,9 +219,10 @@ void SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals) {
 
 void DllConfig(HWND _hParent)
 {
-#ifdef _WIN32
+#if defined(HAVE_WX) && HAVE_WX
-	CConfigDlg configDlg;
+	// (shuffle2) TODO: reparent dlg with DolphinApp
-	configDlg.DoModal(_hParent);
+	ConfigDialog dlg(NULL);
+	dlg.ShowModal();
 #endif
 }
 
@@ -241,11 +239,11 @@ void Initialize(void *init)
 	gpName = g_dspInitialize.pName(); // save the game name globally
 	for (u32 i = 0; i < gpName.length(); ++i) // and fix it
 	{
-                Console::Print(L"%c", gpName[i]);
+		Console::Print("%c", gpName[i]);
 		std::cout << gpName[i];
 		if (gpName[i] == ':') gpName[i] = ' ';
 	}
-	Console::Print(L"\n");
+	Console::Print("\n");
 #endif
 
 	CDSPHandler::CreateInstance();

Source/Plugins/Plugin_DSP_HLE/Src/resource.h

@@ -1,19 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by resource.rc
-//
-#define IDD_SETTINGS                    101
-#define IDC_ENABLE_HLE_AUDIO            1000
-#define IDC_ENABLE_DTK_MUSIC            1001
-#define IDC_ENABLE_THROTTLE             1002
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        103
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1011
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

Source/Plugins/Plugin_DSP_HLE/Src/resource.rc

@@ -1,103 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_SETTINGS DIALOGEX 0, 0, 157, 86
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dolphin DSP-HLE Plugin Settings"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,45,65,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,101,65,50,14
-    GROUPBOX        "&Sound settings",IDC_STATIC,7,7,144,57
-    CONTROL         "&Enable HLE Audio",IDC_ENABLE_HLE_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,22,84,8
-    CONTROL         "Enab&le DTK Music",IDC_ENABLE_DTK_MUSIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,36,90,8
-    CONTROL         "Enable Other Audio",IDC_ENABLE_THROTTLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,50,94,10
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_SETTINGS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 151
-        VERTGUIDE, 13
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 79
-        HORZGUIDE, 31
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

Source/Plugins/Plugin_DSP_HLE/Src/stdafx.h

@@ -26,10 +26,4 @@
 #include <windows.h>
 #include <tchar.h>
 
-// WTL
-#include <atlbase.h>
-#include <atlapp.h>
-#include <atldlgs.h>
-#include <atlctrls.h>
-
 #endif