From: Vadim Zeitlin Date: Wed, 4 Jun 2003 00:49:18 +0000 (+0000) Subject: compilation warnings fixed X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/77a4354e85772a4a504aa74c75909184a790175a?ds=inline compilation warnings fixed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index 0af7822dde..d79e546eb8 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -111,7 +111,6 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even UInt32 keyCode ; UInt32 modifiers ; Point point ; - UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; EventRef rawEvent ; @@ -123,8 +122,6 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL, sizeof( Point ), NULL, &point ); - UInt32 message = (keyCode << 8) + charCode; - switch ( GetEventKind( event ) ) { case kEventTextInputUnicodeForKeyEvent : @@ -142,6 +139,9 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even } /* // 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 ) ) { diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp index 0af7822dde..d79e546eb8 100644 --- a/src/mac/toplevel.cpp +++ b/src/mac/toplevel.cpp @@ -111,7 +111,6 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even UInt32 keyCode ; UInt32 modifiers ; Point point ; - UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; EventRef rawEvent ; @@ -123,8 +122,6 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL, sizeof( Point ), NULL, &point ); - UInt32 message = (keyCode << 8) + charCode; - switch ( GetEventKind( event ) ) { case kEventTextInputUnicodeForKeyEvent : @@ -142,6 +139,9 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even } /* // 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 ) ) {