correcting alpha and removing window shadow for overlay

[wxWidgets.git] / src / osx / cocoa / window.mm

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 3decd9fc8070cf9f86f5422d7054068cb1dd5474..8e579e45d0e6a1ef4f66dd7f5fefdf4ce00fbf9b 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -689,7 +689,7 @@ void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event)
     impl->mouseEvent(event, self, _cmd);
 }
 
     impl->mouseEvent(event, self, _cmd);
 }
 

-BOOL wxOSX_acceptsFirstMouse(NSView* self, SEL _cmd, NSEvent *event)
+BOOL wxOSX_acceptsFirstMouse(NSView* WXUNUSED(self), SEL WXUNUSED(_cmd), NSEvent *WXUNUSED(event))

 {
     // This is needed to support click through, otherwise the first click on a window
     // will not do anything unless it is the active window already.
 {
     // This is needed to support click through, otherwise the first click on a window
     // will not do anything unless it is the active window already.


@@ -1333,6 +1333,7 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible )
 
 - (void)animationDidEnd:(NSAnimation*)animation
 {
 
 - (void)animationDidEnd:(NSAnimation*)animation
 {

+    wxUnusedVar(animation);

     m_isDone = true;
 }
 
     m_isDone = true;
 }
 


@@ -1949,10 +1950,20 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
     {
         if ( !result )
         {
     {
         if ( !result )
         {

-            if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
-                [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]];
+            if ( wxevent.GetKeyCode() < WXK_SPACE || wxevent.GetKeyCode() == WXK_DELETE || wxevent.GetKeyCode() >= WXK_START )
+            {
+                // eventually we could setup a doCommandBySelector catcher and retransform this into the wx key chars
+                wxKeyEvent wxevent2(wxevent) ;
+                wxevent2.SetEventType(wxEVT_CHAR);
+                GetWXPeer()->OSXHandleKeyEvent(wxevent2);
+            }

             else
             else

-                [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
+            {
+                if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
+                    [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]];
+                else
+                    [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
+            }

             result = true;
         }
     }
             result = true;
         }
     }