changed key handling to new carbon-savvy implementation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 3af794db3546dcce20df4798947a4fbaaf65d8a7..f69d2f0e9e3e325a4282f080b901cdff1e026d4e 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -353,7 +353,7 @@ static pascal ControlPartCode TPPaneKeyDownProc(ControlHandle theControl,
             memset( &ev , 0 , sizeof( ev ) ) ;
             ev.what = keyDown ;
             ev.modifiers = modifiers ;
             memset( &ev , 0 , sizeof( ev ) ) ;
             ev.what = keyDown ;
             ev.modifiers = modifiers ;

-            ev.message = (( keyCode & keyCodeMask ) << 8 ) + ( charCode & charCodeMask ) ;
+            ev.message = (( keyCode << 8 ) & keyCodeMask ) + ( charCode & charCodeMask ) ;

             TXNKeyDown( (**tpvars).fTXNRec, &ev);
         }
     }
             TXNKeyDown( (**tpvars).fTXNRec, &ev);
         }
     }


@@ -518,7 +518,7 @@ OSStatus mUPOpenControl(ControlHandle theControl, bool multiline)
          ( multiline ? kTXNWantVScrollBarMask : 0 ) |
            kTXNDontDrawCaretWhenInactiveMask |
            kTXNDontDrawSelectionWhenInactiveMask |
          ( multiline ? kTXNWantVScrollBarMask : 0 ) |
            kTXNDontDrawCaretWhenInactiveMask |
            kTXNDontDrawSelectionWhenInactiveMask |

-               kTXNAlwaysWrapAtViewEdgeMask,
+               kTXNAlwaysWrapAtViewEdgeMask ,

         kTXNTextEditStyleFrameType,
         kTXNTextensionFile,
         kTXNSystemDefaultEncoding, 
         kTXNTextEditStyleFrameType,
         kTXNTextensionFile,
         kTXNSystemDefaultEncoding, 


@@ -1331,22 +1331,20 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
             break;
     }
     
             break;
     }
     

-    EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent();
-    short keychar = short(ev->message & charCodeMask);

     if (!eat_key)
     {
     if (!eat_key)
     {

-        short keycode = short(ev->message & keyCodeMask) >> 8 ;
-        ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers );
+        // default handling
+        event.Skip() ;

     }
     }

-    if ( keychar >= 0x20 ||
-         event.KeyCode() == WXK_RETURN ||
-         event.KeyCode() == WXK_DELETE || 
-         event.KeyCode() == WXK_BACK)
+    if ( key >= 0x20 ||
+         key == WXK_RETURN ||
+         key == WXK_DELETE || 
+         key == WXK_BACK)

     {
         wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         event1.SetString( GetValue() ) ;
         event1.SetEventObject( this );
     {
         wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         event1.SetString( GetValue() ) ;
         event1.SetEventObject( this );

-        GetEventHandler()->ProcessEvent(event1);
+        wxPostEvent(GetEventHandler(),event1);

     }
 }
 
     }
 }
 

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index 3af794db3546dcce20df4798947a4fbaaf65d8a7..f69d2f0e9e3e325a4282f080b901cdff1e026d4e 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -353,7 +353,7 @@ static pascal ControlPartCode TPPaneKeyDownProc(ControlHandle theControl,
             memset( &ev , 0 , sizeof( ev ) ) ;
             ev.what = keyDown ;
             ev.modifiers = modifiers ;
             memset( &ev , 0 , sizeof( ev ) ) ;
             ev.what = keyDown ;
             ev.modifiers = modifiers ;

-            ev.message = (( keyCode & keyCodeMask ) << 8 ) + ( charCode & charCodeMask ) ;
+            ev.message = (( keyCode << 8 ) & keyCodeMask ) + ( charCode & charCodeMask ) ;

             TXNKeyDown( (**tpvars).fTXNRec, &ev);
         }
     }
             TXNKeyDown( (**tpvars).fTXNRec, &ev);
         }
     }


@@ -518,7 +518,7 @@ OSStatus mUPOpenControl(ControlHandle theControl, bool multiline)
          ( multiline ? kTXNWantVScrollBarMask : 0 ) |
            kTXNDontDrawCaretWhenInactiveMask |
            kTXNDontDrawSelectionWhenInactiveMask |
          ( multiline ? kTXNWantVScrollBarMask : 0 ) |
            kTXNDontDrawCaretWhenInactiveMask |
            kTXNDontDrawSelectionWhenInactiveMask |

-               kTXNAlwaysWrapAtViewEdgeMask,
+               kTXNAlwaysWrapAtViewEdgeMask ,

         kTXNTextEditStyleFrameType,
         kTXNTextensionFile,
         kTXNSystemDefaultEncoding, 
         kTXNTextEditStyleFrameType,
         kTXNTextensionFile,
         kTXNSystemDefaultEncoding, 


@@ -1331,22 +1331,20 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
             break;
     }
     
             break;
     }
     

-    EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent();
-    short keychar = short(ev->message & charCodeMask);

     if (!eat_key)
     {
     if (!eat_key)
     {

-        short keycode = short(ev->message & keyCodeMask) >> 8 ;
-        ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers );
+        // default handling
+        event.Skip() ;

     }
     }

-    if ( keychar >= 0x20 ||
-         event.KeyCode() == WXK_RETURN ||
-         event.KeyCode() == WXK_DELETE || 
-         event.KeyCode() == WXK_BACK)
+    if ( key >= 0x20 ||
+         key == WXK_RETURN ||
+         key == WXK_DELETE || 
+         key == WXK_BACK)

     {
         wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         event1.SetString( GetValue() ) ;
         event1.SetEventObject( this );
     {
         wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         event1.SetString( GetValue() ) ;
         event1.SetEventObject( this );

-        GetEventHandler()->ProcessEvent(event1);
+        wxPostEvent(GetEventHandler(),event1);

     }
 }
 
     }
 }