From: David Surovell Date: Tue, 13 Dec 2005 23:15:42 +0000 (+0000) Subject: fixed obscure compilation problem at line 139 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/98e04c1376e251d11804371233a52cccbcf34cc0 fixed obscure compilation problem at line 139 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index bdcba53822..2407ac63e4 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -133,30 +133,32 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even switch ( GetEventKind( event ) ) { case kEventTextInputUnicodeForKeyEvent : - // this is only called when no default handler has jumped in, e.g. a wxControl on a floater window does not - // get its own kEventTextInputUnicodeForKeyEvent, so we reroute the event back to the control - wxControl* control = wxDynamicCast( focus , wxControl ) ; - if ( control ) { - ControlRef macControl = (ControlRef) control->GetHandle() ; - if ( macControl ) + // this is only called when no default handler has jumped in, e.g. a wxControl on a floater window does not + // get its own kEventTextInputUnicodeForKeyEvent, so we reroute the event back to the control + wxControl* control = wxDynamicCast( focus , wxControl ) ; + if ( control ) { - ::HandleControlKey( macControl , keyCode , charCode , modifiers ) ; - result = noErr ; + ControlRef macControl = (ControlRef) control->GetHandle() ; + if ( macControl ) + { + ::HandleControlKey( macControl , keyCode , charCode , modifiers ) ; + result = noErr ; + } } - } #if 0 - // this may lead to double events sent to a window in case all handlers have skipped the key down event - UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; - UInt32 message = (keyCode << 8) + charCode; + // this may lead to double events sent to a window in case all handlers have skipped the key down event + UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; + UInt32 message = (keyCode << 8) + charCode; - if ( (focus != NULL) && - wxTheApp->MacSendKeyDownEvent( focus , message , modifiers , when , point.h , point.v ) ) - { - result = noErr ; - } + if ( (focus != NULL) && + wxTheApp->MacSendKeyDownEvent( focus , message , modifiers , when , point.h , point.v ) ) + { + result = noErr ; + } #endif + } break ; default: