]> git.saurik.com Git - wxWidgets.git/blobdiff - src/aui/tabmdi.cpp
check that the version of __sync_sub_and_fetch that returns a value is supported...
[wxWidgets.git] / src / aui / tabmdi.cpp
index c216c63588868c7e67ed65a2715c86a1aee40f76..ccf9e885f51d37b9f06b80ef977b4d3af9a695a1 100644 (file)
@@ -82,8 +82,9 @@ wxAuiMDIParentFrame::~wxAuiMDIParentFrame()
     wxDELETE(m_pClientWindow);
 
 #if wxUSE_MENUS
+    wxDELETE(m_pMyMenuBar);
     RemoveWindowMenu(GetMenuBar());
-    delete m_pWindowMenu;
+    wxDELETE(m_pWindowMenu);
 #endif // wxUSE_MENUS
 }
 
@@ -127,7 +128,7 @@ wxAuiTabArt* wxAuiMDIParentFrame::GetArtProvider()
 {
     if (!m_pClientWindow)
         return NULL;
-    
+
     return m_pClientWindow->GetArtProvider();
 }
 
@@ -166,7 +167,7 @@ void wxAuiMDIParentFrame::SetMenuBar(wxMenuBar* pMenuBar)
     AddWindowMenu(pMenuBar);
 
     wxFrame::SetMenuBar(pMenuBar);
-    m_pMyMenuBar = GetMenuBar();
+    //m_pMyMenuBar = GetMenuBar();
 }
 #endif // wxUSE_MENUS
 
@@ -176,12 +177,15 @@ void wxAuiMDIParentFrame::SetChildMenuBar(wxAuiMDIChildFrame* pChild)
     if (!pChild)
     {
         // No Child, set Our menu bar back.
-        SetMenuBar(m_pMyMenuBar);
+        if (m_pMyMenuBar)
+            SetMenuBar(m_pMyMenuBar);
+        else
+            SetMenuBar(GetMenuBar());
 
         // Make sure we know our menu bar is in use
-        //m_pMyMenuBar = NULL;
+        m_pMyMenuBar = NULL;
     }
-     else
+    else
     {
         if (pChild->GetMenuBar() == NULL)
             return;
@@ -201,7 +205,7 @@ bool wxAuiMDIParentFrame::ProcessEvent(wxEvent& event)
     if (m_pLastEvt == &event)
         return false;
     m_pLastEvt = &event;
-    
+
     // let the active child (if any) process the event first.
     bool res = false;
     if (m_pActiveChild &&
@@ -310,7 +314,7 @@ void wxAuiMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar)
         int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,wxSTOCK_NOFLAGS));
         if (pos == wxNOT_FOUND)
             pMenuBar->Append(m_pWindowMenu, _("&Window"));
-             else
+        else
             pMenuBar->Insert(pos, m_pWindowMenu, _("&Window"));
     }
 }
@@ -330,11 +334,6 @@ void wxAuiMDIParentFrame::DoHandleMenu(wxCommandEvent& event)
                 {
                     return; // failure
                 }
-                 else
-                {
-                    delete m_pActiveChild;
-                    m_pActiveChild = NULL;
-                }
             }
             break;
         case wxWINDOWNEXT:
@@ -354,6 +353,26 @@ void wxAuiMDIParentFrame::DoGetClientSize(int* width, int* height) const
     wxFrame::DoGetClientSize(width, height);
 }
 
+void wxAuiMDIParentFrame::Tile(wxOrientation orient)
+{
+    wxAuiMDIClientWindow* client_window = GetClientWindow();
+    wxASSERT_MSG(client_window, wxT("Missing MDI Client Window"));
+
+    int cur_idx = client_window->GetSelection();
+    if (cur_idx == -1)
+        return;
+
+    if (orient == wxVERTICAL)
+    {
+        client_window->Split(cur_idx, wxLEFT);
+    }
+    else if (orient == wxHORIZONTAL)
+    {
+        client_window->Split(cur_idx, wxTOP);
+    }
+}
+
+
 //-----------------------------------------------------------------------------
 // wxAuiMDIChildFrame
 //-----------------------------------------------------------------------------
@@ -380,11 +399,29 @@ wxAuiMDIChildFrame::wxAuiMDIChildFrame(wxAuiMDIParentFrame *parent,
                                        const wxString& name)
 {
     Init();
-    Create(parent, id, title, wxDefaultPosition, size, style, name);
+
+    // There are two ways to create an tabbed mdi child fram without
+    // making it the active document.  Either Show(false) can be called
+    // before Create() (as is customary on some ports with wxFrame-type
+    // windows), or wxMINIMIZE can be passed in the style flags.  Note that
+    // wxAuiMDIChildFrame is not really derived from wxFrame, as wxMDIChildFrame
+    // is, but those are the expected symantics.  No style flag is passed
+    // onto the panel underneath.
+    if (style & wxMINIMIZE)
+        m_activate_on_create = false;
+
+    Create(parent, id, title, wxDefaultPosition, size, 0, name);
 }
 
 wxAuiMDIChildFrame::~wxAuiMDIChildFrame()
 {
+    wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();
+    if (pParentFrame && pParentFrame->GetActiveChild() == this)
+    {
+        pParentFrame->SetActiveChild(NULL);
+        pParentFrame->SetChildMenuBar(NULL);
+    }
+
 #if wxUSE_MENUS
     wxDELETE(m_pMenuBar);
 #endif // wxUSE_MENUS
@@ -401,7 +438,20 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent,
     wxAuiMDIClientWindow* pClientWindow = parent->GetClientWindow();
     wxASSERT_MSG((pClientWindow != (wxWindow*) NULL), wxT("Missing MDI client window."));
 
-    wxPanel::Create(pClientWindow, id, wxDefaultPosition, size, style|wxNO_BORDER, name);
+    // see comment in constructor
+    if (style & wxMINIMIZE)
+        m_activate_on_create = false;
+
+    wxSize cli_size = pClientWindow->GetClientSize();
+
+    // create the window off-screen to prevent flicker
+    wxPanel::Create(pClientWindow,
+                    id,
+                    wxPoint(cli_size.x+1, cli_size.y+1),
+                    size,
+                    wxNO_BORDER, name);
+
+    DoShow(false);
 
     SetMDIParentFrame(parent);
 
@@ -410,7 +460,7 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent,
 
     m_title = title;
 
-    pClientWindow->AddPage(this, title, true);
+    pClientWindow->AddPage(this, title, m_activate_on_create);
     pClientWindow->Refresh();
 
     return true;
@@ -426,11 +476,16 @@ bool wxAuiMDIChildFrame::Destroy()
 
     if (pParentFrame->GetActiveChild() == this)
     {
+        // deactivate ourself
+        wxActivateEvent event(wxEVT_ACTIVATE, false, GetId());
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
+
         pParentFrame->SetActiveChild(NULL);
         pParentFrame->SetChildMenuBar(NULL);
     }
 
-    const size_t page_count = pClientWindow->GetPageCount();
+    size_t page_count = pClientWindow->GetPageCount();
     for (size_t pos = 0; pos < page_count; pos++)
     {
         if (pClientWindow->GetPage(pos) == this)
@@ -513,15 +568,15 @@ void wxAuiMDIChildFrame::SetIcon(const wxIcon& icon)
     wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame"));
 
     m_icon = icon;
-    
+
     wxBitmap bmp;
     bmp.CopyFromIcon(m_icon);
-    
+
     wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow();
     if (pClientWindow != NULL)
     {
         int idx = pClientWindow->GetPageIndex(this);
-        
+
         if (idx != -1)
         {
             pClientWindow->SetPageBitmap((size_t)idx, bmp);
@@ -533,8 +588,8 @@ const wxIcon& wxAuiMDIChildFrame::GetIcon() const
 {
     return m_icon;
 }
-    
-    
+
+
 void wxAuiMDIChildFrame::Activate()
 {
     wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();
@@ -592,14 +647,17 @@ wxAuiMDIParentFrame* wxAuiMDIChildFrame::GetMDIParentFrame() const
 
 void wxAuiMDIChildFrame::Init()
 {
+    m_activate_on_create = true;
     m_pMDIParentFrame = NULL;
 #if wxUSE_MENUS
     m_pMenuBar = NULL;
 #endif // wxUSE_MENUS
 }
 
-bool wxAuiMDIChildFrame::Show(bool WXUNUSED(show))
+bool wxAuiMDIChildFrame::Show(bool show)
 {
+    m_activate_on_create = show;
+
     // do nothing
     return true;
 }
@@ -643,6 +701,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxAuiMDIClientWindow, wxAuiNotebook)
 
 BEGIN_EVENT_TABLE(wxAuiMDIClientWindow, wxAuiNotebook)
     EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, wxAuiMDIClientWindow::OnPageChanged)
+    EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, wxAuiMDIClientWindow::OnPageClose)
     EVT_SIZE(wxAuiMDIClientWindow::OnSize)
 END_EVENT_TABLE()
 
@@ -664,6 +723,11 @@ bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style)
 {
     SetWindowStyleFlag(style);
 
+    wxSize caption_icon_size =
+            wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X),
+                   wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
+    SetUniformBitmapSize(caption_icon_size);
+
     if (!wxAuiNotebook::Create(parent,
                                wxID_ANY,
                                wxPoint(0,0),
@@ -674,9 +738,9 @@ bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style)
     }
 
     wxColour bkcolour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
-    SetBackgroundColour(bkcolour);
+    SetOwnBackgroundColour(bkcolour);
 
-    m_mgr.GetArtProvider()->SetColour(wxAUI_ART_BACKGROUND_COLOUR, bkcolour);
+    m_mgr.GetArtProvider()->SetColour(wxAUI_DOCKART_BACKGROUND_COLOUR, bkcolour);
 
     return true;
 }
@@ -692,13 +756,15 @@ void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection)
     if (old_selection == new_selection)
         return;
 
+    /*
     // don't do anything if the new page is already active
     if (new_selection != -1)
     {
         wxAuiMDIChildFrame* child = (wxAuiMDIChildFrame*)GetPage(new_selection);
         if (child->GetMDIParentFrame()->GetActiveChild() == child)
             return;
-    }
+    }*/
+
 
     // notify old active child that it has been deactivated
     if (old_selection != -1)
@@ -727,12 +793,26 @@ void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection)
             active_child->GetMDIParentFrame()->SetChildMenuBar(active_child);
         }
     }
+
+
+}
+
+void wxAuiMDIClientWindow::OnPageClose(wxAuiNotebookEvent& evt)
+{
+    wxAuiMDIChildFrame* wnd;
+    wnd = static_cast<wxAuiMDIChildFrame*>(GetPage(evt.GetSelection()));
+
+    wnd->Close();
+
+    // regardless of the result of wnd->Close(), we've
+    // already taken care of the close operations, so
+    // suppress further processing
+    evt.Veto();
 }
 
 void wxAuiMDIClientWindow::OnPageChanged(wxAuiNotebookEvent& evt)
 {
     PageChanged(evt.GetOldSelection(), evt.GetSelection());
-    evt.Skip();
 }
 
 void wxAuiMDIClientWindow::OnSize(wxSizeEvent& evt)