X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f99422e9e916202c36a62534236d2288aae435c7..9c112555198f51fcec71106530cddba95a17f3dc:/src/cocoa/mdi.mm?ds=inline diff --git a/src/cocoa/mdi.mm b/src/cocoa/mdi.mm index 1d069d58b0..015445cccd 100644 --- a/src/cocoa/mdi.mm +++ b/src/cocoa/mdi.mm @@ -6,10 +6,13 @@ // Created: 2003/09/08 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#if wxUSE_MDI + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/mdi.h" @@ -23,7 +26,7 @@ // #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); @@ -44,7 +47,7 @@ WX_DECLARE_HASH_MAP(int, wxMDIChildFrame*, wxIntegerHash, wxIntegerEqual, wxIntM @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; } @@ -158,7 +161,7 @@ wxMenuBar *wxMDIParentFrame::GetAppMenuBar(wxCocoaNSWindow *win) 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; @@ -183,7 +186,7 @@ void wxMDIParentFrame::CocoaDelegate_windowDidBecomeKey(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 @@ -280,7 +283,7 @@ void wxMDIChildFrame::Activate() 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; @@ -299,7 +302,7 @@ void wxMDIChildFrame::CocoaDelegate_windowDidBecomeMain(void) void wxMDIChildFrame::CocoaDelegate_windowDidResignKey(void) { - wxLogDebug("wxMDIChildFrame=%p::CocoaDelegate_windowDidResignKey",this); + wxLogTrace(wxTRACE_COCOA,wxT("wxMDIChildFrame=%p::CocoaDelegate_windowDidResignKey"),this); sm_cocoaDeactivateWindow = this; } @@ -333,3 +336,4 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style) return false; } +#endif