Optimize alpha handling in wxImage::Rotate90() too.

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

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index 4b73f1e26afade85dc9f9a3ade6e3f9f1b3e6bb1..d7f79609fb39cc59eb3c197c4954775f1bb41fae 100644 (file)
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -4,7 +4,7 @@
 // Author:      DavidStefan Csomor
 // Modified by:
 // Created:     2008-06-20
 // Author:      DavidStefan Csomor
 // Modified by:
 // Created:     2008-06-20

-// RCS-ID:      $Id: nonownedwnd.mm 48805 2007-09-19 14:52:25Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -308,36 +308,43 @@ extern int wxOSXGetIdFromSelector(SEL action );
 
 - (void)undo:(id)sender 
 {
 
 - (void)undo:(id)sender 
 {

+    wxUnusedVar(sender);

     [self triggerMenu:_cmd];
 }
 
 - (void)redo:(id)sender 
 {
     [self triggerMenu:_cmd];
 }
 
 - (void)redo:(id)sender 
 {

+    wxUnusedVar(sender);

     [self triggerMenu:_cmd];
 }
 
 - (void)cut:(id)sender 
 {
     [self triggerMenu:_cmd];
 }
 
 - (void)cut:(id)sender 
 {

+    wxUnusedVar(sender);

     [self triggerMenu:_cmd];
 }
 
 - (void)copy:(id)sender
 {
     [self triggerMenu:_cmd];
 }
 
 - (void)copy:(id)sender
 {

+    wxUnusedVar(sender);

     [self triggerMenu:_cmd];
 }
 
 - (void)paste:(id)sender
 {
     [self triggerMenu:_cmd];
 }
 
 - (void)paste:(id)sender
 {

+    wxUnusedVar(sender);

     [self triggerMenu:_cmd];
 }
 
 - (void)delete:(id)sender 
 {
     [self triggerMenu:_cmd];
 }
 
 - (void)delete:(id)sender 
 {

+    wxUnusedVar(sender);

     [self triggerMenu:_cmd];
 }
 
 - (void)selectAll:(id)sender 
 {
     [self triggerMenu:_cmd];
 }
 
 - (void)selectAll:(id)sender 
 {

+    wxUnusedVar(sender);

     [self triggerMenu:_cmd];
 }
 
     [self triggerMenu:_cmd];
 }
 


@@ -632,6 +639,7 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
     }
 
     [m_macWindow setLevel:level];
     }
 
     [m_macWindow setLevel:level];

+    m_macWindowLevel = level;

 
     [m_macWindow setDelegate:controller];
 
 
     [m_macWindow setDelegate:controller];
 


@@ -742,6 +750,7 @@ void wxNonOwnedWindowCocoaImpl::SetWindowStyleFlag( long style )
             level = kCGFloatingWindowLevel;
         
         [m_macWindow setLevel: level];
             level = kCGFloatingWindowLevel;
         
         [m_macWindow setLevel: level];

+        m_macWindowLevel = level;

     }
 }
 
     }
 }
 


@@ -950,6 +959,16 @@ bool wxNonOwnedWindowCocoaImpl::IsModified() const
     return [m_macWindow isDocumentEdited];
 }
 
     return [m_macWindow isDocumentEdited];
 }
 

+void wxNonOwnedWindowCocoaImpl::RestoreWindowLevel()
+{
+    if ( [m_macWindow level] != m_macWindowLevel )
+        [m_macWindow setLevel:m_macWindowLevel];
+}
+
+//
+//
+//
+

 wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, WXWindow nativeWindow)
 {
     wxNonOwnedWindowCocoaImpl* now = new wxNonOwnedWindowCocoaImpl( wxpeer );
 wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, WXWindow nativeWindow)
 {
     wxNonOwnedWindowCocoaImpl* now = new wxNonOwnedWindowCocoaImpl( wxpeer );


@@ -964,3 +983,4 @@ wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWind
     now->Create( parent, pos, size, style , extraStyle, name );
     return now;
 }
     now->Create( parent, pos, size, style , extraStyle, name );
     return now;
 }

+