Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wchar_t with int comparisons for Apple gcc.

Browse Source 
Apple gcc refuses to compile comparisons between wchar_t and int for some
reason, so add explicit casts to int to make it work there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-10-03 22:24:03 +00:00
parent c4cb46c1eb
commit 97e07b1cd9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/grideditors.cpp
View File

@@ -355,7 +355,7 @@ bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
return false; return false;
#if wxUSE_UNICODE #if wxUSE_UNICODE
if ( event.GetUnicodeKey() == WXK_NONE ) if ( static_cast<int>(event.GetUnicodeKey()) == WXK_NONE )
return false; return false;
#else #else
if ( event.GetKeyCode() > WXK_START ) if ( event.GetKeyCode() > WXK_START )
@@ -547,7 +547,7 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
// a valid character, so not a whole lot of testing needs to be done. // a valid character, so not a whole lot of testing needs to be done.
wxTextCtrl* tc = Text(); wxTextCtrl* tc = Text();
wxChar ch; int ch;
bool isPrintable; bool isPrintable;
@@ -558,7 +558,7 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
else else
#endif // wxUSE_UNICODE #endif // wxUSE_UNICODE
{ {
ch = (wxChar)event.GetKeyCode(); ch = event.GetKeyCode();
isPrintable = ch >= WXK_SPACE && ch < WXK_START; isPrintable = ch >= WXK_SPACE && ch < WXK_START;
} }
@@ -579,7 +579,7 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
default: default:
if ( isPrintable ) if ( isPrintable )
tc->WriteText(ch); tc->WriteText(static_cast<wxChar>(ch));
break; break;
} }
} }