remove use of towupper for OS X

This commit is contained in:
Chris Danford
2006-06-11 01:28:52 +00:00
parent fa56d41c17
commit b79cb92052
3 changed files with 11 additions and 3 deletions
+8 -1
View File
@@ -514,9 +514,16 @@ void ScreenNameEntryTraditional::Input( const InputEventPlus &input )
{ {
int c; int c;
if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_BACK) ) if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_BACK) )
{
c = CHAR_BACK; c = CHAR_BACK;
}
else else
c = towupper( INPUTMAN->DeviceButtonToChar(input.DeviceI.button,true) ); {
wchar_t ch = INPUTMAN->DeviceButtonToChar(input.DeviceI.button,true);
MakeUpper( &ch, 1 );
c = ch;
}
if( c ) if( c )
{ {
PlayerNumber pn = GAMESTATE->m_MasterPlayerNumber; PlayerNumber pn = GAMESTATE->m_MasterPlayerNumber;
+2 -1
View File
@@ -129,7 +129,8 @@ void ScreenNetSelectMusic::Input( const InputEventPlus &input )
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RCTRL)) || INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RCTRL)) ||
(!NSMAN->useSMserver); //If we are disconnected, assume no chatting (!NSMAN->useSMserver); //If we are disconnected, assume no chatting
wchar_t c = (wchar_t) towupper( INPUTMAN->DeviceButtonToChar(input.DeviceI.button,true) ); wchar_t c = INPUTMAN->DeviceButtonToChar(input.DeviceI.button,true);
MakeUpper( &c, 1 );
if ( bHoldingCtrl && ( c >= 'A' ) && ( c <= 'Z' ) ) if ( bHoldingCtrl && ( c >= 'A' ) && ( c <= 'Z' ) )
{ {
@@ -68,7 +68,7 @@ wchar_t InputHandler::DeviceButtonToChar( DeviceButton button, bool bUseCurrentK
if( bHoldingShift && !bHoldingCtrl ) if( bHoldingShift && !bHoldingCtrl )
{ {
c = towupper(c); MakeUpper( &c, 1 );
switch( c ) switch( c )
{ {