// constants
// ---------------------------------------------------------------------------
-// This range gives a maximum of 500 MDI children. Should be enough :-)
+// First ID for the MDI child menu item in the "Window" menu.
const int wxFIRST_MDI_CHILD = 4100;
-const int wxLAST_MDI_CHILD = 4600;
+
+// There can be no more than 9 children in the "Window" menu as beginning with
+// the tenth one they're not shown and "More windows..." menu item is used
+// instead.
+const int wxLAST_MDI_CHILD = wxFIRST_MDI_CHILD + 8;
+
+// The ID of the "More windows..." menu item is the next one after the last
+// child.
+const int wxID_MDI_MORE_WINDOWS = wxLAST_MDI_CHILD + 1;
// The MDI "Window" menu label
const char *WINDOW_MENU_LABEL = gettext_noop("&Window");
// the children
// ===========================================================================
+void wxMDIParentFrame::Init()
+{
+#if wxUSE_MENUS && wxUSE_ACCEL
+ // the default menu doesn't have any accelerators (even if we have it)
+ m_accelWindowMenu = NULL;
+#endif // wxUSE_MENUS && wxUSE_ACCEL
+}
+
bool wxMDIParentFrame::Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
m_windowMenu->Append(wxID_MDI_WINDOW_PREV, _("&Previous"));
}
-#if wxUSE_MENUS && wxUSE_ACCEL
- // the default menu doesn't have any accelerators (even if we have it)
- m_accelWindowMenu = NULL;
-#endif // wxUSE_MENUS && wxUSE_ACCEL
-
if (!parent)
wxTopLevelWindows.Append(this);
msflags &= ~WS_VSCROLL;
msflags &= ~WS_HSCROLL;
- if ( !wxWindow::MSWCreate(wxApp::GetRegisteredClassName(_T("wxMDIFrame")),
- title.wx_str(),
+ if ( !wxWindow::MSWCreate(wxApp::GetRegisteredClassName(wxT("wxMDIFrame")),
+ title.t_str(),
pos, size,
msflags,
exflags) )
void wxMDIParentFrame::AddWindowMenu()
{
if ( m_windowMenu )
+ {
+ // For correct handling of the events from this menu we also must
+ // attach it to the menu bar.
+ m_windowMenu->Attach(GetMenuBar());
+
MDIInsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this));
+ }
}
void wxMDIParentFrame::RemoveWindowMenu()
{
if ( m_windowMenu )
+ {
MDIRemoveWindowMenu(GetClientWindow(), m_hMenu);
+
+ m_windowMenu->Detach();
+ }
}
void wxMDIParentFrame::UpdateWindowMenu(bool enable)
}
#if wxUSE_ACCEL
- delete m_accelWindowMenu;
- m_accelWindowMenu = NULL;
+ wxDELETE(m_accelWindowMenu);
if ( menu && menu->HasAccels() )
m_accelWindowMenu = menu->CreateAccelTable();
wxMenuItem *wxMDIParentFrame::FindItemInMenuBar(int menuId) const
{
- wxMenuItem *item = wxFrame::FindItemInMenuBar(menuId);
- if ( !item && GetActiveChild() )
- {
- item = GetActiveChild()->FindItemInMenuBar(menuId);
- }
+ // We must look in the child menu first: if it has an item with the same ID
+ // as in our own menu bar, the child item should be used to determine
+ // whether it's currently enabled.
+ wxMenuItem *item = GetActiveChild()
+ ? GetActiveChild()->FindItemInMenuBar(menuId)
+ : NULL;
+ if ( !item )
+ item = wxFrame::FindItemInMenuBar(menuId);
if ( !item && m_windowMenu )
item = m_windowMenu->FindItem(menuId);
void wxMDIParentFrame::Tile(wxOrientation orient)
{
wxASSERT_MSG( orient == wxHORIZONTAL || orient == wxVERTICAL,
- _T("invalid orientation value") );
+ wxT("invalid orientation value") );
::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDITILE,
orient == wxHORIZONTAL ? MDITILE_HORIZONTAL
WXHWND hwnd;
UnpackCommand(wParam, lParam, &id, &hwnd, &cmd);
- if ( cmd == 0 /* menu */ &&
- id >= SC_SIZE /* first system menu command */ )
+ if ( id == wxID_MDI_MORE_WINDOWS ||
+ (cmd == 0 /* menu */ &&
+ id >= SC_SIZE /* first system menu command */) )
{
MSWDefWindowProc(message, wParam, lParam);
processed = true;
processed = true;
break;
-
- case WM_ERASEBKGND:
- processed = true;
-
- // we erase background ourselves
- rc = true;
- break;
-
- case WM_SIZE:
- // though we don't (usually) resize the MDI client to exactly fit
- // the client area we need to pass this one to DefFrameProc to
- // allow the children to show
- break;
}
if ( !processed )
int childId = wxGetWindowId(child->GetHWND());
if ( childId == event.GetId() )
{
- ::SendMessage( GetWinHwnd(GetClientWindow()),
- WM_MDIACTIVATE,
- (WPARAM)child->GetHWND(), 0);
+ wxStaticCast(child, wxMDIChildFrame)->Activate();
return;
}
}
#endif // wxUSE_MENUS
-bool wxMDIParentFrame::TryBefore(wxEvent& event)
-{
- // menu (and toolbar) events should be sent to the active child frame
- // first, if any
- if ( event.GetEventType() == wxEVT_COMMAND_MENU_SELECTED )
- {
- wxMDIChildFrame * const child = GetActiveChild();
- if ( child && child->ProcessEventHere(event) )
- return true;
- }
-
- return wxMDIParentFrameBase::TryBefore(event);
-}
-
WXLRESULT wxMDIParentFrame::MSWDefWindowProc(WXUINT message,
WXWPARAM wParam,
WXLPARAM lParam)
MDICREATESTRUCT mcs;
wxString className =
- wxApp::GetRegisteredClassName(_T("wxMDIChildFrame"), COLOR_WINDOW);
+ wxApp::GetRegisteredClassName(wxT("wxMDIChildFrame"), COLOR_WINDOW);
if ( !(style & wxFULL_REPAINT_ON_RESIZE) )
className += wxApp::GetNoRedrawClassSuffix();
- mcs.szClass = className.wx_str();
- mcs.szTitle = title.wx_str();
+ mcs.szClass = className.t_str();
+ mcs.szTitle = title.t_str();
mcs.hOwner = wxGetInstance();
if (x != wxDefaultCoord)
mcs.x = x;
if ( !m_hWnd )
{
- wxLogLastError(_T("WM_MDICREATE"));
+ wxLogLastError(wxT("WM_MDICREATE"));
return false;
}
return true;
}
+void
+wxMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+ // we need to disable client area origin adjustments used for the child
+ // windows for the frame itself
+ wxMDIChildFrameBase::DoSetSize(x, y, width, height, sizeFlags);
+}
+
// Set the client size (i.e. leave the calculation of borders etc.
// to wxWidgets)
void wxMDIChildFrame::DoSetClientSize(int width, int height)
wxMDIParentFrame * const parent = GetMDIParent();
if ( parent && parent->GetClientWindow() )
{
+ // Activating an iconized MDI frame doesn't do anything, so restore it
+ // first to really present it to the user.
+ if ( IsIconized() )
+ Restore();
+
::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIACTIVATE,
(WPARAM) GetHwnd(), 0);
}
WXHMENU hMenuParent = parent->m_hMenu;
- // activate the the parent menu only when there is no other child
+ // activate the parent menu only when there is no other child
// that has been activated
if ( hMenuParent && !hwndAct )
hMenuToSet = hMenuParent;
while (node)
{
wxWindow *child = node->GetData();
- if (child->IsKindOf(CLASSINFO(wxMDIChildFrame)))
+ if (wxDynamicCast(child, wxMDIChildFrame))
{
::RedrawWindow(GetHwndOf(child),
NULL,
(WPARAM)hmenuFrame,
(LPARAM)hmenuWindow) )
{
-#ifdef __WXDEBUG__
DWORD err = ::GetLastError();
if ( err )
- wxLogApiError(_T("SendMessage(WM_MDISETMENU)"), err);
-#endif // __WXDEBUG__
+ {
+ wxLogApiError(wxT("SendMessage(WM_MDISETMENU)"), err);
+ }
}
}
inserted = true;
::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
(UINT_PTR)menuWin,
- wxGetTranslation(WINDOW_MENU_LABEL).wx_str());
+ wxString(wxGetTranslation(WINDOW_MENU_LABEL)).t_str());
break;
}
}
{
::AppendMenu(hmenu, MF_POPUP,
(UINT_PTR)menuWin,
- wxGetTranslation(WINDOW_MENU_LABEL).wx_str());
+ wxString(wxGetTranslation(WINDOW_MENU_LABEL)).t_str());
}
}
projects / wxWidgets.git / blobdiff