ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WX port: Add in new input dialog and base stuff. Not functional yet. 

Fix high CPU usage when not running.
This commit is contained in:
luigi__ 2010-07-10 14:22:17 +00:00
parent 98546fb57c
commit 9e40fe4435
5 changed files with 6668 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

538
desmume/src/wx/wxDeSmuME_2008.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Version="9,00"
Name="wxDeSmuME_VS2008"
ProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
RootNamespace="DeSmuME"
@ -56,7 +56,7 @@
FavorSizeOrSpeed="0"
EnableFiberSafeOptimizations="false"
WholeProgramOptimization="false"
AdditionalIncludeDirectories=".;..;..\windows\lua\include;&quot;..\windows\glib-2.20.1\build&quot;;&quot;..\windows\glib-2.20.1\build\glib&quot;;..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows;..\windows\sdl\include"
AdditionalIncludeDirectories=".;..;..\windows\lua\include;&quot;..\windows\glib-2.20.1\build&quot;;&quot;..\windows\glib-2.20.1\build\glib&quot;;..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows;..\windows\sdl\include;..\wxdlg"
PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;BETA_VERSION;NOMINMAX;HAVE_LIBZ;WXPORT"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@ -111,6 +111,195 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\__bins"
IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=".;..;..\windows\lua\include;&quot;..\windows\glib-2.20.1\build&quot;;&quot;..\windows\glib-2.20.1\build\glib&quot;;..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows;..\windows\sdl\include;..\wxdlg"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;WXPORT"
StringPooling="true"
ExceptionHandling="1"
StructMemberAlignment="0"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2"
FloatingPointModel="2"
WarningLevel="1"
DebugInformationFormat="3"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Rpcrt4.lib directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib wxbase28.lib wxmsw28_core.lib sdl-vc8-Win32.lib"
OutputFile="$(OutDir)\$(ProjectName)_release.exe"
AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs"
DelayLoadDLLs=""
GenerateDebugInformation="true"
OptimizeReferences="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
Profile="false"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="DeSmuME_x86.manifest"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Dev+|Win32"
OutputDirectory="$(SolutionDir)\__bins"
IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="3"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="false"
AdditionalIncludeDirectories=".;..;..\windows\lua\include;&quot;..\windows\glib-2.20.1\build&quot;;&quot;..\windows\glib-2.20.1\build\glib&quot;;..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows;..\windows\sdl\include;..\wxdlg"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;FASTBUILD;DEVELOPER;EXPERIMENTAL_WIFI_COMM;WXPORT"
StringPooling="true"
ExceptionHandling="1"
StructMemberAlignment="0"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2"
FloatingPointModel="2"
WarningLevel="1"
DebugInformationFormat="3"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Rpcrt4.lib directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib wxbase28.lib wxmsw28_core.lib sdl-vc8-Win32.lib"
OutputFile="$(OutDir)\$(ProjectName)_dev+.exe"
AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs"
DelayLoadDLLs=""
GenerateDebugInformation="true"
OptimizeReferences="2"
LinkTimeCodeGeneration="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
Profile="false"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="DeSmuME_x86.manifest"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)\__bins"
@ -202,100 +391,6 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\__bins"
IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=".;..;..\windows\lua\include;&quot;..\windows\glib-2.20.1\build&quot;;&quot;..\windows\glib-2.20.1\build\glib&quot;;..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows;..\windows\sdl\include"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;WXPORT"
StringPooling="true"
ExceptionHandling="1"
StructMemberAlignment="0"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2"
FloatingPointModel="2"
WarningLevel="1"
DebugInformationFormat="3"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Rpcrt4.lib directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib wxbase28.lib wxmsw28_core.lib sdl-vc8-Win32.lib"
OutputFile="$(OutDir)\$(ProjectName)_release.exe"
AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs"
DelayLoadDLLs=""
GenerateDebugInformation="true"
OptimizeReferences="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
Profile="false"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="DeSmuME_x86.manifest"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)\__bins"
@ -391,101 +486,6 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Dev+|Win32"
OutputDirectory="$(SolutionDir)\__bins"
IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="3"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="false"
AdditionalIncludeDirectories=".;..;..\windows\lua\include;&quot;..\windows\glib-2.20.1\build&quot;;&quot;..\windows\glib-2.20.1\build\glib&quot;;..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows;..\windows\sdl\include"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;FASTBUILD;DEVELOPER;EXPERIMENTAL_WIFI_COMM;WXPORT"
StringPooling="true"
ExceptionHandling="1"
StructMemberAlignment="0"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2"
FloatingPointModel="2"
WarningLevel="1"
DebugInformationFormat="3"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Rpcrt4.lib directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib wxbase28.lib wxmsw28_core.lib sdl-vc8-Win32.lib"
OutputFile="$(OutDir)\$(ProjectName)_dev+.exe"
AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs"
DelayLoadDLLs=""
GenerateDebugInformation="true"
OptimizeReferences="2"
LinkTimeCodeGeneration="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
Profile="false"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="DeSmuME_x86.manifest"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Dev+|x64"
OutputDirectory="$(SolutionDir)\__bins"
@ -649,7 +649,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
Name="Dev+|Win32"
>
<Tool
Name="VCCLCompilerTool"
@ -657,7 +657,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Dev+|Win32"
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@ -1346,6 +1346,18 @@
>
</File>
</Filter>
<Filter
Name="dialogs"
>
<File
RelativePath="..\wxdlg\wxcontrolsconfigdialog.cpp"
>
</File>
<File
RelativePath="..\wxdlg\wxcontrolsconfigdialog.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="libs"
@ -1363,16 +1375,6 @@
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
@ -1384,7 +1386,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
Name="Dev+|Win32"
>
<Tool
Name="VCCustomBuildTool"
@ -1394,7 +1396,17 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Dev+|Win32"
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
@ -1437,16 +1449,6 @@
Outputs=".libs\directx.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\directx\directx.7z .libs\directx*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\directx.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
@ -1458,7 +1460,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
Name="Dev+|Win32"
>
<Tool
Name="VCCustomBuildTool"
@ -1468,7 +1470,17 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Dev+|Win32"
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\directx\directx.7z .libs\directx*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\directx.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
@ -1501,16 +1513,6 @@
Outputs=".libs\glib-vc8.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\glib-2.20.1\glib-2.20.1.7z .libs\glib*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\glib-vc8.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
@ -1522,7 +1524,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
Name="Dev+|Win32"
>
<Tool
Name="VCCustomBuildTool"
@ -1532,7 +1534,17 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Dev+|Win32"
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\glib-2.20.1\glib-2.20.1.7z .libs\glib*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\glib-vc8.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
@ -1565,16 +1577,6 @@
Outputs=".libs\lua.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\lua*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\lua.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
@ -1586,7 +1588,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
Name="Dev+|Win32"
>
<Tool
Name="VCCustomBuildTool"
@ -1596,7 +1598,17 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Dev+|Win32"
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\lua*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\lua.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
@ -1639,16 +1651,6 @@
Outputs=".libs\sdl.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\sdl\SDL7z .libs\sdl*"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\sdl.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Dev+|Win32"
>
@ -1659,6 +1661,16 @@
Outputs=".libs\sdl.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\sdl\SDL7z .libs\sdl*"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\sdl.tag"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\wx\wx.7z"
@ -1673,16 +1685,6 @@
Outputs=".libs\wx.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\wx\wx.7z .libs\wx*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\wx.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
@ -1694,7 +1696,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
Name="Dev+|Win32"
>
<Tool
Name="VCCustomBuildTool"
@ -1704,7 +1706,17 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Dev+|Win32"
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\wx\wx.7z .libs\wx*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\wx.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"

24
desmume/src/wx/wxMain.cpp
View File

@ -21,6 +21,7 @@
#include "LuaWindow.h"
#include "PadSimple/GUI/ConfigDlg.h"
#include "PadSimple/pluginspecs_pad.h"
#include "wxcontrolsconfigdialog.h"
#ifndef WX_PRECOMP
#include <wx/wx.h>
@ -305,14 +306,17 @@ loop:
void onIdle(wxIdleEvent &event){
Refresh(false);
event.RequestMore();
applyInput();
if(execute) {
if (execute)
{
applyInput();
NDS_exec<false>();
SPU_Emulate_user();
};
osd->update();
DrawHUD();
osd->clear();
osd->update();
DrawHUD();
osd->clear();
}
else
wxMilliSleep(250);
// wxMicroSleep(16.7*1000);
}
@ -443,9 +447,10 @@ loop:
void OnOpenControllerConfiguration(wxCommandEvent& WXUNUSED (event))
{
#ifndef _MSC_VER
new PADConfigDialogSimple(this);
#endif
//#ifndef _MSC_VER
// new PADConfigDialogSimple(this);
(new wxControlsConfigDialog(this))->ShowModal();
//#endif
}
wxMenu* MakeStatesSubMenu( int baseid ) const
@ -703,7 +708,6 @@ bool Desmume::OnInit()
DesmumeFrame::DesmumeFrame(const wxString& title)
: wxFrame(NULL, wxID_ANY, title)
{
history = new wxFileHistory;
wxMenu *fileMenu = new wxMenu;
wxMenu *emulationMenu = new wxMenu;

5642
desmume/src/wxdlg/desmume.pjd
View File

File diff suppressed because it is too large Load Diff

575
desmume/src/wxdlg/wxcontrolsconfigdialog.cpp Normal file
View File

@ -0,0 +1,575 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wxcontrolsconfigdialog.cpp
// Purpose:
// Author:
// Modified by:
// Created: 09/07/2010 15:27:00
// RCS-ID:
// Copyright:
// Licence:
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
////@begin includes
////@end includes
#include "wxcontrolsconfigdialog.h"
////@begin XPM images
////@end XPM images
/*
* wxControlsConfigDialog type definition
*/
IMPLEMENT_DYNAMIC_CLASS( wxControlsConfigDialog, wxDialog )
/*
* wxControlsConfigDialog event table definition
*/
BEGIN_EVENT_TABLE( wxControlsConfigDialog, wxDialog )
////@begin wxControlsConfigDialog event table entries
EVT_BUTTON( ID_K_L_C, wxControlsConfigDialog::OnChangeKeyboardMapping )
EVT_BUTTON( ID_K_R_C, wxControlsConfigDialog::OnChangeKeyboardMapping )
EVT_BUTTON( ID_K_X_C, wxControlsConfigDialog::OnChangeKeyboardMapping )
EVT_BUTTON( ID_K_Y_C, wxControlsConfigDialog::OnChangeKeyboardMapping )
EVT_BUTTON( ID_K_A_C, wxControlsConfigDialog::OnChangeKeyboardMapping )
EVT_BUTTON( ID_K_B_C, wxControlsConfigDialog::OnChangeKeyboardMapping )
EVT_BUTTON( ID_K_START_C, wxControlsConfigDialog::OnChangeKeyboardMapping )
EVT_BUTTON( ID_K_SELECT_C, wxControlsConfigDialog::OnChangeKeyboardMapping )
EVT_BUTTON( ID_K_UP_C, wxControlsConfigDialog::OnChangeKeyboardMapping )
EVT_BUTTON( ID_K_DOWN_C, wxControlsConfigDialog::OnChangeKeyboardMapping )
EVT_BUTTON( ID_K_LEFT_C, wxControlsConfigDialog::OnChangeKeyboardMapping )
EVT_BUTTON( ID_K_RIGHT_C, wxControlsConfigDialog::OnChangeKeyboardMapping )
EVT_BUTTON( ID_K_LID_C, wxControlsConfigDialog::OnChangeKeyboardMapping )
EVT_CHOICE( ID_JOYSTICKIDX, wxControlsConfigDialog::OnJoystickidxSelected )
EVT_BUTTON( ID_J_L_C, wxControlsConfigDialog::OnChangeJoystickMapping )
EVT_BUTTON( ID_J_R_C, wxControlsConfigDialog::OnChangeJoystickMapping )
EVT_BUTTON( ID_J_X_C, wxControlsConfigDialog::OnChangeJoystickMapping )
EVT_BUTTON( ID_J_Y_C, wxControlsConfigDialog::OnChangeJoystickMapping )
EVT_BUTTON( ID_J_A_C, wxControlsConfigDialog::OnChangeJoystickMapping )
EVT_BUTTON( ID_J_B_C, wxControlsConfigDialog::OnChangeJoystickMapping )
EVT_BUTTON( ID_J_START_C, wxControlsConfigDialog::OnChangeJoystickMapping )
EVT_BUTTON( ID_J_SELECT_C, wxControlsConfigDialog::OnChangeJoystickMapping )
EVT_BUTTON( ID_J_LID_C, wxControlsConfigDialog::OnChangeJoystickMapping )
EVT_RADIOBUTTON( ID_DPAD_OPT1, wxControlsConfigDialog::OnChangeDPadMode )
EVT_RADIOBUTTON( ID_DPAD_OPT2, wxControlsConfigDialog::OnChangeDPadMode )
EVT_RADIOBUTTON( ID_DPAD_OPT3, wxControlsConfigDialog::OnChangeDPadMode )
EVT_BUTTON( wxID_DEFAULT, wxControlsConfigDialog::OnDefaultClick )
EVT_BUTTON( wxID_OK, wxControlsConfigDialog::OnOkClick )
EVT_BUTTON( wxID_CANCEL, wxControlsConfigDialog::OnCancelClick )
EVT_BUTTON( wxID_APPLY, wxControlsConfigDialog::OnApplyClick )
////@end wxControlsConfigDialog event table entries
END_EVENT_TABLE()
/*
* wxControlsConfigDialog constructors
*/
wxControlsConfigDialog::wxControlsConfigDialog()
{
Init();
}
wxControlsConfigDialog::wxControlsConfigDialog( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
{
Init();
Create(parent, id, caption, pos, size, style);
}
/*
* wxControlsConfigDialog creator
*/
bool wxControlsConfigDialog::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
{
////@begin wxControlsConfigDialog creation
SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
wxDialog::Create( parent, id, caption, pos, size, style );
CreateControls();
if (GetSizer())
{
GetSizer()->SetSizeHints(this);
}
Centre();
////@end wxControlsConfigDialog creation
return true;
}
/*
* wxControlsConfigDialog destructor
*/
wxControlsConfigDialog::~wxControlsConfigDialog()
{
////@begin wxControlsConfigDialog destruction
////@end wxControlsConfigDialog destruction
}
/*
* Member initialisation
*/
void wxControlsConfigDialog::Init()
{
////@begin wxControlsConfigDialog member initialisation
////@end wxControlsConfigDialog member initialisation
}
/*
* Control creation for wxControlsConfigDialog
*/
void wxControlsConfigDialog::CreateControls()
{
////@begin wxControlsConfigDialog content construction
wxControlsConfigDialog* itemDialog1 = this;
wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
itemDialog1->SetSizer(itemBoxSizer2);
wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 0);
wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Keyboard"));
wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxVERTICAL);
itemBoxSizer3->Add(itemStaticBoxSizer4, 0, wxALIGN_TOP|wxALL, 5);
wxFlexGridSizer* itemFlexGridSizer5 = new wxFlexGridSizer(0, 3, 0, 0);
itemStaticBoxSizer4->Add(itemFlexGridSizer5, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
wxStaticText* itemStaticText6 = new wxStaticText( itemDialog1, wxID_STATIC, _("L:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText6, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl7 = new wxTextCtrl( itemDialog1, ID_K_L_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer5->Add(itemTextCtrl7, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton8 = new wxButton( itemDialog1, ID_K_L_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemButton8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText9 = new wxStaticText( itemDialog1, wxID_STATIC, _("R:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText9, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl10 = new wxTextCtrl( itemDialog1, ID_K_R_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer5->Add(itemTextCtrl10, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton11 = new wxButton( itemDialog1, ID_K_R_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemButton11, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText12 = new wxStaticText( itemDialog1, wxID_STATIC, _("X:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText12, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl13 = new wxTextCtrl( itemDialog1, ID_K_X_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer5->Add(itemTextCtrl13, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton14 = new wxButton( itemDialog1, ID_K_X_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemButton14, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText15 = new wxStaticText( itemDialog1, wxID_STATIC, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText15, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl16 = new wxTextCtrl( itemDialog1, ID_K_Y_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer5->Add(itemTextCtrl16, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton17 = new wxButton( itemDialog1, ID_K_Y_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemButton17, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("A:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText18, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl19 = new wxTextCtrl( itemDialog1, ID_K_A_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer5->Add(itemTextCtrl19, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton20 = new wxButton( itemDialog1, ID_K_A_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemButton20, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText21 = new wxStaticText( itemDialog1, wxID_STATIC, _("B:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText21, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl22 = new wxTextCtrl( itemDialog1, ID_K_B_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer5->Add(itemTextCtrl22, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton23 = new wxButton( itemDialog1, ID_K_B_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemButton23, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText24 = new wxStaticText( itemDialog1, wxID_STATIC, _("Start:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText24, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl25 = new wxTextCtrl( itemDialog1, ID_K_START_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer5->Add(itemTextCtrl25, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton26 = new wxButton( itemDialog1, ID_K_START_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemButton26, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText27 = new wxStaticText( itemDialog1, wxID_STATIC, _("Select:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText27, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl28 = new wxTextCtrl( itemDialog1, ID_K_SELECT_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer5->Add(itemTextCtrl28, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton29 = new wxButton( itemDialog1, ID_K_SELECT_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemButton29, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText30 = new wxStaticText( itemDialog1, wxID_STATIC, _("Up:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText30, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl31 = new wxTextCtrl( itemDialog1, ID_K_UP_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer5->Add(itemTextCtrl31, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton32 = new wxButton( itemDialog1, ID_K_UP_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemButton32, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText33 = new wxStaticText( itemDialog1, wxID_STATIC, _("Down:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText33, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl34 = new wxTextCtrl( itemDialog1, ID_K_DOWN_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer5->Add(itemTextCtrl34, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton35 = new wxButton( itemDialog1, ID_K_DOWN_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemButton35, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText36 = new wxStaticText( itemDialog1, wxID_STATIC, _("Left:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText36, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl37 = new wxTextCtrl( itemDialog1, ID_K_LEFT_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer5->Add(itemTextCtrl37, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton38 = new wxButton( itemDialog1, ID_K_LEFT_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemButton38, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText39 = new wxStaticText( itemDialog1, wxID_STATIC, _("Right:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText39, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl40 = new wxTextCtrl( itemDialog1, ID_K_RIGHT_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer5->Add(itemTextCtrl40, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton41 = new wxButton( itemDialog1, ID_K_RIGHT_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemButton41, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText42 = new wxStaticText( itemDialog1, wxID_STATIC, _("Close/open lid:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText42, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl43 = new wxTextCtrl( itemDialog1, ID_K_LID_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer5->Add(itemTextCtrl43, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton44 = new wxButton( itemDialog1, ID_K_LID_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemButton44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticBox* itemStaticBoxSizer45Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Joystick"));
wxStaticBoxSizer* itemStaticBoxSizer45 = new wxStaticBoxSizer(itemStaticBoxSizer45Static, wxVERTICAL);
itemBoxSizer3->Add(itemStaticBoxSizer45, 0, wxALIGN_TOP|wxALL, 5);
wxArrayString itemChoice46Strings;
wxChoice* itemChoice46 = new wxChoice( itemDialog1, ID_JOYSTICKIDX, wxDefaultPosition, wxSize(250, -1), itemChoice46Strings, 0 );
itemStaticBoxSizer45->Add(itemChoice46, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5);
wxFlexGridSizer* itemFlexGridSizer47 = new wxFlexGridSizer(0, 3, 0, 0);
itemStaticBoxSizer45->Add(itemFlexGridSizer47, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
wxStaticText* itemStaticText48 = new wxStaticText( itemDialog1, wxID_STATIC, _("L:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemStaticText48, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl49 = new wxTextCtrl( itemDialog1, ID_J_L_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer47->Add(itemTextCtrl49, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton50 = new wxButton( itemDialog1, ID_J_L_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemButton50, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText51 = new wxStaticText( itemDialog1, wxID_STATIC, _("R:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemStaticText51, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl52 = new wxTextCtrl( itemDialog1, ID_J_R_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer47->Add(itemTextCtrl52, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton53 = new wxButton( itemDialog1, ID_J_R_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemButton53, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText54 = new wxStaticText( itemDialog1, wxID_STATIC, _("X:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemStaticText54, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl55 = new wxTextCtrl( itemDialog1, ID_J_X_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer47->Add(itemTextCtrl55, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton56 = new wxButton( itemDialog1, ID_J_X_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemButton56, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText57 = new wxStaticText( itemDialog1, wxID_STATIC, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemStaticText57, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl58 = new wxTextCtrl( itemDialog1, ID_J_Y_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer47->Add(itemTextCtrl58, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton59 = new wxButton( itemDialog1, ID_J_Y_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemButton59, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText60 = new wxStaticText( itemDialog1, wxID_STATIC, _("A:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemStaticText60, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl61 = new wxTextCtrl( itemDialog1, ID_J_A_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer47->Add(itemTextCtrl61, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton62 = new wxButton( itemDialog1, ID_J_A_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemButton62, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText63 = new wxStaticText( itemDialog1, wxID_STATIC, _("B:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemStaticText63, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl64 = new wxTextCtrl( itemDialog1, ID_J_B_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer47->Add(itemTextCtrl64, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton65 = new wxButton( itemDialog1, ID_J_B_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemButton65, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText66 = new wxStaticText( itemDialog1, wxID_STATIC, _("Start:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemStaticText66, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl67 = new wxTextCtrl( itemDialog1, ID_J_START_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer47->Add(itemTextCtrl67, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton68 = new wxButton( itemDialog1, ID_J_START_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemButton68, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText69 = new wxStaticText( itemDialog1, wxID_STATIC, _("Select:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemStaticText69, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl70 = new wxTextCtrl( itemDialog1, ID_J_SELECT_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer47->Add(itemTextCtrl70, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton71 = new wxButton( itemDialog1, ID_J_SELECT_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemButton71, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticText* itemStaticText72 = new wxStaticText( itemDialog1, wxID_STATIC, _("Close/open lid:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemStaticText72, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
wxTextCtrl* itemTextCtrl73 = new wxTextCtrl( itemDialog1, ID_J_LID_S, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
itemFlexGridSizer47->Add(itemTextCtrl73, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxButton* itemButton74 = new wxButton( itemDialog1, ID_J_LID_C, _("Change"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer47->Add(itemButton74, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxStaticBox* itemStaticBoxSizer75Static = new wxStaticBox(itemDialog1, wxID_ANY, _("D-Pad"));
wxStaticBoxSizer* itemStaticBoxSizer75 = new wxStaticBoxSizer(itemStaticBoxSizer75Static, wxHORIZONTAL);
itemStaticBoxSizer45->Add(itemStaticBoxSizer75, 0, wxALIGN_LEFT|wxALL, 5);
wxRadioButton* itemRadioButton76 = new wxRadioButton( itemDialog1, ID_DPAD_OPT1, _("POV hat"), wxDefaultPosition, wxDefaultSize, 0 );
itemRadioButton76->SetValue(false);
itemStaticBoxSizer75->Add(itemRadioButton76, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxRadioButton* itemRadioButton77 = new wxRadioButton( itemDialog1, ID_DPAD_OPT2, _("X/Y axis"), wxDefaultPosition, wxDefaultSize, 0 );
itemRadioButton77->SetValue(false);
itemStaticBoxSizer75->Add(itemRadioButton77, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxRadioButton* itemRadioButton78 = new wxRadioButton( itemDialog1, ID_DPAD_OPT3, _("Both"), wxDefaultPosition, wxDefaultSize, 0 );
itemRadioButton78->SetValue(false);
itemStaticBoxSizer75->Add(itemRadioButton78, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxBoxSizer* itemBoxSizer79 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer2->Add(itemBoxSizer79, 0, wxALIGN_RIGHT|wxLEFT|wxRIGHT|wxBOTTOM, 5);
wxButton* itemButton80 = new wxButton( itemDialog1, wxID_DEFAULT, _("Default"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer79->Add(itemButton80, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
itemBoxSizer79->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxButton* itemButton82 = new wxButton( itemDialog1, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton82->SetDefault();
itemBoxSizer79->Add(itemButton82, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
wxButton* itemButton83 = new wxButton( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer79->Add(itemButton83, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
wxButton* itemButton84 = new wxButton( itemDialog1, wxID_APPLY, _("&Apply"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton84->Enable(false);
itemBoxSizer79->Add(itemButton84, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5);
////@end wxControlsConfigDialog content construction
}
/*
* Should we show tooltips?
*/
bool wxControlsConfigDialog::ShowToolTips()
{
return true;
}
/*
* Get bitmap resources
*/
wxBitmap wxControlsConfigDialog::GetBitmapResource( const wxString& name )
{
// Bitmap retrieval
////@begin wxControlsConfigDialog bitmap retrieval
wxUnusedVar(name);
return wxNullBitmap;
////@end wxControlsConfigDialog bitmap retrieval
}
/*
* Get icon resources
*/
wxIcon wxControlsConfigDialog::GetIconResource( const wxString& name )
{
// Icon retrieval
////@begin wxControlsConfigDialog icon retrieval
wxUnusedVar(name);
return wxNullIcon;
////@end wxControlsConfigDialog icon retrieval
}
/*
* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_K_L_C
*/
void wxControlsConfigDialog::OnChangeKeyboardMapping( wxCommandEvent& event )
{
////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_K_L_C in wxControlsConfigDialog.
// Before editing this code, remove the block markers.
event.Skip();
////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_K_L_C in wxControlsConfigDialog.
}
/*
* wxEVT_COMMAND_CHOICE_SELECTED event handler for ID_JOYSTICKIDX
*/
void wxControlsConfigDialog::OnJoystickidxSelected( wxCommandEvent& event )
{
////@begin wxEVT_COMMAND_CHOICE_SELECTED event handler for ID_JOYSTICKIDX in wxControlsConfigDialog.
// Before editing this code, remove the block markers.
event.Skip();
////@end wxEVT_COMMAND_CHOICE_SELECTED event handler for ID_JOYSTICKIDX in wxControlsConfigDialog.
}
/*
* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_J_L_C
*/
void wxControlsConfigDialog::OnChangeJoystickMapping( wxCommandEvent& event )
{
////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_J_L_C in wxControlsConfigDialog.
// Before editing this code, remove the block markers.
event.Skip();
////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_J_L_C in wxControlsConfigDialog.
}
/*
* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_DPAD_OPT1
*/
void wxControlsConfigDialog::OnChangeDPadMode( wxCommandEvent& event )
{
////@begin wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_DPAD_OPT1 in wxControlsConfigDialog.
// Before editing this code, remove the block markers.
event.Skip();
////@end wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_DPAD_OPT1 in wxControlsConfigDialog.
}
/*
* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_DEFAULT
*/
void wxControlsConfigDialog::OnDefaultClick( wxCommandEvent& event )
{
////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_DEFAULT in wxControlsConfigDialog.
// Before editing this code, remove the block markers.
event.Skip();
////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_DEFAULT in wxControlsConfigDialog.
}
/*
* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
*/
void wxControlsConfigDialog::OnOkClick( wxCommandEvent& event )
{
////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK in wxControlsConfigDialog.
// Before editing this code, remove the block markers.
event.Skip();
////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK in wxControlsConfigDialog.
}
/*
* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
*/
void wxControlsConfigDialog::OnCancelClick( wxCommandEvent& event )
{
Destroy();
}
/*
* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_APPLY
*/
void wxControlsConfigDialog::OnApplyClick( wxCommandEvent& event )
{
////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_APPLY in wxControlsConfigDialog.
// Before editing this code, remove the block markers.
event.Skip();
////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_APPLY in wxControlsConfigDialog.
}

163
desmume/src/wxdlg/wxcontrolsconfigdialog.h Normal file
View File

@ -0,0 +1,163 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wxcontrolsconfigdialog.h
// Purpose:
// Author:
// Modified by:
// Created: 09/07/2010 15:27:00
// RCS-ID:
// Copyright:
// Licence:
/////////////////////////////////////////////////////////////////////////////
#ifndef _WXCONTROLSCONFIGDIALOG_H_
#define _WXCONTROLSCONFIGDIALOG_H_
/*!
* Includes
*/
////@begin includes
////@end includes
/*!
* Forward declarations
*/
////@begin forward declarations
////@end forward declarations
/*!
* Control identifiers
*/
////@begin control identifiers
#define ID_WXCONTROLSCONFIGDIALOG 10010
#define ID_K_L_S 10011
#define ID_K_L_C 10012
#define ID_K_R_S 10013
#define ID_K_R_C 10014
#define ID_K_X_S 10015
#define ID_K_X_C 10016
#define ID_K_Y_S 10017
#define ID_K_Y_C 10018
#define ID_K_A_S 10019
#define ID_K_A_C 10020
#define ID_K_B_S 10021
#define ID_K_B_C 10022
#define ID_K_START_S 10023
#define ID_K_START_C 10024
#define ID_K_SELECT_S 10025
#define ID_K_SELECT_C 10026
#define ID_K_UP_S 10027
#define ID_K_UP_C 10028
#define ID_K_DOWN_S 10029
#define ID_K_DOWN_C 10030
#define ID_K_LEFT_S 10031
#define ID_K_LEFT_C 10032
#define ID_K_RIGHT_S 10033
#define ID_K_RIGHT_C 10034
#define ID_K_LID_S 10035
#define ID_K_LID_C 10036
#define ID_JOYSTICKIDX 10058
#define ID_J_L_S 10037
#define ID_J_L_C 10038
#define ID_J_R_S 10039
#define ID_J_R_C 10040
#define ID_J_X_S 10041
#define ID_J_X_C 10042
#define ID_J_Y_S 10043
#define ID_J_Y_C 10044
#define ID_J_A_S 10045
#define ID_J_A_C 10046
#define ID_J_B_S 10047
#define ID_J_B_C 10048
#define ID_J_START_S 10049
#define ID_J_START_C 10050
#define ID_J_SELECT_S 10051
#define ID_J_SELECT_C 10052
#define ID_J_LID_S 10053
#define ID_J_LID_C 10054
#define ID_DPAD_OPT1 10055
#define ID_DPAD_OPT2 10056
#define ID_DPAD_OPT3 10057
#define SYMBOL_WXCONTROLSCONFIGDIALOG_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|wxTAB_TRAVERSAL
#define SYMBOL_WXCONTROLSCONFIGDIALOG_TITLE _("Controls configuration")
#define SYMBOL_WXCONTROLSCONFIGDIALOG_IDNAME ID_WXCONTROLSCONFIGDIALOG
#define SYMBOL_WXCONTROLSCONFIGDIALOG_SIZE wxSize(400, 300)
#define SYMBOL_WXCONTROLSCONFIGDIALOG_POSITION wxDefaultPosition
////@end control identifiers
/*!
* wxControlsConfigDialog class declaration
*/
class wxControlsConfigDialog: public wxDialog
{
DECLARE_DYNAMIC_CLASS( wxControlsConfigDialog )
DECLARE_EVENT_TABLE()
public:
/// Constructors
wxControlsConfigDialog();
wxControlsConfigDialog( wxWindow* parent, wxWindowID id = SYMBOL_WXCONTROLSCONFIGDIALOG_IDNAME, const wxString& caption = SYMBOL_WXCONTROLSCONFIGDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXCONTROLSCONFIGDIALOG_POSITION, const wxSize& size = SYMBOL_WXCONTROLSCONFIGDIALOG_SIZE, long style = SYMBOL_WXCONTROLSCONFIGDIALOG_STYLE );
/// Creation
bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WXCONTROLSCONFIGDIALOG_IDNAME, const wxString& caption = SYMBOL_WXCONTROLSCONFIGDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXCONTROLSCONFIGDIALOG_POSITION, const wxSize& size = SYMBOL_WXCONTROLSCONFIGDIALOG_SIZE, long style = SYMBOL_WXCONTROLSCONFIGDIALOG_STYLE );
/// Destructor
~wxControlsConfigDialog();
/// Initialises member variables
void Init();
/// Creates the controls and sizers
void CreateControls();
////@begin wxControlsConfigDialog event handler declarations
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_K_L_C
virtual void OnChangeKeyboardMapping( wxCommandEvent& event );
/// wxEVT_COMMAND_CHOICE_SELECTED event handler for ID_JOYSTICKIDX
virtual void OnJoystickidxSelected( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_J_L_C
virtual void OnChangeJoystickMapping( wxCommandEvent& event );
/// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_DPAD_OPT1
virtual void OnChangeDPadMode( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_DEFAULT
virtual void OnDefaultClick( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
virtual void OnOkClick( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
virtual void OnCancelClick( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_APPLY
virtual void OnApplyClick( wxCommandEvent& event );
////@end wxControlsConfigDialog event handler declarations
////@begin wxControlsConfigDialog member function declarations
/// Retrieves bitmap resources
wxBitmap GetBitmapResource( const wxString& name );
/// Retrieves icon resources
wxIcon GetIconResource( const wxString& name );
////@end wxControlsConfigDialog member function declarations
/// Should we show tooltips?
static bool ShowToolTips();
////@begin wxControlsConfigDialog member variables
////@end wxControlsConfigDialog member variables
};
#endif
// _WXCONTROLSCONFIGDIALOG_H_