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 0af7822ddeb58a86170def5d22ce394c92abeee7..d79e546eb825427c2a8bb5a81d5f843cb896d536 100644 (file)
--- 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 keyCode ;
     UInt32 modifiers ;
     Point point ;

-    UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;

 
     EventRef rawEvent ;
 
 
     EventRef rawEvent ;
 


@@ -123,8 +122,6 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
     GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL,
         sizeof( Point ), NULL, &point );
 
     GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL,
         sizeof( Point ), NULL, &point );
 

-    UInt32 message = (keyCode << 8) + charCode;
-

     switch ( GetEventKind( event ) )
     {
         case kEventTextInputUnicodeForKeyEvent :
     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
             }
             /*
             // 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 ) )
             {
             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 0af7822ddeb58a86170def5d22ce394c92abeee7..d79e546eb825427c2a8bb5a81d5f843cb896d536 100644 (file)
--- 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 keyCode ;
     UInt32 modifiers ;
     Point point ;

-    UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;

 
     EventRef rawEvent ;
 
 
     EventRef rawEvent ;
 


@@ -123,8 +122,6 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
     GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL,
         sizeof( Point ), NULL, &point );
 
     GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL,
         sizeof( Point ), NULL, &point );
 

-    UInt32 message = (keyCode << 8) + charCode;
-

     switch ( GetEventKind( event ) )
     {
         case kEventTextInputUnicodeForKeyEvent :
     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
             }
             /*
             // 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 ) )
             {
             if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
                 focus , message , modifiers , when , point.h , point.v ) )
             {