removed Win16 code (patch 905241), last version with remains of Win16 support tagged...

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

diff --git a/src/cocoa/mdi.mm b/src/cocoa/mdi.mm
index 1d069d58b089847865f53e2755d4bdc977e39bdf..fdac990686ca5cf50f77ba2a8eb1a26f4e6021f2 100644 (file)
--- a/src/cocoa/mdi.mm
+++ b/src/cocoa/mdi.mm
@@ -44,7 +44,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 +158,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 +183,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 +280,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 +299,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;
 }