wxDELETE(m_pClientWindow);
#if wxUSE_MENUS
+ wxDELETE(m_pMyMenuBar);
RemoveWindowMenu(GetMenuBar());
- delete m_pWindowMenu;
+ wxDELETE(m_pWindowMenu);
#endif // wxUSE_MENUS
}
}
#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;
}
{
if (!m_pClientWindow)
return NULL;
-
+
return m_pClientWindow->GetArtProvider();
}
AddWindowMenu(pMenuBar);
wxFrame::SetMenuBar(pMenuBar);
- m_pMyMenuBar = GetMenuBar();
+ //m_pMyMenuBar = GetMenuBar();
}
#endif // wxUSE_MENUS
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;
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 &&
wxAuiMDIClientWindow *wxAuiMDIParentFrame::OnCreateClient()
{
- m_pClientWindow = new wxAuiMDIClientWindow( this );
- return m_pClientWindow;
+ return new wxAuiMDIClientWindow( this );
}
void wxAuiMDIParentFrame::ActivateNext()
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"));
}
}
{
return; // failure
}
- else
- {
- delete m_pActiveChild;
- m_pActiveChild = NULL;
- }
}
break;
case wxWINDOWNEXT:
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
//-----------------------------------------------------------------------------
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
// 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);
}
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
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();
// 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);
m_title = title;
- pClientWindow->AddPage(this, title, m_activate_on_create);
+ pClientWindow->AddPage(this, title, m_activateOnCreate);
pClientWindow->Refresh();
-
+
return true;
}
wxActivateEvent event(wxEVT_ACTIVATE, false, GetId());
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)
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);
{
return m_icon;
}
-
-
+
+
void wxAuiMDIChildFrame::Activate()
{
wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();
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;
-
+ 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);
+ 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),
wxColour bkcolour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
SetOwnBackgroundColour(bkcolour);
- m_mgr.GetArtProvider()->SetColour(wxAUI_ART_BACKGROUND_COLOUR, bkcolour);
+ m_mgr.GetArtProvider()->SetColour(wxAUI_DOCKART_BACKGROUND_COLOUR, bkcolour);
return true;
}
// 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)
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"));
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);
}
}
-
+
}
{
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
projects / wxWidgets.git / blobdiff