X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9698bd4acdee91faaca22c4246842ac9456f876..43c42c18d36c703a88b1b7b697bac27fe5608eca:/src/msw/mdi.cpp?ds=sidebyside diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 6b9cdbcc9a..6ecd832ea5 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -2,10 +2,11 @@ // Name: src/msw/mdi.cpp // Purpose: MDI classes for wxMSW // Author: Julian Smart -// Modified by: +// Modified by: Vadim Zeitlin on 2008-11-04 to use the base classes // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart +// Copyright: (c) 1998 Julian Smart +// (c) 2008-2009 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -54,20 +55,27 @@ extern wxMenu *wxCurrentPopupMenu; extern void wxRemoveHandleAssociation(wxWindow *win); +namespace +{ + // --------------------------------------------------------------------------- // constants // --------------------------------------------------------------------------- -static const int IDM_WINDOWTILEHOR = 4001; -static const int IDM_WINDOWCASCADE = 4002; -static const int IDM_WINDOWICONS = 4003; -static const int IDM_WINDOWNEXT = 4004; -static const int IDM_WINDOWTILEVERT = 4005; -static const int IDM_WINDOWPREV = 4006; +// First ID for the MDI child menu item in the "Window" menu. +const int wxFIRST_MDI_CHILD = 4100; + +// 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; -// This range gives a maximum of 500 MDI children. Should be enough :-) -static const int wxFIRST_MDI_CHILD = 4100; -static const int wxLAST_MDI_CHILD = 4600; +// 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"); // --------------------------------------------------------------------------- // private functions @@ -75,35 +83,31 @@ static const int wxLAST_MDI_CHILD = 4600; // set the MDI menus (by sending the WM_MDISETMENU message) and update the menu // of the parent of win (which is supposed to be the MDI client window) -static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow); +void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow); // insert the window menu (subMenu) into menu just before "Help" submenu or at // the very end if not found -static void MDIInsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu); +void MDIInsertWindowMenu(wxWindow *win, WXHMENU hMenu, HMENU subMenu); // Remove the window menu -static void MDIRemoveWindowMenu(wxWindow *win, WXHMENU menu); - -// is this an id of an MDI child? -inline bool IsMdiCommandId(int id) -{ - return (id >= wxFIRST_MDI_CHILD) && (id <= wxLAST_MDI_CHILD); -} +void MDIRemoveWindowMenu(wxWindow *win, WXHMENU hMenu); // unpack the parameters of WM_MDIACTIVATE message -static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam, - WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact); +void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam, + WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact); // return the HMENU of the MDI menu // // this function works correctly even when we don't have a window menu and just // returns 0 then -static inline HMENU GetMDIWindowMenu(wxMDIParentFrame *frame) +inline HMENU GetMDIWindowMenu(wxMDIParentFrame *frame) { wxMenu *menu = frame->GetWindowMenu(); return menu ? GetHmenuOf(menu) : 0; } +} // anonymous namespace + // =========================================================================== // implementation // =========================================================================== @@ -120,6 +124,13 @@ BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame) EVT_SIZE(wxMDIParentFrame::OnSize) EVT_ICONIZE(wxMDIParentFrame::OnIconized) EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged) + +#if wxUSE_MENUS + EVT_MENU_RANGE(wxFIRST_MDI_CHILD, wxLAST_MDI_CHILD, + wxMDIParentFrame::OnMDIChild) + EVT_MENU_RANGE(wxID_MDI_WINDOW_FIRST, wxID_MDI_WINDOW_LAST, + wxMDIParentFrame::OnMDICommand) +#endif // wxUSE_MENUS END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame) @@ -135,9 +146,12 @@ END_EVENT_TABLE() // the children // =========================================================================== -wxMDIParentFrame::wxMDIParentFrame() +void wxMDIParentFrame::Init() { - m_parentFrameActive = true; +#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, @@ -155,17 +169,15 @@ bool wxMDIParentFrame::Create(wxWindow *parent, // normal case: we have the window menu, so construct it m_windowMenu = new wxMenu; - m_windowMenu->Append(IDM_WINDOWCASCADE, _("&Cascade")); - m_windowMenu->Append(IDM_WINDOWTILEHOR, _("Tile &Horizontally")); - m_windowMenu->Append(IDM_WINDOWTILEVERT, _("Tile &Vertically")); + m_windowMenu->Append(wxID_MDI_WINDOW_CASCADE, _("&Cascade")); + m_windowMenu->Append(wxID_MDI_WINDOW_TILE_HORZ, _("Tile &Horizontally")); + m_windowMenu->Append(wxID_MDI_WINDOW_TILE_VERT, _("Tile &Vertically")); m_windowMenu->AppendSeparator(); - m_windowMenu->Append(IDM_WINDOWICONS, _("&Arrange Icons")); - m_windowMenu->Append(IDM_WINDOWNEXT, _("&Next")); - m_windowMenu->Append(IDM_WINDOWPREV, _("&Previous")); + m_windowMenu->Append(wxID_MDI_WINDOW_ARRANGE_ICONS, _("&Arrange Icons")); + m_windowMenu->Append(wxID_MDI_WINDOW_NEXT, _("&Next")); + m_windowMenu->Append(wxID_MDI_WINDOW_PREV, _("&Previous")); } - m_parentFrameActive = true; - if (!parent) wxTopLevelWindows.Append(this); @@ -185,8 +197,8 @@ bool wxMDIParentFrame::Create(wxWindow *parent, 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) ) @@ -212,6 +224,10 @@ wxMDIParentFrame::~wxMDIParentFrame() m_frameStatusBar = NULL; #endif // wxUSE_STATUSBAR +#if wxUSE_MENUS && wxUSE_ACCEL + delete m_accelWindowMenu; +#endif // wxUSE_MENUS && wxUSE_ACCEL + DestroyChildren(); // the MDI frame menubar is not automatically deleted by Windows unlike for @@ -233,6 +249,16 @@ wxMDIParentFrame::~wxMDIParentFrame() // wxMDIParentFrame child management // ---------------------------------------------------------------------------- +wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const +{ + HWND hWnd = (HWND)::SendMessage(GetWinHwnd(GetClientWindow()), + WM_MDIGETACTIVE, 0, 0L); + if ( !hWnd ) + return NULL; + + return static_cast(wxFindWinFromHandle(hWnd)); +} + int wxMDIParentFrame::GetChildFramesCount() const { int count = 0; @@ -247,23 +273,48 @@ int wxMDIParentFrame::GetChildFramesCount() const return count; } +#if wxUSE_MENUS + void wxMDIParentFrame::AddMDIChild(wxMDIChildFrame * WXUNUSED(child)) { - if ( GetChildFramesCount() == 1 ) + switch ( GetChildFramesCount() ) { - // first MDI child added, we need to insert the window menu now if we - // have it - AddWindowMenu(); + case 1: + // first MDI child was just added, we need to insert the window + // menu now if we have it + AddWindowMenu(); + + // and disable the items which can't be used until we have more + // than one child + UpdateWindowMenu(false); + break; + + case 2: + // second MDI child was added, enable the menu items which were + // disabled because they didn't make sense for a single window + UpdateWindowMenu(true); + break; } } void wxMDIParentFrame::RemoveMDIChild(wxMDIChildFrame * WXUNUSED(child)) { - if ( GetChildFramesCount() == 1 ) + switch ( GetChildFramesCount() ) { - // last MDI child is being removed, remove the now unnecessary window - // menu too - RemoveWindowMenu(); + case 1: + // last MDI child is being removed, remove the now unnecessary + // window menu too + RemoveWindowMenu(); + + // there is no need to call UpdateWindowMenu(true) here so this is + // not quite symmetric to AddMDIChild() above + break; + + case 2: + // only one MDI child is going to remain, disable the menu commands + // which don't make sense for a single child window + UpdateWindowMenu(false); + break; } } @@ -274,21 +325,38 @@ void wxMDIParentFrame::RemoveMDIChild(wxMDIChildFrame * WXUNUSED(child)) 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 ( m_windowMenu ) + { + m_windowMenu->Enable(wxID_MDI_WINDOW_NEXT, enable); + m_windowMenu->Enable(wxID_MDI_WINDOW_PREV, enable); + } } #if wxUSE_MENUS_NATIVE void wxMDIParentFrame::InternalSetMenuBar() { - m_parentFrameActive = true; - if ( GetActiveChild() ) { AddWindowMenu(); @@ -305,17 +373,31 @@ void wxMDIParentFrame::InternalSetMenuBar() void wxMDIParentFrame::SetWindowMenu(wxMenu* menu) { - // notice that Remove/AddWindowMenu() are safe to call even when - // m_windowMenu is NULL - RemoveWindowMenu(); + if ( menu != m_windowMenu ) + { + // notice that Remove/AddWindowMenu() are safe to call even when + // m_windowMenu is NULL + RemoveWindowMenu(); + + delete m_windowMenu; - delete m_windowMenu; + m_windowMenu = menu; + + AddWindowMenu(); + } - m_windowMenu = menu; +#if wxUSE_ACCEL + wxDELETE(m_accelWindowMenu); - AddWindowMenu(); + if ( menu && menu->HasAccels() ) + m_accelWindowMenu = menu->CreateAccelTable(); +#endif // wxUSE_ACCEL } +// ---------------------------------------------------------------------------- +// wxMDIParentFrame other menu-related stuff +// ---------------------------------------------------------------------------- + void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu) { wxMDIChildFrame *child = GetActiveChild(); @@ -344,17 +426,39 @@ void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu) } } -const wxMenuItem *wxMDIParentFrame::FindItemInMenuBar(int menuId) const +wxMenuItem *wxMDIParentFrame::FindItemInMenuBar(int menuId) const { - const wxMenuItem *item = wxFrame::FindItemInMenuBar(menuId); - if ( !item && m_currentChild ) + wxMenuItem *item = wxFrame::FindItemInMenuBar(menuId); + if ( !item && GetActiveChild() ) { - item = m_currentChild->FindItemInMenuBar(menuId); + item = GetActiveChild()->FindItemInMenuBar(menuId); } + if ( !item && m_windowMenu ) + item = m_windowMenu->FindItem(menuId); + return item; } +WXHMENU wxMDIParentFrame::MSWGetActiveMenu() const +{ + wxMDIChildFrame * const child = GetActiveChild(); + if ( child ) + { + const WXHMENU hmenu = child->MSWGetActiveMenu(); + if ( hmenu ) + return hmenu; + } + + return wxFrame::MSWGetActiveMenu(); +} + +#endif // wxUSE_MENUS + +// ---------------------------------------------------------------------------- +// wxMDIParentFrame event handling +// ---------------------------------------------------------------------------- + void wxMDIParentFrame::UpdateClientSize() { if ( GetClientWindow() ) @@ -381,17 +485,6 @@ void wxMDIParentFrame::OnIconized(wxIconizeEvent& event) UpdateClientSize(); } -// Returns the active MDI child window -wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const -{ - HWND hWnd = (HWND)::SendMessage(GetWinHwnd(GetClientWindow()), - WM_MDIGETACTIVE, 0, 0L); - if ( hWnd == 0 ) - return NULL; - - return (wxMDIChildFrame *)wxFindWinFromHandle(hWnd); -} - // Responds to colour changes, and passes event on to children. void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event) { @@ -422,7 +515,7 @@ void wxMDIParentFrame::Cascade() 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 @@ -449,8 +542,8 @@ void wxMDIParentFrame::ActivatePrevious() // --------------------------------------------------------------------------- WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message, - WXWPARAM wParam, - WXLPARAM lParam) + WXWPARAM wParam, + WXLPARAM lParam) { WXLRESULT rc = 0; bool processed = false; @@ -468,22 +561,36 @@ WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message, break; case WM_COMMAND: + // system messages such as SC_CLOSE are sent as WM_COMMANDs to the + // parent MDI frame and we must let the DefFrameProc() have them + // for these commands to work (without it, closing the maximized + // MDI children doesn't work, for example) { WXWORD id, cmd; WXHWND hwnd; UnpackCommand(wParam, lParam, &id, &hwnd, &cmd); - (void)HandleCommand(id, cmd, hwnd); - - // even if the frame didn't process it, there is no need to try it - // once again (i.e. call wxFrame::HandleCommand()) - we just did it, - // so pretend we processed the message anyhow - processed = true; + if ( id == wxID_MDI_MORE_WINDOWS || + (cmd == 0 /* menu */ && + id >= SC_SIZE /* first system menu command */) ) + { + MSWDefWindowProc(message, wParam, lParam); + processed = true; + } + else // Not a system command. + { + // Menu (and toolbar) events should be sent to the active + // child first and only be processed by the parent frame if + // they're not handled there. + if ( wxMDIChildFrame* child = GetActiveChild() ) + { + processed = child->MSWHandleMessage(&rc, + message, + wParam, + lParam); + } + } } - - // always pass this message DefFrameProc(), otherwise MDI menu - // commands (and sys commands - more surprisingly!) won't work - MSWDefWindowProc(message, wParam, lParam); break; case WM_CREATE: @@ -498,18 +605,6 @@ WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message, 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 ) @@ -530,130 +625,89 @@ bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate // If this window is an MDI parent, we must also send an OnActivate message // to the current child. - if ( (m_currentChild != NULL) && + if ( GetActiveChild() && ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)) ) { - wxActivateEvent event(wxEVT_ACTIVATE, true, m_currentChild->GetId()); - event.SetEventObject( m_currentChild ); - if ( m_currentChild->HandleWindowEvent(event) ) + wxActivateEvent event(wxEVT_ACTIVATE, true, GetActiveChild()->GetId()); + event.SetEventObject( GetActiveChild() ); + if ( GetActiveChild()->HandleWindowEvent(event) ) processed = true; } return processed; } -bool wxMDIParentFrame::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND hwnd) -{ - // sign extend to int from short before comparing with the other int ids - int id = (signed short)id_; +#if wxUSE_MENUS - // In case it's e.g. a toolbar. - if ( hwnd ) +void wxMDIParentFrame::OnMDIChild(wxCommandEvent& event) +{ + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); + while ( node ) { - wxWindow *win = wxFindWinFromHandle(hwnd); - if ( win ) - return win->MSWCommand(cmd, id); - } + wxWindow *child = node->GetData(); + if ( child->GetHWND() ) + { + int childId = wxGetWindowId(child->GetHWND()); + if ( childId == event.GetId() ) + { + wxStaticCast(child, wxMDIChildFrame)->Activate(); + return; + } + } - if (wxCurrentPopupMenu) - { - wxMenu *popupMenu = wxCurrentPopupMenu; - wxCurrentPopupMenu = NULL; - if (popupMenu->MSWCommand(cmd, id)) - return true; + node = node->GetNext(); } - // is it one of standard MDI commands? + wxFAIL_MSG( "unknown MDI child selected?" ); +} + +void wxMDIParentFrame::OnMDICommand(wxCommandEvent& event) +{ WXWPARAM wParam = 0; WXLPARAM lParam = 0; int msg; - switch ( id ) + switch ( event.GetId() ) { - case IDM_WINDOWCASCADE: + case wxID_MDI_WINDOW_CASCADE: msg = WM_MDICASCADE; wParam = MDITILE_SKIPDISABLED; break; - case IDM_WINDOWTILEHOR: + case wxID_MDI_WINDOW_TILE_HORZ: wParam |= MDITILE_HORIZONTAL; // fall through - case IDM_WINDOWTILEVERT: + case wxID_MDI_WINDOW_TILE_VERT: if ( !wParam ) wParam = MDITILE_VERTICAL; msg = WM_MDITILE; wParam |= MDITILE_SKIPDISABLED; break; - case IDM_WINDOWICONS: + case wxID_MDI_WINDOW_ARRANGE_ICONS: msg = WM_MDIICONARRANGE; break; - case IDM_WINDOWNEXT: + case wxID_MDI_WINDOW_NEXT: msg = WM_MDINEXT; lParam = 0; // next child break; - case IDM_WINDOWPREV: + case wxID_MDI_WINDOW_PREV: msg = WM_MDINEXT; lParam = 1; // previous child break; default: - msg = 0; - } - - if ( msg ) - { - ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, lParam); - - return true; - } - - // FIXME VZ: what does this test do?? - if (id >= 0xF000) - { - return false; // Get WndProc to call default proc + wxFAIL_MSG( "unknown MDI command" ); + return; } - if ( IsMdiCommandId(id) ) - { - wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - while ( node ) - { - wxWindow *child = node->GetData(); - if ( child->GetHWND() ) - { - int childId = wxGetWindowId(child->GetHWND()); - if ( childId == (signed short)id ) - { - ::SendMessage( GetWinHwnd(GetClientWindow()), - WM_MDIACTIVATE, - (WPARAM)child->GetHWND(), 0); - return true; - } - } - node = node->GetNext(); - } - } - else if ( m_parentFrameActive ) - { - return ProcessCommand(id); - } - else if ( m_currentChild ) - { - return m_currentChild->HandleCommand(id, cmd, hwnd); - } - else - { - // this shouldn't happen because it means that our messages are being - // lost (they're not sent to the parent frame nor to the children) - wxFAIL_MSG(wxT("MDI parent frame is not active, yet there is no active MDI child?")); - } - - return false; + ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, lParam); } +#endif // wxUSE_MENUS + WXLRESULT wxMDIParentFrame::MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) @@ -672,19 +726,28 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg) MSG *pMsg = (MSG *)msg; // first let the current child get it - if ( m_currentChild && m_currentChild->GetHWND() && - m_currentChild->MSWTranslateMessage(msg) ) + wxMDIChildFrame * const child = GetActiveChild(); + if ( child && child->MSWTranslateMessage(msg) ) { return true; } - // then try out accel table (will also check the menu accels) + // then try out accelerator table (will also check the accelerators for the + // normal menu items) if ( wxFrame::MSWTranslateMessage(msg) ) { return true; } - // finally, check for MDI specific built in accel keys +#if wxUSE_MENUS && wxUSE_ACCEL + // but it doesn't check for the (custom) accelerators of the window menu + // items as it's not part of the menu bar as it's handled by Windows itself + // so we need to do this explicitly + if ( m_accelWindowMenu && m_accelWindowMenu->Translate(this, msg) ) + return true; +#endif // wxUSE_MENUS && wxUSE_ACCEL + + // finally, check for MDI specific built-in accelerators if ( pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN ) { if ( ::TranslateMDISysAccel(GetWinHwnd(GetClientWindow()), pMsg)) @@ -734,12 +797,12 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, 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; @@ -788,7 +851,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, if ( !m_hWnd ) { - wxLogLastError(_T("WM_MDICREATE")); + wxLogLastError(wxT("WM_MDICREATE")); return false; } @@ -844,6 +907,14 @@ bool wxMDIChildFrame::Show(bool show) 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) @@ -928,8 +999,6 @@ void wxMDIChildFrame::InternalSetMenuBar() MDIInsertWindowMenu(parent->GetClientWindow(), m_hMenu, GetMDIWindowMenu(parent)); - - parent->m_parentFrameActive = false; } void wxMDIChildFrame::DetachMenuBar() @@ -974,6 +1043,11 @@ void wxMDIChildFrame::Activate() 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); } @@ -984,25 +1058,14 @@ void wxMDIChildFrame::Activate() // --------------------------------------------------------------------------- WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message, - WXWPARAM wParam, - WXLPARAM lParam) + WXWPARAM wParam, + WXLPARAM lParam) { WXLRESULT rc = 0; bool processed = false; switch ( message ) { - case WM_COMMAND: - { - WORD id, cmd; - WXHWND hwnd; - UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam, - &id, &hwnd, &cmd); - - processed = HandleCommand(id, cmd, (WXHWND)hwnd); - } - break; - case WM_GETMINMAXINFO: processed = HandleGetMinMaxInfo((MINMAXINFO *)lParam); break; @@ -1029,11 +1092,6 @@ WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message, MSWDefWindowProc(message, wParam, lParam); break; - case WM_SYSCOMMAND: - // DefMDIChildProc handles SC_{NEXT/PREV}WINDOW here, so pass it - // the message (the base class version does not) - return MSWDefWindowProc(message, wParam, lParam); - case WM_WINDOWPOSCHANGING: processed = HandleWindowPosChanging((LPWINDOWPOS)lParam); break; @@ -1045,81 +1103,39 @@ WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message, return rc; } -bool wxMDIChildFrame::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND hwnd) -{ - // sign extend to int from short before comparing with the other int ids - int id = (signed short)id_; - - // In case it's e.g. a toolbar. - if ( hwnd ) - { - wxWindow *win = wxFindWinFromHandle(hwnd); - if (win) - return win->MSWCommand(cmd, id); - } - - if (wxCurrentPopupMenu) - { - wxMenu *popupMenu = wxCurrentPopupMenu; - wxCurrentPopupMenu = NULL; - if (popupMenu->MSWCommand(cmd, id)) - return true; - } - - bool processed; - if (GetMenuBar() && GetMenuBar()->FindItem(id)) - { - processed = ProcessCommand(id); - } - else - { - processed = false; - } - - return processed; -} - bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), WXHWND hwndAct, WXHWND hwndDeact) { wxMDIParentFrame * const parent = GetMDIParent(); - HMENU menuToSet = 0; + WXHMENU hMenuToSet = 0; bool activated; if ( m_hWnd == hwndAct ) { activated = true; - parent->m_currentChild = this; - - HMENU child_menu = (HMENU)GetWinMenu(); - if ( child_menu ) - { - parent->m_parentFrameActive = false; + parent->SetActiveChild(this); - menuToSet = child_menu; - } + WXHMENU hMenuChild = m_hMenu; + if ( hMenuChild ) + hMenuToSet = hMenuChild; } else if ( m_hWnd == hwndDeact ) { - wxASSERT_MSG( parent->m_currentChild == this, + wxASSERT_MSG( parent->GetActiveChild() == this, wxT("can't deactivate MDI child which wasn't active!") ); activated = false; - parent->m_currentChild = NULL; + parent->SetActiveChild(NULL); - HMENU parent_menu = (HMENU)parent->GetWinMenu(); + 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 ( parent_menu && !hwndAct ) - { - parent->m_parentFrameActive = true; - - menuToSet = parent_menu; - } + if ( hMenuParent && !hwndAct ) + hMenuToSet = hMenuParent; } else { @@ -1127,16 +1143,16 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), return false; } - if ( menuToSet ) + if ( hMenuToSet ) { MDISetMenu(parent->GetClientWindow(), - menuToSet, GetMDIWindowMenu(parent)); + (HMENU)hMenuToSet, GetMDIWindowMenu(parent)); } wxActivateEvent event(wxEVT_ACTIVATE, activated, m_windowId); event.SetEventObject( this ); - ResetWindowStyle((void *)NULL); + ResetWindowStyle(NULL); return HandleWindowEvent(event); } @@ -1369,7 +1385,7 @@ void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeF while (node) { wxWindow *child = node->GetData(); - if (child->IsKindOf(CLASSINFO(wxMDIChildFrame))) + if (wxDynamicCast(child, wxMDIChildFrame)) { ::RedrawWindow(GetHwndOf(child), NULL, @@ -1411,10 +1427,13 @@ void wxMDIChildFrame::OnIdle(wxIdleEvent& event) } // --------------------------------------------------------------------------- -// non member functions +// private helper functions // --------------------------------------------------------------------------- -static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow) +namespace +{ + +void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow) { if ( hmenuFrame || hmenuWindow ) { @@ -1423,11 +1442,11 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow) (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); + } } } @@ -1440,61 +1459,62 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow) ::DrawMenuBar(GetWinHwnd(parent)); } -static void MDIInsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu) +void MDIInsertWindowMenu(wxWindow *win, WXHMENU hMenu, HMENU menuWin) { - // Try to insert Window menu in front of Help, otherwise append it. - HMENU hmenu = (HMENU)menu; + HMENU hmenu = (HMENU)hMenu; - if (subMenu) + if ( menuWin ) { + // Try to insert Window menu in front of Help, otherwise append it. int N = GetMenuItemCount(hmenu); - bool success = false; + bool inserted = false; for ( int i = 0; i < N; i++ ) { wxChar buf[256]; - int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION); - if ( chars == 0 ) + if ( !::GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION) ) { wxLogLastError(wxT("GetMenuString")); continue; } - wxString strBuf(buf); - if ( wxStripMenuCodes(strBuf) == wxGetStockLabel(wxID_HELP,false) ) + const wxString label = wxStripMenuCodes(buf); + if ( label == wxGetStockLabel(wxID_HELP, wxSTOCK_NOFLAGS) ) { - success = true; + inserted = true; ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING, - (UINT_PTR)subMenu, _("&Window").wx_str()); + (UINT_PTR)menuWin, + wxString(wxGetTranslation(WINDOW_MENU_LABEL)).t_str()); break; } } - if ( !success ) + if ( !inserted ) { ::AppendMenu(hmenu, MF_POPUP, - (UINT_PTR)subMenu, _("&Window").wx_str()); + (UINT_PTR)menuWin, + wxString(wxGetTranslation(WINDOW_MENU_LABEL)).t_str()); } } - MDISetMenu(win, hmenu, subMenu); + MDISetMenu(win, hmenu, menuWin); } -static void MDIRemoveWindowMenu(wxWindow *win, WXHMENU menu) +void MDIRemoveWindowMenu(wxWindow *win, WXHMENU hMenu) { - HMENU hMenu = (HMENU)menu; + HMENU hmenu = (HMENU)hMenu; - if ( hMenu ) + if ( hmenu ) { wxChar buf[1024]; - int N = ::GetMenuItemCount(hMenu); + int N = ::GetMenuItemCount(hmenu); for ( int i = 0; i < N; i++ ) { - if ( !::GetMenuString(hMenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION) ) + if ( !::GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION) ) { // Ignore successful read of menu string with length 0 which - // occurs, for example, for a maximized MDI childs system menu + // occurs, for example, for a maximized MDI child system menu if ( ::GetLastError() != 0 ) { wxLogLastError(wxT("GetMenuString")); @@ -1503,9 +1523,9 @@ static void MDIRemoveWindowMenu(wxWindow *win, WXHMENU menu) continue; } - if ( wxStrcmp(buf, _("&Window")) == 0 ) + if ( wxStrcmp(buf, wxGetTranslation(WINDOW_MENU_LABEL)) == 0 ) { - if ( !::RemoveMenu(hMenu, i, MF_BYPOSITION) ) + if ( !::RemoveMenu(hmenu, i, MF_BYPOSITION) ) { wxLogLastError(wxT("RemoveMenu")); } @@ -1518,11 +1538,11 @@ static void MDIRemoveWindowMenu(wxWindow *win, WXHMENU menu) if ( win ) { // we don't change the windows menu, but we update the main one - MDISetMenu(win, hMenu, NULL); + MDISetMenu(win, hmenu, NULL); } } -static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam, +void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam, WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact) { *activate = true; @@ -1530,4 +1550,6 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam, *hwndDeact = (WXHWND)wParam; } +} // anonymous namespace + #endif // wxUSE_MDI && !defined(__WXUNIVERSAL__)