piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon now builds in unicode

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3922 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
LPFaint99
2009-08-01 19:11:05 +00:00
parent 1e9bb4ed9a
commit 5b735361e8
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/wxWidgets/include/wx/msw/setup0.h vendored
View File

@ -157,7 +157,7 @@
// //
// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP) // Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
#ifndef wxUSE_UNICODE #ifndef wxUSE_UNICODE
#define wxUSE_UNICODE 0 #define wxUSE_UNICODE 1
#endif #endif
// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without // Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without

2
Externals/wxWidgets/include/wx/setup.h vendored
View File

@ -157,7 +157,7 @@
// //
// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP) // Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
#ifndef wxUSE_UNICODE #ifndef wxUSE_UNICODE
#define wxUSE_UNICODE 0 #define wxUSE_UNICODE 1
#endif #endif
// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without // Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without

12
Source/Core/InputCommon/InputCommon.vcproj
View File

@ -24,7 +24,7 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="0" CharacterSet="1"
WholeProgramOptimization="0" WholeProgramOptimization="0"
> >
<Tool <Tool
@ -88,7 +88,7 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="0" CharacterSet="1"
WholeProgramOptimization="0" WholeProgramOptimization="0"
> >
<Tool <Tool
@ -153,7 +153,7 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="0" CharacterSet="1"
WholeProgramOptimization="0" WholeProgramOptimization="0"
> >
<Tool <Tool
@ -219,7 +219,7 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="1"
WholeProgramOptimization="0" WholeProgramOptimization="0"
> >
<Tool <Tool
@ -286,7 +286,7 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="0" CharacterSet="1"
WholeProgramOptimization="0" WholeProgramOptimization="0"
> >
<Tool <Tool
@ -347,7 +347,7 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="0" CharacterSet="1"
WholeProgramOptimization="0" WholeProgramOptimization="0"
> >
<Tool <Tool

3
Source/Core/InputCommon/Src/Configuration.cpp
View File

@ -240,7 +240,8 @@ std::string VKToString(int keycode)
#ifdef _WIN32 #ifdef _WIN32
// Default value // Default value
char KeyStr[64] = {0}; char KeyStr[64] = {0};
GetKeyNameText(MapVirtualKey(keycode, MAPVK_VK_TO_VSC) << 16, KeyStr, 64); // TODO: Switch to unicode GetKeyNameText?
GetKeyNameTextA(MapVirtualKey(keycode, MAPVK_VK_TO_VSC) << 16, KeyStr, 64);
std::string KeyString = KeyStr; std::string KeyString = KeyStr;
switch(keycode) switch(keycode)

7
Source/Core/InputCommon/Src/DirectInputBase.cpp
View File

@ -104,7 +104,8 @@ void DInput::DIKToString(unsigned int keycode, char *keyStr)
strcpy(keyStr, "Num /"); strcpy(keyStr, "Num /");
break; break;
default: default:
GetKeyNameText(keycode << 16, keyStr, 64); // TODO: Switch to unicode GetKeyNameText?
GetKeyNameTextA(keycode << 16, keyStr, 64);
break; break;
} }
} }
@ -119,13 +120,13 @@ HRESULT DInput::Init(HWND hWnd)
if (FAILED(hr = DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION, if (FAILED(hr = DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION,
IID_IDirectInput8, (VOID* *)&g_pDI, NULL))) IID_IDirectInput8, (VOID* *)&g_pDI, NULL)))
{ {
MessageBox(0, "Direct Input Create Failed", 0, MB_ICONERROR); MessageBox(0, L"Direct Input Create Failed", 0, MB_ICONERROR);
return(hr); return(hr);
} }
if (FAILED(hr = g_pDI->CreateDevice(GUID_SysKeyboard, &g_pKeyboard, NULL))) if (FAILED(hr = g_pDI->CreateDevice(GUID_SysKeyboard, &g_pKeyboard, NULL)))
{ {
MessageBox(0, "Couldn't access keyboard", 0, MB_ICONERROR); MessageBox(0, L"Couldn't access keyboard", 0, MB_ICONERROR);
Free(); Free();
return(hr); return(hr);
} }