adding missing newline at end of file

[wxWidgets.git] / src / osx / window_osx.cpp

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 63ea791e8c69c6ee0bd2b162e9c3a352f421212c..5e8dc2476379a14ef8896995fd1da4d3913c471b 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -1482,7 +1482,7 @@ void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(right
     if ( IsTopLevel() )
         return ;
 
-    bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ;
+    bool hasFocus = m_peer->NeedsFocusRect() && HasFocus();
 
     // back to the surrounding frame rectangle
     int tx,ty,tw,th;
@@ -2496,9 +2496,9 @@ bool wxWindowMac::IsShownOnScreen() const
 
 bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
 {
-    bool handled = HandleWindowEvent( event ) ;
-    if ( handled && event.GetSkipped() )
-        handled = false ;
+    bool handled = false;
+    
+    // moved the ordinary key event sending AFTER the accel evaluation
 
 #if wxUSE_ACCEL
     if ( !handled && event.GetEventType() == wxEVT_KEY_DOWN)
@@ -2531,6 +2531,13 @@ bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
         }
     }
 #endif // wxUSE_ACCEL
+    
+    if ( !handled )
+    {
+        handled = HandleWindowEvent( event ) ;
+        if ( handled && event.GetSkipped() )
+            handled = false ;
+    }
 
     return handled ;
 }