]> git.saurik.com Git - wxWidgets.git/blobdiff - src/mac/carbon/mdi.cpp
document On{Open,Save}Document()
[wxWidgets.git] / src / mac / carbon / mdi.cpp
index b79928d8f6effd058471e5e1780bd1fe53349560..ff52663afcdd4adc4bacdb7a1d8cd13f603b792d 100644 (file)
@@ -1,26 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mdi.cpp
+// Name:        src/mac/carbon/mdi.cpp
 // Purpose:     MDI classes
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     MDI classes
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "mdi.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #if wxUSE_MDI
 
 #include "wx/mdi.h"
 #include "wx/wxprec.h"
 
 #if wxUSE_MDI
 
 #include "wx/mdi.h"
-#include "wx/menu.h"
-#include "wx/settings.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/menu.h"
+    #include "wx/settings.h"
+    #include "wx/statusbr.h"
+#endif
 
 #include "wx/mac/private.h"
 #include "wx/mac/uma.h"
 
 #include "wx/mac/private.h"
 #include "wx/mac/uma.h"
@@ -32,52 +32,74 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
-  EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
-  EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
+    EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
+    EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
-  EVT_SCROLL(wxMDIClientWindow::OnScroll)
+    EVT_SCROLL(wxMDIClientWindow::OnScroll)
 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 
-static const wxChar *TRACE_MDI = _T("mdi");
+#define TRACE_MDI "mdi"
 
 
-static const int IDM_WINDOWTILE  = 4001;
 static const int IDM_WINDOWTILEHOR  = 4001;
 static const int IDM_WINDOWCASCADE = 4002;
 static const int IDM_WINDOWICONS = 4003;
 static const int IDM_WINDOWNEXT = 4004;
 static const int IDM_WINDOWTILEVERT = 4005;
 static const int IDM_WINDOWTILEHOR  = 4001;
 static const int IDM_WINDOWCASCADE = 4002;
 static const int IDM_WINDOWICONS = 4003;
 static const int IDM_WINDOWNEXT = 4004;
 static const int IDM_WINDOWTILEVERT = 4005;
-static const int IDM_WINDOWPREV = 4006;
 
 
-// This range gives a maximum of 500 MDI children. Should be enough :-)
-static const int wxFIRST_MDI_CHILD = 4100;
-static const int wxLAST_MDI_CHILD = 4600;
+// others
 
 
-// Status border dimensions
-static const int wxTHICK_LINE_BORDER = 3;
+void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
+{
+#if 1 // TODO REMOVE
+    if ( inWindowRef )
+    {
+//        bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
+//        if ( inActivate != isHighlighted )
+#ifndef __LP64__
+        GrafPtr port ;
+        GetPort( &port ) ;
+        SetPortWindowPort( inWindowRef ) ;
+#endif
+        HiliteWindow( inWindowRef , inActivate ) ;
+        ControlRef control = NULL ;
+        ::GetRootControl( inWindowRef , &control ) ;
+        if ( control )
+        {
+            if ( inActivate )
+                ::ActivateControl( control ) ;
+            else
+                ::DeactivateControl( control ) ;
+        }
+#ifndef __LP64__
+        SetPort( port ) ;
+#endif
+    }
+#endif
+}
 
 
+// ----------------------------------------------------------------------------
 // Parent frame
 // Parent frame
+// ----------------------------------------------------------------------------
 
 
-wxMDIParentFrame::wxMDIParentFrame()
+void wxMDIParentFrame::Init()
 {
     m_clientWindow = NULL;
     m_currentChild = NULL;
     m_windowMenu = (wxMenu*) NULL;
 {
     m_clientWindow = NULL;
     m_currentChild = NULL;
     m_windowMenu = (wxMenu*) NULL;
-    m_parentFrameActive = TRUE;
+    m_parentFrameActive = true;
+    m_shouldBeShown = false;
 }
 
 bool wxMDIParentFrame::Create(wxWindow *parent,
 }
 
 bool wxMDIParentFrame::Create(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+    wxWindowID id,
+    const wxString& title,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxString& name)
 {
 {
-    m_clientWindow = NULL;
-    m_currentChild = NULL;
-    
     // this style can be used to prevent a window from having the standard MDI
     // "Window" menu
     if ( style & wxFRAME_NO_WINDOW_MENU )
     // this style can be used to prevent a window from having the standard MDI
     // "Window" menu
     if ( style & wxFRAME_NO_WINDOW_MENU )
@@ -88,7 +110,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
     else // normal case: we have the window menu, so construct it
     {
         m_windowMenu = new wxMenu;
     else // normal case: we have the window menu, so construct it
     {
         m_windowMenu = new wxMenu;
-        
+
         m_windowMenu->Append(IDM_WINDOWCASCADE, wxT("&Cascade"));
         m_windowMenu->Append(IDM_WINDOWTILEHOR, wxT("Tile &Horizontally"));
         m_windowMenu->Append(IDM_WINDOWTILEVERT, wxT("Tile &Vertically"));
         m_windowMenu->Append(IDM_WINDOWCASCADE, wxT("&Cascade"));
         m_windowMenu->Append(IDM_WINDOWTILEHOR, wxT("Tile &Horizontally"));
         m_windowMenu->Append(IDM_WINDOWTILEVERT, wxT("Tile &Vertically"));
@@ -96,25 +118,27 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
         m_windowMenu->Append(IDM_WINDOWICONS, wxT("&Arrange Icons"));
         m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next"));
     }
         m_windowMenu->Append(IDM_WINDOWICONS, wxT("&Arrange Icons"));
         m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next"));
     }
-    
-    wxFrame::Create( parent , id , title , pos , size , style , name ) ;
-    m_parentFrameActive = TRUE;
-    
-    OnCreateClient();
-    
-    return TRUE;
+
+    if ( !wxFrame::Create( parent , id , title , pos , size , style , name ) )
+        return false;
+
+    m_parentFrameActive = true;
+
+    m_clientWindow = OnCreateClient();
+
+    return m_clientWindow != NULL;
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 {
     DestroyChildren();
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 {
     DestroyChildren();
+
     // already deleted by DestroyChildren()
     m_clientWindow = NULL ;
     // already deleted by DestroyChildren()
     m_clientWindow = NULL ;
-    
+
     delete m_windowMenu;
 }
 
     delete m_windowMenu;
 }
 
-
 void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
     wxFrame::SetMenuBar( menu_bar ) ;
 void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
     wxFrame::SetMenuBar( menu_bar ) ;
@@ -122,54 +146,117 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
 
 void wxMDIParentFrame::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h)
 {
 
 void wxMDIParentFrame::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h)
 {
-    if(x)
+    if (x)
         *x = 0;
         *x = 0;
-    if(y)
+    if (y)
         *y = 0;
         *y = 0;
-    wxDisplaySize(w,h);
+
+    wxDisplaySize(w, h);
+}
+
+void wxMDIParentFrame::AddChild(wxWindowBase *child)
+{
+    // moved this to front, so that we don't run into unset m_parent problems later
+    wxFrame::AddChild(child);
+
+    if ( !m_currentChild )
+    {
+        m_currentChild = wxDynamicCast(child, wxMDIChildFrame);
+
+        if ( m_currentChild && IsShown() && !ShouldBeVisible() )
+        {
+            // we shouldn't remain visible any more
+            wxFrame::Show(false);
+            m_shouldBeShown = true;
+        }
+    }
+}
+
+void wxMDIParentFrame::RemoveChild(wxWindowBase *child)
+{
+    if ( child == m_currentChild )
+    {
+        // the current child isn't active any more, try to find another one
+        m_currentChild = NULL;
+
+        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+              node;
+              node = node->GetNext() )
+        {
+            wxMDIChildFrame *
+                childCur = wxDynamicCast(node->GetData(), wxMDIChildFrame);
+            if ( childCur != child )
+            {
+                m_currentChild = childCur;
+                break;
+            }
+        }
+    }
+
+    wxFrame::RemoveChild(child);
+
+    // if there are no more children left we need to show the frame if we
+    // hadn't shown it before because there were active children and it was
+    // useless (note that we have to do it after fully removing the child, i.e.
+    // after calling the base class RemoveChild() as otherwise we risk to touch
+    // pointer to the child being deleted)
+    if ( !m_currentChild && m_shouldBeShown && !IsShown() )
+    {
+        // we have to show it, but at least move it out of sight and make it of
+        // smallest possible size (unfortunately (0, 0) doesn't work so that it
+        // doesn't appear in expose
+        SetSize(-10000, -10000, 1, 1);
+        Show();
+    }
 }
 
 void wxMDIParentFrame::MacActivate(long timestamp, bool activating)
 {
 }
 
 void wxMDIParentFrame::MacActivate(long timestamp, bool activating)
 {
-    wxLogTrace(TRACE_MDI, wxT("MDI PARENT=%p MacActivate(0x%08lx,%s)"),this,timestamp,activating?wxT("ACTIV"):wxT("deact"));
-    if(activating)
+    wxLogTrace(TRACE_MDI, wxT("MDI PARENT=%p MacActivate(0x%08lx,%s)"), this, timestamp, activating ? wxT("ACTIV") : wxT("deact"));
+
+    if (activating)
     {
     {
-        if(s_macDeactivateWindow && s_macDeactivateWindow->GetParent()==this)
+        if (s_macDeactivateWindow && s_macDeactivateWindow->GetParent() == this)
         {
             wxLogTrace(TRACE_MDI, wxT("child had been scheduled for deactivation, rehighlighting"));
         {
             wxLogTrace(TRACE_MDI, wxT("child had been scheduled for deactivation, rehighlighting"));
+
             UMAHighlightAndActivateWindow((WindowRef)s_macDeactivateWindow->MacGetWindowRef(), true);
             UMAHighlightAndActivateWindow((WindowRef)s_macDeactivateWindow->MacGetWindowRef(), true);
-            wxLogTrace(TRACE_MDI, wxT("done highliting child"));
+
+            wxLogTrace(TRACE_MDI, wxT("finished highliting child"));
+
             s_macDeactivateWindow = NULL;
         }
             s_macDeactivateWindow = NULL;
         }
-        else if(s_macDeactivateWindow == this)
+        else if (s_macDeactivateWindow == this)
         {
             wxLogTrace(TRACE_MDI, wxT("Avoided deactivation/activation of this=%p"), this);
         {
             wxLogTrace(TRACE_MDI, wxT("Avoided deactivation/activation of this=%p"), this);
+
             s_macDeactivateWindow = NULL;
         }
         else // window to deactivate is NULL or is not us or one of our kids
         {
             // activate kid instead
             s_macDeactivateWindow = NULL;
         }
         else // window to deactivate is NULL or is not us or one of our kids
         {
             // activate kid instead
-            if(m_currentChild)
-                m_currentChild->MacActivate(timestamp,activating);
+            if (m_currentChild)
+                m_currentChild->MacActivate(timestamp, activating);
             else
             else
-                wxFrame::MacActivate(timestamp,activating);
+                wxFrame::MacActivate(timestamp, activating);
         }
     }
     else
     {
         // We were scheduled for deactivation, and now we do it.
         }
     }
     else
     {
         // We were scheduled for deactivation, and now we do it.
-        if(s_macDeactivateWindow==this)
+        if (s_macDeactivateWindow == this)
         {
             s_macDeactivateWindow = NULL;
         {
             s_macDeactivateWindow = NULL;
-            if(m_currentChild)
-                m_currentChild->MacActivate(timestamp,activating);
-            wxFrame::MacActivate(timestamp,activating);
+            if (m_currentChild)
+                m_currentChild->MacActivate(timestamp, activating);
+            wxFrame::MacActivate(timestamp, activating);
         }
         else // schedule ourselves for deactivation
         {
         }
         else // schedule ourselves for deactivation
         {
-            if(s_macDeactivateWindow)
-                wxLogTrace(TRACE_MDI, wxT("window=%p SHOULD have been deactivated, oh well!"),s_macDeactivateWindow);
+            if (s_macDeactivateWindow)
+                wxLogTrace(TRACE_MDI, wxT("window=%p SHOULD have been deactivated, oh well!"), s_macDeactivateWindow);
             wxLogTrace(TRACE_MDI, wxT("Scheduling delayed MDI Parent deactivation"));
             wxLogTrace(TRACE_MDI, wxT("Scheduling delayed MDI Parent deactivation"));
+
             s_macDeactivateWindow = this;
         }
     }
             s_macDeactivateWindow = this;
         }
     }
@@ -190,15 +277,14 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 // just return a new class)
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 {
 // just return a new class)
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 {
-    m_clientWindow = new wxMDIClientWindow( this );
-    return m_clientWindow;
+    return new wxMDIClientWindow( this );
 }
 
 // Responds to colour changes, and passes event on to children.
 void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     // TODO
 }
 
 // Responds to colour changes, and passes event on to children.
 void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     // TODO
-    
+
     // Propagate the event to the non-top-level children
     wxFrame::OnSysColourChanged(event);
 }
     // Propagate the event to the non-top-level children
     wxFrame::OnSysColourChanged(event);
 }
@@ -229,29 +315,55 @@ void wxMDIParentFrame::ActivatePrevious()
     // TODO
 }
 
     // TODO
 }
 
+bool wxMDIParentFrame::ShouldBeVisible() const
+{
+    for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindow *win = node->GetData();
+
+        if ( win->IsShown()
+                && !wxDynamicCast(win, wxMDIChildFrame)
+#if wxUSE_STATUSBAR
+                && win != (wxWindow*) GetStatusBar()
+#endif
+                && win != GetClientWindow() )
+        {
+            // if we have a non-MDI child, do remain visible so that it could
+            // be used
+            return true;
+        }
+    }
+
+    return false;
+}
+
 bool wxMDIParentFrame::Show( bool show )
 {
 bool wxMDIParentFrame::Show( bool show )
 {
+    m_shouldBeShown = false;
+
     // don't really show the MDI frame unless it has any children other than
     // MDI children as it is pretty useless in this case
 
     if ( show )
     {
     // don't really show the MDI frame unless it has any children other than
     // MDI children as it is pretty useless in this case
 
     if ( show )
     {
-        // TODO: check for other children
-        if ( !GetToolBar() )
+        if ( !ShouldBeVisible() && m_currentChild )
         {
         {
-            // call the base class version to just update the flag but don't
-            // really make the window visible
-            return wxFrameBase::Show();
+            // don't make the window visible now but remember that we should
+            // have had done it
+            m_shouldBeShown = true;
+
+            return false;
         }
     }
 
         }
     }
 
-    if ( !wxFrame::Show(show) )
-        return false;
-
-    return true;
+    return wxFrame::Show(show);
 }
 
 }
 
+// ----------------------------------------------------------------------------
 // Child frame
 // Child frame
+// ----------------------------------------------------------------------------
 
 wxMDIChildFrame::wxMDIChildFrame()
 {
 
 wxMDIChildFrame::wxMDIChildFrame()
 {
@@ -270,28 +382,27 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
                              const wxString& name)
 {
     SetName(name);
                              const wxString& name)
 {
     SetName(name);
-    
-    if ( id > -1 )
-        m_windowId = id;
-    else
+
+    if ( id == wxID_ANY )
         m_windowId = (int)NewControlId();
         m_windowId = (int)NewControlId();
-    
-    if (parent) parent->AddChild(this);
-    
-    MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
-    
+    else
+        m_windowId = id;
+
+    if (parent)
+        parent->AddChild(this);
+
+    MacCreateRealWindow( pos , size , MacRemoveBordersFromStyle(style) , name ) ;
+    SetTitle( title );
+
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
 
     wxModelessWindows.Append(this);
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
 
     wxModelessWindows.Append(this);
-    return FALSE;
+
+    return true;
 }
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {
 }
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {
-    wxMDIParentFrame *mdiparent = wxDynamicCast(m_parent, wxMDIParentFrame);
-    wxASSERT(mdiparent);
-    if(mdiparent->m_currentChild == this)
-        mdiparent->m_currentChild = NULL;
     DestroyChildren();
 }
 
     DestroyChildren();
 }
 
@@ -302,29 +413,35 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)
 
 void wxMDIChildFrame::MacActivate(long timestamp, bool activating)
 {
 
 void wxMDIChildFrame::MacActivate(long timestamp, bool activating)
 {
-    wxLogTrace(TRACE_MDI, wxT("MDI child=%p  MacActivate(0x%08lx,%s)"),this,timestamp,activating?wxT("ACTIV"):wxT("deact"));
+    wxLogTrace(TRACE_MDI, wxT("MDI child=%p  MacActivate(0x%08lx,%s)"),this, timestamp, activating ? wxT("ACTIV") : wxT("deact"));
+
     wxMDIParentFrame *mdiparent = wxDynamicCast(m_parent, wxMDIParentFrame);
     wxASSERT(mdiparent);
     wxMDIParentFrame *mdiparent = wxDynamicCast(m_parent, wxMDIParentFrame);
     wxASSERT(mdiparent);
-    if(activating)
+
+    if (activating)
     {
     {
-        if(s_macDeactivateWindow == m_parent)
+        if (s_macDeactivateWindow == m_parent)
         {
             wxLogTrace(TRACE_MDI, wxT("parent had been scheduled for deactivation, rehighlighting"));
         {
             wxLogTrace(TRACE_MDI, wxT("parent had been scheduled for deactivation, rehighlighting"));
+
             UMAHighlightAndActivateWindow((WindowRef)s_macDeactivateWindow->MacGetWindowRef(), true);
             UMAHighlightAndActivateWindow((WindowRef)s_macDeactivateWindow->MacGetWindowRef(), true);
-            wxLogTrace(TRACE_MDI, wxT("done highliting parent"));
+
+            wxLogTrace(TRACE_MDI, wxT("finished highliting parent"));
+
             s_macDeactivateWindow = NULL;
         }
             s_macDeactivateWindow = NULL;
         }
-        else if((mdiparent->m_currentChild==this) || !s_macDeactivateWindow)
-            mdiparent->wxFrame::MacActivate(timestamp,activating);
-        
-        if(mdiparent->m_currentChild && mdiparent->m_currentChild!=this)
-            mdiparent->m_currentChild->wxFrame::MacActivate(timestamp,false);
+        else if ((mdiparent->m_currentChild == this) || !s_macDeactivateWindow)
+            mdiparent->wxFrame::MacActivate(timestamp, activating);
+
+        if (mdiparent->m_currentChild && mdiparent->m_currentChild != this)
+            mdiparent->m_currentChild->wxFrame::MacActivate(timestamp, false);
         mdiparent->m_currentChild = this;
 
         mdiparent->m_currentChild = this;
 
-        if(s_macDeactivateWindow==this)
+        if (s_macDeactivateWindow == this)
         {
         {
-            wxLogTrace(TRACE_MDI, wxT("Avoided deactivation/activation of this=%p"),this);
-            s_macDeactivateWindow=NULL;
+            wxLogTrace(TRACE_MDI, wxT("Avoided deactivation/activation of this=%p"), this);
+
+            s_macDeactivateWindow = NULL;
         }
         else
             wxFrame::MacActivate(timestamp, activating);
         }
         else
             wxFrame::MacActivate(timestamp, activating);
@@ -332,18 +449,19 @@ void wxMDIChildFrame::MacActivate(long timestamp, bool activating)
     else
     {
         // We were scheduled for deactivation, and now we do it.
     else
     {
         // We were scheduled for deactivation, and now we do it.
-        if(s_macDeactivateWindow==this)
+        if (s_macDeactivateWindow == this)
         {
             s_macDeactivateWindow = NULL;
         {
             s_macDeactivateWindow = NULL;
-            wxFrame::MacActivate(timestamp,activating);
-            if(mdiparent->m_currentChild==this)
-                mdiparent->wxFrame::MacActivate(timestamp,activating);
+            wxFrame::MacActivate(timestamp, activating);
+            if (mdiparent->m_currentChild == this)
+                mdiparent->wxFrame::MacActivate(timestamp, activating);
         }
         else // schedule ourselves for deactivation
         {
         }
         else // schedule ourselves for deactivation
         {
-            if(s_macDeactivateWindow)
-                wxLogTrace(TRACE_MDI, wxT("window=%p SHOULD have been deactivated, oh well!"),s_macDeactivateWindow);
+            if (s_macDeactivateWindow)
+                wxLogTrace(TRACE_MDI, wxT("window=%p SHOULD have been deactivated, oh well!"), s_macDeactivateWindow);
             wxLogTrace(TRACE_MDI, wxT("Scheduling delayed deactivation"));
             wxLogTrace(TRACE_MDI, wxT("Scheduling delayed deactivation"));
+
             s_macDeactivateWindow = this;
         }
     }
             s_macDeactivateWindow = this;
         }
     }
@@ -379,11 +497,12 @@ wxMDIClientWindow::~wxMDIClientWindow()
 
 bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {
 
 bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {
-    if ( !wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style))
-        return FALSE;
-    
+    if ( !wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style) )
+        return false;
+
     wxModelessWindows.Append(this);
     wxModelessWindows.Append(this);
-    return TRUE;
+
+    return true;
 }
 
 // Get size *available for subwindows* i.e. excluding menu bar.
 }
 
 // Get size *available for subwindows* i.e. excluding menu bar.
@@ -393,9 +512,8 @@ void wxMDIClientWindow::DoGetClientSize(int *x, int *y) const
 }
 
 // Explicitly call default scroll behaviour
 }
 
 // Explicitly call default scroll behaviour
-void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
+void wxMDIClientWindow::OnScroll(wxScrollEvent& WXUNUSED(event))
 {
 }
 
 {
 }
 
-#endif
-
+#endif // wxUSE_MDI