X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d606b6e9770a9f9d40acd30ce4eb4d54b8e5c3c7..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/aui/tabmdi.cpp diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp index df5d01c82b..8a560e75ff 100644 --- a/src/aui/tabmdi.cpp +++ b/src/aui/tabmdi.cpp @@ -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 } @@ -109,9 +110,11 @@ bool wxAuiMDIParentFrame::Create(wxWindow *parent, } #endif // wxUSE_MENUS - wxFrame::Create(parent, id, title, pos, size, style, name); - OnCreateClient(); - return true; + if ( !wxFrame::Create(parent, id, title, pos, size, style, name) ) + return false; + + m_pClientWindow = OnCreateClient(); + return m_pClientWindow != NULL; } @@ -127,7 +130,7 @@ wxAuiTabArt* wxAuiMDIParentFrame::GetArtProvider() { if (!m_pClientWindow) return NULL; - + return m_pClientWindow->GetArtProvider(); } @@ -166,7 +169,7 @@ void wxAuiMDIParentFrame::SetMenuBar(wxMenuBar* pMenuBar) AddWindowMenu(pMenuBar); wxFrame::SetMenuBar(pMenuBar); - m_pMyMenuBar = GetMenuBar(); + //m_pMyMenuBar = GetMenuBar(); } #endif // wxUSE_MENUS @@ -176,12 +179,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 +207,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 && @@ -248,8 +254,7 @@ wxAuiMDIClientWindow *wxAuiMDIParentFrame::GetClientWindow() const wxAuiMDIClientWindow *wxAuiMDIParentFrame::OnCreateClient() { - m_pClientWindow = new wxAuiMDIClientWindow( this ); - return m_pClientWindow; + return new wxAuiMDIClientWindow( this ); } void wxAuiMDIParentFrame::ActivateNext() @@ -310,7 +315,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 +335,6 @@ void wxAuiMDIParentFrame::DoHandleMenu(wxCommandEvent& event) { return; // failure } - else - { - delete m_pActiveChild; - m_pActiveChild = NULL; - } } break; case wxWINDOWNEXT: @@ -358,16 +358,16 @@ 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) + else if (orient == wxHORIZONTAL) { client_window->Split(cur_idx, wxTOP); } @@ -400,7 +400,7 @@ wxAuiMDIChildFrame::wxAuiMDIChildFrame(wxAuiMDIParentFrame *parent, const wxString& name) { Init(); - + // 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 @@ -410,12 +410,29 @@ wxAuiMDIChildFrame::wxAuiMDIChildFrame(wxAuiMDIParentFrame *parent, // 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) + { + if (pParentFrame->GetActiveChild() == this) + { + pParentFrame->SetActiveChild(NULL); + pParentFrame->SetChildMenuBar(NULL); + } + wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); + wxASSERT(pClientWindow); + int idx = pClientWindow->GetPageIndex(this); + if (idx != wxNOT_FOUND) + { + pClientWindow->RemovePage(idx); + } + } + #if wxUSE_MENUS wxDELETE(m_pMenuBar); #endif // wxUSE_MENUS @@ -430,7 +447,7 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent, const wxString& name) { wxAuiMDIClientWindow* pClientWindow = parent->GetClientWindow(); - wxASSERT_MSG((pClientWindow != (wxWindow*) NULL), wxT("Missing MDI client window.")); + wxASSERT_MSG((pClientWindow != NULL), wxT("Missing MDI client window.")); // see comment in constructor if (style & wxMINIMIZE) @@ -440,10 +457,10 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent, // 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); + id, + wxPoint(cli_size.x+1, cli_size.y+1), + size, + wxNO_BORDER, name); DoShow(false); @@ -456,7 +473,7 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent, pClientWindow->AddPage(this, title, m_activate_on_create); pClientWindow->Refresh(); - + return true; } @@ -474,7 +491,7 @@ bool wxAuiMDIChildFrame::Destroy() wxActivateEvent event(wxEVT_ACTIVATE, false, GetId()); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); - + pParentFrame->SetActiveChild(NULL); pParentFrame->SetChildMenuBar(NULL); } @@ -562,15 +579,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); @@ -582,8 +599,8 @@ const wxIcon& wxAuiMDIChildFrame::GetIcon() const { return m_icon; } - - + + void wxAuiMDIChildFrame::Activate() { wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); @@ -651,7 +668,7 @@ void wxAuiMDIChildFrame::Init() bool wxAuiMDIChildFrame::Show(bool show) { m_activate_on_create = show; - + // do nothing return true; } @@ -717,11 +734,11 @@ bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style) { SetWindowStyleFlag(style); - wxSize caption_icon_size = + 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), @@ -749,7 +766,7 @@ void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection) // don't do anything if the page doesn't actually change if (old_selection == new_selection) return; - + /* // don't do anything if the new page is already active if (new_selection != -1) @@ -758,10 +775,10 @@ void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection) if (child->GetMDIParentFrame()->GetActiveChild() == child) return; }*/ - - + + // notify old active child that it has been deactivated - if (old_selection != -1) + if ((old_selection != -1) && (old_selection < (int)GetPageCount())) { wxAuiMDIChildFrame* old_child = (wxAuiMDIChildFrame*)GetPage(old_selection); wxASSERT_MSG(old_child, wxT("wxAuiMDIClientWindow::PageChanged - null page pointer")); @@ -770,24 +787,24 @@ void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection) event.SetEventObject(old_child); old_child->GetEventHandler()->ProcessEvent(event); } - + // notify new active child that it has been activated if (new_selection != -1) { wxAuiMDIChildFrame* active_child = (wxAuiMDIChildFrame*)GetPage(new_selection); wxASSERT_MSG(active_child, wxT("wxAuiMDIClientWindow::PageChanged - null page pointer")); - + wxActivateEvent event(wxEVT_ACTIVATE, true, active_child->GetId()); event.SetEventObject(active_child); active_child->GetEventHandler()->ProcessEvent(event); - + if (active_child->GetMDIParentFrame()) { active_child->GetMDIParentFrame()->SetActiveChild(active_child); active_child->GetMDIParentFrame()->SetChildMenuBar(active_child); } } - + } @@ -795,9 +812,9 @@ void wxAuiMDIClientWindow::OnPageClose(wxAuiNotebookEvent& evt) { wxAuiMDIChildFrame* wnd; wnd = static_cast(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