X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04bf2fb51514e3ec8631a1d8ea1f610fca851005..8e13c1ec4e6e8d2c5852df39c6be5db4fd279227:/src/mac/carbon/app.cpp

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 3e1b8065fc..b128991ff0 100644
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1254,7 +1254,6 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr )
 #endif // wxUSE_THREADS
 }
 
-long wxMacTranslateKey(unsigned char key, unsigned char code) ;
 long wxMacTranslateKey(unsigned char key, unsigned char code)
 {
     long retval = key ;
@@ -1447,11 +1446,17 @@ wxMouseState wxGetMouseState()
     ms.SetX(pt.x);
     ms.SetY(pt.y);
 
+#if TARGET_API_MAC_OSX
     UInt32 buttons = GetCurrentButtonState();
     ms.SetLeftDown( (buttons & 0x01) != 0 );
     ms.SetMiddleDown( (buttons & 0x04) != 0 );
     ms.SetRightDown( (buttons & 0x02) != 0 );
-    
+#else
+    ms.SetLeftDown( Button() );
+    ms.SetMiddleDown( 0 );
+    ms.SetRightDown( 0 );
+#endif
+
     UInt32 modifiers = GetCurrentKeyModifiers();
     ms.SetControlDown(modifiers & controlKey);
     ms.SetShiftDown(modifiers & shiftKey);
@@ -1665,8 +1670,6 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess
     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;