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

Fix harmless warnings in hot key code in wxOSX.

Browse Source 
Don't compare signed and unsigned variables if possible (insert a cast in one
place where it wasn't).

Put WXUNUSED() around the unused parameters.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-10-02 11:28:36 +00:00
parent fb5f677b6a
commit 97d5c7a3d0
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/osx/window_osx.cpp
View File

@@ -2604,15 +2604,18 @@ bool wxWindowMac::IsShownOnScreen() const
#if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON #if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON
OSStatus wxHotKeyHandler(EventHandlerCallRef nextHandler,EventRef event, void *userData) OSStatus
wxHotKeyHandler(EventHandlerCallRef WXUNUSED(nextHandler),
EventRef event,
void* WXUNUSED(userData))
{ {
EventHotKeyID hotKeyId; EventHotKeyID hotKeyId;
GetEventParameter( event, kEventParamDirectObject, typeEventHotKeyID, NULL, sizeof(hotKeyId), NULL, &hotKeyId); GetEventParameter( event, kEventParamDirectObject, typeEventHotKeyID, NULL, sizeof(hotKeyId), NULL, &hotKeyId);
for ( int i = 0; i < s_hotkeys.size(); ++i ) for ( unsigned i = 0; i < s_hotkeys.size(); ++i )
{ {
if ( s_hotkeys[i].keyId == hotKeyId.id ) if ( s_hotkeys[i].keyId == static_cast<int>(hotKeyId.id) )
{ {
unsigned char charCode ; unsigned char charCode ;
UInt32 keyCode ; UInt32 keyCode ;
@@ -2641,7 +2644,7 @@ OSStatus wxHotKeyHandler(EventHandlerCallRef nextHandler,EventRef event, void *u
bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode) bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
{ {
for ( int i = 0; i < s_hotkeys.size(); ++i ) for ( unsigned i = 0; i < s_hotkeys.size(); ++i )
{ {
if ( s_hotkeys[i].keyId == hotkeyId ) if ( s_hotkeys[i].keyId == hotkeyId )
{ {
@@ -2700,7 +2703,7 @@ bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
bool wxWindowMac::UnregisterHotKey(int hotkeyId) bool wxWindowMac::UnregisterHotKey(int hotkeyId)
{ {
for ( int i = s_hotkeys.size()-1; i>=0; -- i ) for ( unsigned i = s_hotkeys.size()-1; i>=0; -- i )
{ {
if ( s_hotkeys[i].keyId == hotkeyId ) if ( s_hotkeys[i].keyId == hotkeyId )
{ {