Commit patch [ 1559950 ] fix mem leaks in wx{Dir|File}Dialog

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

diff --git a/src/cocoa/mdi.mm b/src/cocoa/mdi.mm
index 1d069d58b089847865f53e2755d4bdc977e39bdf..ef279856ca14194571d921036a0957406db54b04 100644 (file)
--- a/src/cocoa/mdi.mm
+++ b/src/cocoa/mdi.mm
@@ -1,18 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxMDIParentFrame, wxMDIChildFrame, wxMDIClientWindow
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/09/08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Purpose:     wxMDIParentFrame, wxMDIChildFrame, wxMDIClientWindow
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/09/08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

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

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#if wxUSE_MDI
+
+#include "wx/mdi.h"
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"

-    #include "wx/mdi.h"

 #endif // WX_PRECOMP
 
 // #include "wx/cocoa/autorelease.h"
 #endif // WX_PRECOMP
 
 // #include "wx/cocoa/autorelease.h"


@@ -23,7 +27,7 @@
 // #import <AppKit/NSApplication.h>
 // #import <AppKit/NSView.h>
 
 // #import <AppKit/NSApplication.h>
 // #import <AppKit/NSView.h>
 

-#include <wx/listimpl.cpp>
+#include "wx/listimpl.cpp"

 WX_DEFINE_LIST(wxCocoaMDIChildFrameList);
 
 WX_DECLARE_HASH_MAP(int, wxMDIChildFrame*, wxIntegerHash, wxIntegerEqual, wxIntMDIChildFrameHashMap);
 WX_DEFINE_LIST(wxCocoaMDIChildFrameList);
 
 WX_DECLARE_HASH_MAP(int, wxMDIChildFrame*, wxIntegerHash, wxIntegerEqual, wxIntMDIChildFrameHashMap);


@@ -44,7 +48,7 @@ WX_DECLARE_HASH_MAP(int, wxMDIChildFrame*, wxIntegerHash, wxIntegerEqual, wxIntM
 @implementation wxMDIParentFrameObserver : NSObject
 - (id)init
 {
 @implementation wxMDIParentFrameObserver : NSObject
 - (id)init
 {

-    wxFAIL_MSG("[wxMDIParentFrameObserver -init] should never be called!");
+    wxFAIL_MSG(wxT("[wxMDIParentFrameObserver -init] should never be called!"));

     m_mdiParent = NULL;
     return self;
 }
     m_mdiParent = NULL;
     return self;
 }


@@ -158,7 +162,7 @@ wxMenuBar *wxMDIParentFrame::GetAppMenuBar(wxCocoaNSWindow *win)
 
 void wxMDIParentFrame::CocoaDelegate_windowDidBecomeKey(void)
 {
 
 void wxMDIParentFrame::CocoaDelegate_windowDidBecomeKey(void)
 {

-    wxLogDebug("wxMDIParentFrame=%p::CocoaDelegate_windowDidBecomeKey",this);
+    wxLogTrace(wxTRACE_COCOA,wxT("wxMDIParentFrame=%p::CocoaDelegate_windowDidBecomeKey"),this);

     if(sm_cocoaDeactivateWindow && sm_cocoaDeactivateWindow==m_currentChild)
     {
         sm_cocoaDeactivateWindow = NULL;
     if(sm_cocoaDeactivateWindow && sm_cocoaDeactivateWindow==m_currentChild)
     {
         sm_cocoaDeactivateWindow = NULL;


@@ -183,7 +187,7 @@ void wxMDIParentFrame::CocoaDelegate_windowDidBecomeKey(void)
 
 void wxMDIParentFrame::CocoaDelegate_windowDidResignKey(void)
 {
 
 void wxMDIParentFrame::CocoaDelegate_windowDidResignKey(void)
 {

-    wxLogDebug("wxMDIParentFrame=%p::CocoaDelegate_windowDidResignKey",this);
+    wxLogTrace(wxTRACE_COCOA,wxT("wxMDIParentFrame=%p::CocoaDelegate_windowDidResignKey"),this);

     if(m_closed)
         wxFrame::CocoaDelegate_windowDidResignKey();
     else
     if(m_closed)
         wxFrame::CocoaDelegate_windowDidResignKey();
     else


@@ -280,7 +284,7 @@ void wxMDIChildFrame::Activate()
 
 void wxMDIChildFrame::CocoaDelegate_windowDidBecomeKey(void)
 {
 
 void wxMDIChildFrame::CocoaDelegate_windowDidBecomeKey(void)
 {

-    wxLogDebug("wxMDIChildFrame=%p::CocoaDelegate_windowDidBecomeKey",this);
+    wxLogTrace(wxTRACE_COCOA,wxT("wxMDIChildFrame=%p::CocoaDelegate_windowDidBecomeKey"),this);

     if(sm_cocoaDeactivateWindow && sm_cocoaDeactivateWindow==m_mdiParent)
     {
         sm_cocoaDeactivateWindow = NULL;
     if(sm_cocoaDeactivateWindow && sm_cocoaDeactivateWindow==m_mdiParent)
     {
         sm_cocoaDeactivateWindow = NULL;


@@ -299,7 +303,7 @@ void wxMDIChildFrame::CocoaDelegate_windowDidBecomeMain(void)
 
 void wxMDIChildFrame::CocoaDelegate_windowDidResignKey(void)
 {
 
 void wxMDIChildFrame::CocoaDelegate_windowDidResignKey(void)
 {

-    wxLogDebug("wxMDIChildFrame=%p::CocoaDelegate_windowDidResignKey",this);
+    wxLogTrace(wxTRACE_COCOA,wxT("wxMDIChildFrame=%p::CocoaDelegate_windowDidResignKey"),this);

     sm_cocoaDeactivateWindow = this;
 }
 
     sm_cocoaDeactivateWindow = this;
 }
 


@@ -320,7 +324,7 @@ wxMDIClientWindow::wxMDIClientWindow()
 }
 
 wxMDIClientWindow::wxMDIClientWindow(wxMDIParentFrame *parent, long style)
 }
 
 wxMDIClientWindow::wxMDIClientWindow(wxMDIParentFrame *parent, long style)

-:   wxWindow(parent, -1)
+                  :wxWindow(parent, wxID_ANY)

 {
 }
 
 {
 }
 


@@ -333,3 +337,4 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style)
     return false;
 }
 
     return false;
 }
 

+#endif