10 files changed, 7 insertions, 31 deletions
diff --git a/src/SFML/Window/Cocoa/AppController.h b/src/SFML/Window/Cocoa/AppController.h
index 365afc9..365afc9 100644..100755
--- a/src/SFML/Window/Cocoa/AppController.h
+++ b/src/SFML/Window/Cocoa/AppController.h
diff --git a/src/SFML/Window/Cocoa/AppController.mm b/src/SFML/Window/Cocoa/AppController.mm
index a6b7310..a6b7310 100644..100755
--- a/src/SFML/Window/Cocoa/AppController.mm
+++ b/src/SFML/Window/Cocoa/AppController.mm
diff --git a/src/SFML/Window/Cocoa/Joystick.cpp b/src/SFML/Window/Cocoa/Joystick.cpp
index 6b456a1..6b456a1 100644..100755
--- a/src/SFML/Window/Cocoa/Joystick.cpp
+++ b/src/SFML/Window/Cocoa/Joystick.cpp
diff --git a/src/SFML/Window/Cocoa/Joystick.hpp b/src/SFML/Window/Cocoa/Joystick.hpp
index 7a78c93..7a78c93 100644..100755
--- a/src/SFML/Window/Cocoa/Joystick.hpp
+++ b/src/SFML/Window/Cocoa/Joystick.hpp
diff --git a/src/SFML/Window/Cocoa/VideoModeSupport.cpp b/src/SFML/Window/Cocoa/VideoModeSupport.cpp
index 75f5d8e..75f5d8e 100644..100755
--- a/src/SFML/Window/Cocoa/VideoModeSupport.cpp
+++ b/src/SFML/Window/Cocoa/VideoModeSupport.cpp
diff --git a/src/SFML/Window/Cocoa/VideoModeSupport.hpp b/src/SFML/Window/Cocoa/VideoModeSupport.hpp
index 2b64685..2b64685 100644..100755
--- a/src/SFML/Window/Cocoa/VideoModeSupport.hpp
+++ b/src/SFML/Window/Cocoa/VideoModeSupport.hpp
diff --git a/src/SFML/Window/Cocoa/WindowController.h b/src/SFML/Window/Cocoa/WindowController.h
index 4c40825..4c40825 100644..100755
--- a/src/SFML/Window/Cocoa/WindowController.h
+++ b/src/SFML/Window/Cocoa/WindowController.h
diff --git a/src/SFML/Window/Cocoa/WindowController.mm b/src/SFML/Window/Cocoa/WindowController.mm
index 286a3ed..286a3ed 100644..100755
--- a/src/SFML/Window/Cocoa/WindowController.mm
+++ b/src/SFML/Window/Cocoa/WindowController.mm
diff --git a/src/SFML/Window/Cocoa/WindowImplCocoa.hpp b/src/SFML/Window/Cocoa/WindowImplCocoa.hpp
index 1b2e96b..1b2e96b 100644..100755
--- a/src/SFML/Window/Cocoa/WindowImplCocoa.hpp
+++ b/src/SFML/Window/Cocoa/WindowImplCocoa.hpp
diff --git a/src/SFML/Window/Cocoa/WindowImplCocoa.mm b/src/SFML/Window/Cocoa/WindowImplCocoa.mm
index 460c765..7950ab2 100644..100755
--- a/src/SFML/Window/Cocoa/WindowImplCocoa.mm
+++ b/src/SFML/Window/Cocoa/WindowImplCocoa.mm
@@ -391,10 +391,9 @@ int WindowImplCocoa::HandleKeyDown(void *eventRef)
 	
 	Event sfEvent;
 	unichar chr = 0, rawchr = 0;
-	unsigned long length = [[event characters] length];
 	unsigned mods = [event modifierFlags];
 	
-	if (length) {
+	if ([[event characters] length]) {
 		chr = [[event characters] characterAtIndex:0];
 		
 		// Note : I got a crash (out of bounds exception) while typing so now I test...
@@ -417,29 +416,10 @@ int WindowImplCocoa::HandleKeyDown(void *eventRef)
 #if 1
 	// Is it also a text event ?
 	if (IsTextEvent(event)) {
-		// tampon d'accueil des caracteres UTF-16 recuperes a partir de l'evenement clavier
-		unichar *utf16Characters = new unichar[length];
-		
-		// recuperation des caracteres
-		[[event characters] getCharacters:utf16Characters];
-		
-		// tampon d'accueil des caracteres convertis en UTF-32
-		Uint32 utf32Characters[2];
-		
-		// conversion des caracteres
-		const Uint32 *addr = Unicode::UTF16ToUTF32(utf16Characters,
-												   utf16Characters + length,
-												   utf32Characters);
-		
-		// si il y a eu des caracteres convertis ?
-		if (addr > utf32Characters) {
-			sfEvent.Type = Event::TextEntered;
-			sfEvent.Text.Unicode = utf32Characters[0];
-			
-			SendEvent(sfEvent);
-		}
+		sfEvent.Type = Event::TextEntered;
+		sfEvent.Text.Unicode = chr;
 		
-		delete[] utf16Characters;
+		SendEvent(sfEvent);
 	}
 #else
 	// Is it also a text event ?
@@ -473,7 +453,7 @@ int WindowImplCocoa::HandleKeyDown(void *eventRef)
 	sfEvent.Type = Event::KeyPressed;
 	
 	// Get the keys
-	if (Key::Code(0) == (sfEvent.Key.Code = KeyForUnicode(rawchr))) {
+	if (Key::Code(0) == (sfEvent.Key.Code = KeyForUnicode(chr))) {
 		sfEvent.Key.Code = KeyForVirtualCode([event keyCode]);
 	}
 	
@@ -498,14 +478,10 @@ int WindowImplCocoa::HandleKeyUp(void *eventRef)
 	
 	Event sfEvent;
 	unsigned mods = [event modifierFlags];
-	unichar chr = 0, rawchr = 0;
+	unichar chr = 0;
 	
 	if ([[event characters] length]) {
 		chr = [[event characters] characterAtIndex:0];
-		
-		if ([[event charactersIgnoringModifiers] length])
-			rawchr = [[event charactersIgnoringModifiers] characterAtIndex:0];
-		
 	}
 	
 	if (mods & NSCommandKeyMask) {
@@ -515,7 +491,7 @@ int WindowImplCocoa::HandleKeyUp(void *eventRef)
 	sfEvent.Type = Event::KeyReleased;
 	
 	// Get the code
-	if (Key::Code(0) == (sfEvent.Key.Code = KeyForUnicode(rawchr))) {
+	if (Key::Code(0) == (sfEvent.Key.Code = KeyForUnicode(chr))) {
 		sfEvent.Key.Code = KeyForVirtualCode([event keyCode]);
 	}