#endif //WX_PRECOMP
#include "wx/stockitem.h"
+#include "wx/aui/dockart.h"
enum MDI_MENU_ID
{
BEGIN_EVENT_TABLE(wxAuiMDIParentFrame, wxFrame)
#if wxUSE_MENUS
EVT_MENU (wxID_ANY, wxAuiMDIParentFrame::DoHandleMenu)
+ EVT_UPDATE_UI (wxID_ANY, wxAuiMDIParentFrame::DoHandleUpdateUI)
#endif
END_EVENT_TABLE()
wxAuiMDIParentFrame::~wxAuiMDIParentFrame()
{
+ // Avoid having GetActiveChild() called after m_pClientWindow is destroyed
+ SendDestroyEvent();
// Make sure the client window is destructed before the menu bars are!
wxDELETE(m_pClientWindow);
// let the active child (if any) process the event first.
bool res = false;
- if (m_pActiveChild &&
+ wxAuiMDIChildFrame* pActiveChild = GetActiveChild();
+ if (pActiveChild &&
event.IsCommandEvent() &&
event.GetEventObject() != m_pClientWindow &&
!(event.GetEventType() == wxEVT_ACTIVATE ||
event.GetEventType() == wxEVT_COMMAND_KILL_FOCUS )
)
{
- res = m_pActiveChild->GetEventHandler()->ProcessEvent(event);
+ res = pActiveChild->GetEventHandler()->ProcessEvent(event);
}
if (!res)
wxAuiMDIChildFrame *wxAuiMDIParentFrame::GetActiveChild() const
{
- return m_pActiveChild;
+ // We can be called before the client window is created, so check for its
+ // existence.
+ wxAuiMDIClientWindow* const client = GetClientWindow();
+ return client ? client->GetActiveChild() : NULL;
}
void wxAuiMDIParentFrame::SetActiveChild(wxAuiMDIChildFrame* pChildFrame)
{
- m_pActiveChild = pChildFrame;
+ wxAuiMDIClientWindow* const client = GetClientWindow();
+ if (client && client->GetActiveChild() != pChildFrame)
+ {
+ client->SetActiveChild(pChildFrame);
+ }
}
wxAuiMDIClientWindow *wxAuiMDIParentFrame::GetClientWindow() const
{
m_pLastEvt = NULL;
m_pClientWindow = NULL;
- m_pActiveChild = NULL;
#if wxUSE_MENUS
m_pWindowMenu = NULL;
m_pMyMenuBar = NULL;
switch (event.GetId())
{
case wxWINDOWCLOSE:
- if (m_pActiveChild)
- m_pActiveChild->Close();
+ {
+ wxAuiMDIChildFrame* pActiveChild = GetActiveChild();
+ if (pActiveChild)
+ pActiveChild->Close();
break;
+ }
case wxWINDOWCLOSEALL:
- while (m_pActiveChild)
+ {
+ wxAuiMDIChildFrame* pActiveChild;
+ while ((pActiveChild = GetActiveChild()) != NULL)
{
- if (!m_pActiveChild->Close())
+ if (!pActiveChild->Close())
{
return; // failure
}
}
break;
+ }
case wxWINDOWNEXT:
ActivateNext();
break;
event.Skip();
}
}
+
+void wxAuiMDIParentFrame::DoHandleUpdateUI(wxUpdateUIEvent& event)
+{
+ switch (event.GetId())
+ {
+ case wxWINDOWCLOSE:
+ case wxWINDOWCLOSEALL:
+ {
+ wxAuiMDIClientWindow* client_window = GetClientWindow();
+ wxCHECK_RET(client_window, wxS("Missing MDI Client Window"));
+ size_t pages = client_window->GetPageCount();
+ event.Enable(pages >= 1);
+ break;
+ }
+
+ case wxWINDOWNEXT:
+ case wxWINDOWPREV:
+ {
+ wxAuiMDIClientWindow* client_window = GetClientWindow();
+ wxCHECK_RET(client_window, wxS("Missing MDI Client Window"));
+ size_t pages = client_window->GetPageCount();
+ event.Enable(pages >= 2);
+ break;
+ }
+
+ default:
+ event.Skip();
+ }
+}
#endif // wxUSE_MENUS
void wxAuiMDIParentFrame::DoGetClientSize(int* width, int* height) const
// is, but those are the expected symantics. No style flag is passed
// onto the panel underneath.
if (style & wxMINIMIZE)
- m_activate_on_create = false;
+ m_activateOnCreate = false;
Create(parent, id, title, wxDefaultPosition, size, 0, name);
}
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)
- m_activate_on_create = false;
+ m_activateOnCreate = false;
wxSize cli_size = pClientWindow->GetClientSize();
SetMDIParentFrame(parent);
- // this is the currently active child
- parent->SetActiveChild(this);
-
m_title = title;
- pClientWindow->AddPage(this, title, m_activate_on_create);
+ pClientWindow->AddPage(this, title, m_activateOnCreate);
+
+ // Check that the parent notion of the active child coincides with our one.
+ // This is less obvious that it seems because we must honour
+ // m_activateOnCreate flag but only if it's not the first child because
+ // this one becomes active unconditionally.
+ wxASSERT_MSG
+ (
+ (m_activateOnCreate || pClientWindow->GetPageCount() == 1)
+ == (parent->GetActiveChild() == this),
+ wxS("Logic error: child [not] activated when it should [not] have been.")
+ );
+
pClientWindow->Refresh();
return true;
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
- pParentFrame->SetActiveChild(NULL);
pParentFrame->SetChildMenuBar(NULL);
}
{
// get icon with the system icon size
SetIcon(icons.GetIcon(-1));
- m_icon_bundle = icons;
+ m_iconBundle = icons;
}
const wxIconBundle& wxAuiMDIChildFrame::GetIcons() const
{
- return m_icon_bundle;
+ return m_iconBundle;
}
void wxAuiMDIChildFrame::SetIcon(const wxIcon& icon)
void wxAuiMDIChildFrame::Init()
{
- m_activate_on_create = true;
+ m_activateOnCreate = true;
m_pMDIParentFrame = NULL;
#if wxUSE_MENUS
m_pMenuBar = NULL;
bool wxAuiMDIChildFrame::Show(bool show)
{
- m_activate_on_create = show;
+ // wxAuiMDIChildFrame uses m_activateOnCreate only to decide whether to
+ // activate the frame when it is created. After Create() is called,
+ // m_activateOnCreate will never be read again. Therefore, calling this
+ // function after Create() is pointless and you probably want to call
+ // Activate() instead.
+ wxCHECK_MSG( !GetHandle(), false,
+ wxS("Show() has no effect after Create(). Do you mean Activate()?") );
+
+ m_activateOnCreate = show;
// do nothing
return true;
void wxAuiMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- m_mdi_newrect = wxRect(x, y, width, height);
+ m_mdiNewRect = wxRect(x, y, width, height);
#ifdef __WXGTK__
wxPanel::DoSetSize(x,y,width, height, sizeFlags);
#else
void wxAuiMDIChildFrame::DoMoveWindow(int x, int y, int width, int height)
{
- m_mdi_newrect = wxRect(x, y, width, height);
+ m_mdiNewRect = wxRect(x, y, width, height);
}
void wxAuiMDIChildFrame::ApplyMDIChildFrameRect()
{
- if (m_mdi_currect != m_mdi_newrect)
+ if (m_mdiCurRect != m_mdiNewRect)
{
- wxPanel::DoMoveWindow(m_mdi_newrect.x, m_mdi_newrect.y,
- m_mdi_newrect.width, m_mdi_newrect.height);
- m_mdi_currect = m_mdi_newrect;
+ wxPanel::DoMoveWindow(m_mdiNewRect.x, m_mdiNewRect.y,
+ m_mdiNewRect.width, m_mdiNewRect.height);
+ m_mdiCurRect = m_mdiNewRect;
}
}
CreateClient(parent, style);
}
-wxAuiMDIClientWindow::~wxAuiMDIClientWindow()
-{
- DestroyChildren();
-}
-
bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style)
{
SetWindowStyleFlag(style);
return wxAuiNotebook::SetSelection(nPage);
}
+wxAuiMDIChildFrame* wxAuiMDIClientWindow::GetActiveChild()
+{
+ const int sel = GetSelection();
+ if ( sel == wxNOT_FOUND )
+ return NULL;
+
+ return wxStaticCast(GetPage(sel), wxAuiMDIChildFrame);
+}
+
void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection)
{
// don't do anything if the page doesn't actually change
projects / wxWidgets.git / blobdiff