don't append anything back in DoDeleteOneItem() if the control becomes empty (fixes...

[wxWidgets.git] / src / aui / tabmdi.cpp

diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index 572b09617c1a81d0fe00fa6641d8b3fcbea7bbb8..ccf9e885f51d37b9f06b80ef977b4d3af9a695a1 100644 (file)
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -82,8 +82,9 @@ wxAuiMDIParentFrame::~wxAuiMDIParentFrame()
     wxDELETE(m_pClientWindow);
 
 #if wxUSE_MENUS
     wxDELETE(m_pClientWindow);
 
 #if wxUSE_MENUS

+    wxDELETE(m_pMyMenuBar);

     RemoveWindowMenu(GetMenuBar());
     RemoveWindowMenu(GetMenuBar());

-    delete m_pWindowMenu;
+    wxDELETE(m_pWindowMenu);

 #endif // wxUSE_MENUS
 }
 
 #endif // wxUSE_MENUS
 }
 


@@ -114,6 +115,30 @@ bool wxAuiMDIParentFrame::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

+
+void wxAuiMDIParentFrame::SetArtProvider(wxAuiTabArt* provider)
+{
+    if (m_pClientWindow)
+    {
+        m_pClientWindow->SetArtProvider(provider);
+    }
+}
+
+wxAuiTabArt* wxAuiMDIParentFrame::GetArtProvider()
+{
+    if (!m_pClientWindow)
+        return NULL;
+
+    return m_pClientWindow->GetArtProvider();
+}
+
+wxAuiNotebook* wxAuiMDIParentFrame::GetNotebook() const
+{
+    return static_cast<wxAuiNotebook*>(m_pClientWindow);
+}
+
+
+

 #if wxUSE_MENUS
 void wxAuiMDIParentFrame::SetWindowMenu(wxMenu* pMenu)
 {
 #if wxUSE_MENUS
 void wxAuiMDIParentFrame::SetWindowMenu(wxMenu* pMenu)
 {


@@ -142,7 +167,7 @@ void wxAuiMDIParentFrame::SetMenuBar(wxMenuBar* pMenuBar)
     AddWindowMenu(pMenuBar);
 
     wxFrame::SetMenuBar(pMenuBar);
     AddWindowMenu(pMenuBar);
 
     wxFrame::SetMenuBar(pMenuBar);

-    m_pMyMenuBar = GetMenuBar();
+    //m_pMyMenuBar = GetMenuBar();

 }
 #endif // wxUSE_MENUS
 
 }
 #endif // wxUSE_MENUS
 


@@ -152,12 +177,15 @@ void wxAuiMDIParentFrame::SetChildMenuBar(wxAuiMDIChildFrame* pChild)
     if (!pChild)
     {
         // No Child, set Our menu bar back.
     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
 
         // Make sure we know our menu bar is in use

-        //m_pMyMenuBar = NULL;
+        m_pMyMenuBar = NULL;

     }
     }

-     else
+    else

     {
         if (pChild->GetMenuBar() == NULL)
             return;
     {
         if (pChild->GetMenuBar() == NULL)
             return;


@@ -177,7 +205,7 @@ bool wxAuiMDIParentFrame::ProcessEvent(wxEvent& event)
     if (m_pLastEvt == &event)
         return false;
     m_pLastEvt = &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 &&
     // let the active child (if any) process the event first.
     bool res = false;
     if (m_pActiveChild &&


@@ -286,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"));
         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"));
     }
 }
             pMenuBar->Insert(pos, m_pWindowMenu, _("&Window"));
     }
 }


@@ -306,11 +334,6 @@ void wxAuiMDIParentFrame::DoHandleMenu(wxCommandEvent& event)
                 {
                     return; // failure
                 }
                 {
                     return; // failure
                 }

-                 else
-                {
-                    delete m_pActiveChild;
-                    m_pActiveChild = NULL;
-                }

             }
             break;
         case wxWINDOWNEXT:
             }
             break;
         case wxWINDOWNEXT:


@@ -330,6 +353,26 @@ void wxAuiMDIParentFrame::DoGetClientSize(int* width, int* height) const
     wxFrame::DoGetClientSize(width, height);
 }
 
     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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxAuiMDIChildFrame
 //-----------------------------------------------------------------------------


@@ -356,11 +399,29 @@ wxAuiMDIChildFrame::wxAuiMDIChildFrame(wxAuiMDIParentFrame *parent,
                                        const wxString& name)
 {
     Init();
                                        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()
 {
 }
 
 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
 #if wxUSE_MENUS
     wxDELETE(m_pMenuBar);
 #endif // wxUSE_MENUS


@@ -377,7 +438,20 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent,
     wxAuiMDIClientWindow* pClientWindow = parent->GetClientWindow();
     wxASSERT_MSG((pClientWindow != (wxWindow*) NULL), wxT("Missing MDI client window."));
 
     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);
 
 
     SetMDIParentFrame(parent);
 


@@ -386,7 +460,7 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent,
 
     m_title = title;
 
 
     m_title = title;
 

-    pClientWindow->AddPage(this, title, true);
+    pClientWindow->AddPage(this, title, m_activate_on_create);

     pClientWindow->Refresh();
 
     return true;
     pClientWindow->Refresh();
 
     return true;


@@ -402,11 +476,16 @@ bool wxAuiMDIChildFrame::Destroy()
 
     if (pParentFrame->GetActiveChild() == this)
     {
 
     if (pParentFrame->GetActiveChild() == this)
     {

+        // deactivate ourself
+        wxActivateEvent event(wxEVT_ACTIVATE, false, GetId());
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
+

         pParentFrame->SetActiveChild(NULL);
         pParentFrame->SetChildMenuBar(NULL);
     }
 
         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)
     for (size_t pos = 0; pos < page_count; pos++)
     {
         if (pClientWindow->GetPage(pos) == this)


@@ -471,6 +550,46 @@ wxString wxAuiMDIChildFrame::GetTitle() const
     return m_title;
 }
 
     return m_title;
 }
 

+void wxAuiMDIChildFrame::SetIcons(const wxIconBundle& icons)
+{
+    // get icon with the system icon size
+    SetIcon(icons.GetIcon(-1));
+    m_icon_bundle = icons;
+}
+
+const wxIconBundle& wxAuiMDIChildFrame::GetIcons() const
+{
+    return m_icon_bundle;
+}
+
+void wxAuiMDIChildFrame::SetIcon(const wxIcon& icon)
+{
+    wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();
+    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);
+        }
+    }
+}
+
+const wxIcon& wxAuiMDIChildFrame::GetIcon() const
+{
+    return m_icon;
+}
+
+

 void wxAuiMDIChildFrame::Activate()
 {
     wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();
 void wxAuiMDIChildFrame::Activate()
 {
     wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();


@@ -528,14 +647,17 @@ wxAuiMDIParentFrame* wxAuiMDIChildFrame::GetMDIParentFrame() const
 
 void wxAuiMDIChildFrame::Init()
 {
 
 void wxAuiMDIChildFrame::Init()
 {

+    m_activate_on_create = true;

     m_pMDIParentFrame = NULL;
 #if wxUSE_MENUS
     m_pMenuBar = NULL;
 #endif // wxUSE_MENUS
 }
 
     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;
 }
     // do nothing
     return true;
 }


@@ -579,6 +701,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxAuiMDIClientWindow, wxAuiNotebook)
 
 BEGIN_EVENT_TABLE(wxAuiMDIClientWindow, wxAuiNotebook)
     EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, wxAuiMDIClientWindow::OnPageChanged)
 
 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()
 
     EVT_SIZE(wxAuiMDIClientWindow::OnSize)
 END_EVENT_TABLE()
 


@@ -600,6 +723,11 @@ bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style)
 {
     SetWindowStyleFlag(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),
     if (!wxAuiNotebook::Create(parent,
                                wxID_ANY,
                                wxPoint(0,0),


@@ -610,9 +738,9 @@ bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style)
     }
 
     wxColour bkcolour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
     }
 
     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;
 }
 
     return true;
 }


@@ -628,13 +756,15 @@ void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection)
     if (old_selection == new_selection)
         return;
 
     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;
     // 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)
 
     // notify old active child that it has been deactivated
     if (old_selection != -1)


@@ -663,12 +793,26 @@ void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection)
             active_child->GetMDIParentFrame()->SetChildMenuBar(active_child);
         }
     }
             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());
 }
 
 void wxAuiMDIClientWindow::OnPageChanged(wxAuiNotebookEvent& evt)
 {
     PageChanged(evt.GetOldSelection(), evt.GetSelection());

-    evt.Skip();

 }
 
 void wxAuiMDIClientWindow::OnSize(wxSizeEvent& evt)
 }
 
 void wxAuiMDIClientWindow::OnSize(wxSizeEvent& evt)