fix memory leak in wxScreenDC, fixes #13249

[wxWidgets.git] / src / cocoa / NSWindow.mm

diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm
index c2df1cd5e6c26408ac33de7c4a5223814855dd95..fa11d3ad5dfd0427eb613e52456047011fb91b58 100644 (file)
--- a/src/cocoa/NSWindow.mm
+++ b/src/cocoa/NSWindow.mm
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/NSWindow.mm
+// Name:        src/cocoa/NSWindow.mm

 // Purpose:     wxCocoaNSWindow
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
 // Purpose:     wxCocoaNSWindow
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -23,12 +23,13 @@
     #include "wx/menuitem.h"
 #endif // WX_PRECOMP
 
     #include "wx/menuitem.h"
 #endif // WX_PRECOMP
 

-#include "wx/cocoa/ObjcPose.h"

 #include "wx/cocoa/NSWindow.h"
 
 #include "wx/cocoa/NSWindow.h"
 

-#import <AppKit/NSWindow.h>
+#include "wx/cocoa/objc/objc_uniquifying.h"
+

 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>

+#include "wx/cocoa/objc/NSWindow.h"

 
 // ============================================================================
 // @class wxNSWindowDelegate
 
 // ============================================================================
 // @class wxNSWindowDelegate


@@ -54,6 +55,7 @@
 - (void)wxMenuItemAction: (NSMenuItem *)menuItem;
 - (BOOL)validateMenuItem: (NSMenuItem *)menuItem;
 @end //interface wxNSWindowDelegate
 - (void)wxMenuItemAction: (NSMenuItem *)menuItem;
 - (BOOL)validateMenuItem: (NSMenuItem *)menuItem;
 @end //interface wxNSWindowDelegate

+WX_DECLARE_GET_OBJC_CLASS(wxNSWindowDelegate,NSObject)

 
 @implementation wxNSWindowDelegate : NSObject
 
 
 @implementation wxNSWindowDelegate : NSObject
 


@@ -142,6 +144,7 @@
 }
 
 @end //implementation wxNSWindowDelegate
 }
 
 @end //implementation wxNSWindowDelegate

+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSWindowDelegate,NSObject)

 
 // ============================================================================
 // class wxCocoaNSWindow
 
 // ============================================================================
 // class wxCocoaNSWindow


@@ -152,7 +155,7 @@ WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
 wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw)
 :   m_wxTopLevelWindowCocoa(tlw)
 {
 wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw)
 :   m_wxTopLevelWindowCocoa(tlw)
 {

-    m_cocoaDelegate = [[wxNSWindowDelegate alloc] init];
+    m_cocoaDelegate = [[WX_GET_OBJC_CLASS(wxNSWindowDelegate) alloc] init];

     [m_cocoaDelegate setWxCocoaInterface: this];
 }
 
     [m_cocoaDelegate setWxCocoaInterface: this];
 }
 


@@ -187,17 +190,44 @@ wxMenuBar* wxCocoaNSWindow::GetAppMenuBar(wxCocoaNSWindow *win)
 }
 
 // ============================================================================
 }
 
 // ============================================================================

-// @class wxPoserNSWindow
+// @class WXNSWindow

 // ============================================================================
 // ============================================================================

-@interface wxPoserNSWindow : NSWindow
+@implementation WXNSWindow : NSWindow
+
+- (BOOL)canBecomeKeyWindow

 {
 {

+    bool canBecome = false;
+    wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(self);
+    if(!tlw || !tlw->Cocoa_canBecomeKeyWindow(canBecome))
+        canBecome = [super canBecomeKeyWindow];
+    return canBecome;

 }
 
 }
 

-- (BOOL)canBecomeMainWindow;
-@end // wxPoserNSwindow
+- (BOOL)canBecomeMainWindow
+{
+    bool canBecome = false;
+    wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(self);
+    if(!tlw || !tlw->Cocoa_canBecomeMainWindow(canBecome))
+        canBecome = [super canBecomeMainWindow];
+    return canBecome;
+}
+
+@end // implementation WXNSWindow
+WX_IMPLEMENT_GET_OBJC_CLASS(WXNSWindow,NSWindow)

 
 

-WX_IMPLEMENT_POSER(wxPoserNSWindow);
-@implementation wxPoserNSWindow : NSWindow
+// ============================================================================
+// @class WXNSPanel
+// ============================================================================
+@implementation WXNSPanel : NSPanel
+
+- (BOOL)canBecomeKeyWindow
+{
+    bool canBecome = false;
+    wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(self);
+    if(!tlw || !tlw->Cocoa_canBecomeKeyWindow(canBecome))
+        canBecome = [super canBecomeKeyWindow];
+    return canBecome;
+}

 
 - (BOOL)canBecomeMainWindow
 {
 
 - (BOOL)canBecomeMainWindow
 {


@@ -208,5 +238,5 @@ WX_IMPLEMENT_POSER(wxPoserNSWindow);
     return canBecome;
 }
 
     return canBecome;
 }
 

-@end // implementation wxPoserNSWindow
-
+@end // implementation WXNSPanel
+WX_IMPLEMENT_GET_OBJC_CLASS(WXNSPanel,NSPanel)