Applied patch [ 1207531 ] Fix for wxCalendarCtrl being UNUSABLE with some languages

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

diff --git a/src/cocoa/mdi.mm b/src/cocoa/mdi.mm
index 7a3f68a8f1e4ba09128fa0a5e89d363b8418157b..015445cccd8dfc378c3dc8769ac507a799d31d79 100644 (file)
--- 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
 // 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
+

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


@@ -23,7 +26,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);


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

-    wxLogDebug(wxT("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 +186,7 @@ void wxMDIParentFrame::CocoaDelegate_windowDidBecomeKey(void)
 
 void wxMDIParentFrame::CocoaDelegate_windowDidResignKey(void)
 {
 
 void wxMDIParentFrame::CocoaDelegate_windowDidResignKey(void)
 {

-    wxLogDebug(wxT("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 +283,7 @@ void wxMDIChildFrame::Activate()
 
 void wxMDIChildFrame::CocoaDelegate_windowDidBecomeKey(void)
 {
 
 void wxMDIChildFrame::CocoaDelegate_windowDidBecomeKey(void)
 {

-    wxLogDebug(wxT("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 +302,7 @@ void wxMDIChildFrame::CocoaDelegate_windowDidBecomeMain(void)
 
 void wxMDIChildFrame::CocoaDelegate_windowDidResignKey(void)
 {
 
 void wxMDIChildFrame::CocoaDelegate_windowDidResignKey(void)
 {

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

     sm_cocoaDeactivateWindow = this;
 }
 
     sm_cocoaDeactivateWindow = this;
 }
 


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

+#endif