Correctly align background brush when erasing owner drawn bitmaps in wxMSW.

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

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index 6adfba6560b37398ddc4b1ea5411c73b92845a33..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
-// RCS-ID:      $Id: nonownedwnd.mm 48805 2007-09-19 14:52:25Z SC $
+// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,6 +15,8 @@
     #include "wx/frame.h"
     #include "wx/app.h"
     #include "wx/dialog.h"
+    #include "wx/menuitem.h"
+    #include "wx/menu.h"
 #endif
 
 #include "wx/osx/private.h"
@@ -306,36 +308,43 @@ extern int wxOSXGetIdFromSelector(SEL action );
 
 - (void)undo:(id)sender 
 {
+    wxUnusedVar(sender);
     [self triggerMenu:_cmd];
 }
 
 - (void)redo:(id)sender 
 {
+    wxUnusedVar(sender);
     [self triggerMenu:_cmd];
 }
 
 - (void)cut:(id)sender 
 {
+    wxUnusedVar(sender);
     [self triggerMenu:_cmd];
 }
 
 - (void)copy:(id)sender
 {
+    wxUnusedVar(sender);
     [self triggerMenu:_cmd];
 }
 
 - (void)paste:(id)sender
 {
+    wxUnusedVar(sender);
     [self triggerMenu:_cmd];
 }
 
 - (void)delete:(id)sender 
 {
+    wxUnusedVar(sender);
     [self triggerMenu:_cmd];
 }
 
 - (void)selectAll:(id)sender 
 {
+    wxUnusedVar(sender);
     [self triggerMenu:_cmd];
 }
 
@@ -630,6 +639,7 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
     }
 
     [m_macWindow setLevel:level];
+    m_macWindowLevel = level;
 
     [m_macWindow setDelegate:controller];
 
@@ -740,6 +750,7 @@ void wxNonOwnedWindowCocoaImpl::SetWindowStyleFlag( long style )
             level = kCGFloatingWindowLevel;
         
         [m_macWindow setLevel: level];
+        m_macWindowLevel = level;
     }
 }
 
@@ -782,8 +793,6 @@ void wxNonOwnedWindowCocoaImpl::GetSize( int &width, int &height ) const
 
 void wxNonOwnedWindowCocoaImpl::GetContentArea( int& left, int &top, int &width, int &height ) const
 {
-    NSRect outer = NSMakeRect(100,100,100,100);
-    NSRect content = [NSWindow contentRectForFrameRect:outer styleMask:[m_macWindow styleMask] ];
     NSRect rect = [[m_macWindow contentView] frame];
     left = (int)rect.origin.x;
     top = (int)rect.origin.y;
@@ -950,6 +959,16 @@ bool wxNonOwnedWindowCocoaImpl::IsModified() const
     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 );
@@ -964,3 +983,4 @@ wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWind
     now->Create( parent, pos, size, style , extraStyle, name );
     return now;
 }
+