fix to last custom draw fix: only leave space for the image in the first column

[wxWidgets.git] / src / mac / carbon / app.cpp

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index e079f74d5ce57fb881a1e202ddb3e7ad0c4ede11..3e1b8065fc34c7f47bc405a2adee8fb981154cba 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1522,7 +1522,6 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
     wxKeyEvent event(wxEVT_CHAR) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
     long keyval = event.m_keyCode ;
     wxKeyEvent event(wxEVT_CHAR) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
     long keyval = event.m_keyCode ;

-    short realkeyval = short(keymessage & charCodeMask) ;

 
     bool handled = false ;
 
 
     bool handled = false ;
 


@@ -1531,9 +1530,6 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
     if (tlw)
     {
         event.SetEventType( wxEVT_CHAR_HOOK );
     if (tlw)
     {
         event.SetEventType( wxEVT_CHAR_HOOK );

-        // send original character, not the uppercase version
-        event.m_keyCode = realkeyval ;
-        

         handled = tlw->GetEventHandler()->ProcessEvent( event );
         if ( handled && event.GetSkipped() )
             handled = false ;
         handled = tlw->GetEventHandler()->ProcessEvent( event );
         if ( handled && event.GetSkipped() )
             handled = false ;


@@ -1669,6 +1665,8 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess
     event.m_keyCode = keyval ;
 #if wxUSE_UNICODE
     event.m_uniChar = uniChar ;
     event.m_keyCode = keyval ;
 #if wxUSE_UNICODE
     event.m_uniChar = uniChar ;

+    if ( event.GetEventType() == wxEVT_CHAR )
+        event.m_keyCode = uniChar ;

 #endif
 
     event.m_rawCode = keymessage;
 #endif
 
     event.m_rawCode = keymessage;