removed code refreshing toolbar on every MDI child move -- no idea why was it there...

[wxWidgets.git] / src / mac / carbon / mdi.cpp

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 158f2df45ccdd0ebd8724442234cbb3564f070e7..ee4db9c392f07f6f2deba1a772e085f2ede3f634 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -9,18 +9,17 @@
 // 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/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/mdi.h"
+    #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"


@@ -71,12 +70,12 @@ void wxMDIParentFrame::Init()
 }
 
 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)

 {
     // this style can be used to prevent a window from having the standard MDI
     // "Window" menu
 {
     // this style can be used to prevent a window from having the standard MDI
     // "Window" menu


@@ -88,7 +87,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 +95,25 @@ 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;
     wxFrame::Create( parent , id , title , pos , size , style , name ) ;
     m_parentFrameActive = true;

-    
+

     OnCreateClient();
     OnCreateClient();

-    
+

     return true;
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 {
     DestroyChildren();
     return true;
 }
 
 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,11 +121,12 @@ 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)
 }
 
 void wxMDIParentFrame::AddChild(wxWindowBase *child)


@@ -135,8 +135,11 @@ void wxMDIParentFrame::AddChild(wxWindowBase *child)
     {
         m_currentChild = wxDynamicCast(child, wxMDIChildFrame);
 
     {
         m_currentChild = wxDynamicCast(child, wxMDIChildFrame);
 

-        if ( m_currentChild && IsShown() && ShouldBeVisible() )
+        if ( m_currentChild && IsShown() && !ShouldBeVisible() )

         {
         {

+            // we shouldn't remain visible any more
+            wxFrame::Show(false);
+            m_shouldBeShown = true;

         }
     }
 
         }
     }
 


@@ -183,45 +186,51 @@ void wxMDIParentFrame::RemoveChild(wxWindowBase *child)
 
 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;
         }
     }


@@ -243,6 +252,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 {
     m_clientWindow = new wxMDIClientWindow( this );
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 {
     m_clientWindow = new wxMDIClientWindow( this );

+

     return m_clientWindow;
 }
 
     return m_clientWindow;
 }
 


@@ -250,7 +260,7 @@ wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     // TODO
 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);
 }


@@ -287,11 +297,14 @@ bool wxMDIParentFrame::ShouldBeVisible() const
           node;
           node = node->GetNext() )
     {
           node;
           node = node->GetNext() )
     {

-        if ( !wxDynamicCast(node->GetData(), wxMDIChildFrame)
+        wxWindow *win = node->GetData();
+
+        if ( win->IsShown()
+                && !wxDynamicCast(win, wxMDIChildFrame)

 #if wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR

-                && node->GetData() != GetStatusBar()
-#endif // wxUSE_STATUSBAR
-                    && node->GetData() != GetClientWindow() )
+                && win != GetStatusBar()
+#endif
+                && win != GetClientWindow() )

         {
             // if we have a non-MDI child, do remain visible so that it could
             // be used
         {
             // if we have a non-MDI child, do remain visible so that it could
             // be used


@@ -316,6 +329,7 @@ bool wxMDIParentFrame::Show( bool show )
             // don't make the window visible now but remember that we should
             // have had done it
             m_shouldBeShown = true;
             // don't make the window visible now but remember that we should
             // have had done it
             m_shouldBeShown = true;

+

             return false;
         }
     }
             return false;
         }
     }


@@ -336,27 +350,29 @@ void wxMDIChildFrame::Init()
 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *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)

 {
     SetName(name);
 {
     SetName(name);

-    
+

     if ( id > -1 )
         m_windowId = id;
     else
         m_windowId = (int)NewControlId();
     if ( id > -1 )
         m_windowId = id;
     else
         m_windowId = (int)NewControlId();

-    
-    if (parent) parent->AddChild(this);
-    
+
+    if (parent)
+        parent->AddChild(this);
+

     MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
     MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;

-    
+

     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
 
     wxModelessWindows.Append(this);
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
 
     wxModelessWindows.Append(this);

+

     return false;
 }
 
     return false;
 }
 


@@ -372,29 +388,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);


@@ -402,18 +424,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;
         }
     }


@@ -449,10 +472,11 @@ 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))
+    if ( !wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style) )

         return false;
         return false;

-    
+

     wxModelessWindows.Append(this);
     wxModelessWindows.Append(this);

+

     return true;
 }
 
     return true;
 }