From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 24 Aug 2002 07:40:45 +0000 (+0000)
Subject: wxToupper added again
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b96a8bdb6038061d99dd45642450e3c664ce7a44

wxToupper added again


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

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index b5855a013b..ecb1667576 100644
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -1844,8 +1844,9 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
 	long realkeyval = keyval ;
 	if ( keyval == keychar )
 	{
-		// we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY
+		// we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY (make upper first)
 		realkeyval = short(keymessage & charCodeMask) ;
+		keyval = wxToupper( keyval ) ;
 	}
 	
     wxKeyEvent event(wxEVT_KEY_DOWN);
@@ -1986,6 +1987,10 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
     }
     long keyval = wxMacTranslateKey(keychar, keycode) ;
 
+	if ( keyval == keychar )
+	{
+		keyval = wxToupper( keyval ) ;	
+	}
     bool handled = false ;
 
     wxKeyEvent event(wxEVT_KEY_UP);
diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index b5855a013b..ecb1667576 100644
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1844,8 +1844,9 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
 	long realkeyval = keyval ;
 	if ( keyval == keychar )
 	{
-		// we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY
+		// we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY (make upper first)
 		realkeyval = short(keymessage & charCodeMask) ;
+		keyval = wxToupper( keyval ) ;
 	}
 	
     wxKeyEvent event(wxEVT_KEY_DOWN);
@@ -1986,6 +1987,10 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
     }
     long keyval = wxMacTranslateKey(keychar, keycode) ;
 
+	if ( keyval == keychar )
+	{
+		keyval = wxToupper( keyval ) ;	
+	}
     bool handled = false ;
 
     wxKeyEvent event(wxEVT_KEY_UP);