X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1483e5db8d719803c2d04984fd5ad85176964e16..1680c3561bc4f44c63a026e0d1a5324a39336156:/src/msw/mdi.cpp?ds=sidebyside diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 2d6109b3db..6dbb49ea1a 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -55,13 +55,19 @@ extern wxMenu *wxCurrentPopupMenu; extern void wxRemoveHandleAssociation(wxWindow *win); +namespace +{ + // --------------------------------------------------------------------------- // constants // --------------------------------------------------------------------------- // 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; +const int wxFIRST_MDI_CHILD = 4100; +const int wxLAST_MDI_CHILD = 4600; + +// The MDI "Window" menu label +const char *WINDOW_MENU_LABEL = gettext_noop("&Window"); // --------------------------------------------------------------------------- // private functions @@ -69,29 +75,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); +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 // =========================================================================== @@ -130,6 +138,14 @@ END_EVENT_TABLE() // 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, @@ -154,11 +170,6 @@ bool wxMDIParentFrame::Create(wxWindow *parent, 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); @@ -178,7 +189,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent, msflags &= ~WS_VSCROLL; msflags &= ~WS_HSCROLL; - if ( !wxWindow::MSWCreate(wxApp::GetRegisteredClassName(_T("wxMDIFrame")), + if ( !wxWindow::MSWCreate(wxApp::GetRegisteredClassName(wxT("wxMDIFrame")), title.wx_str(), pos, size, msflags, @@ -358,8 +369,7 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu) } #if wxUSE_ACCEL - delete m_accelWindowMenu; - m_accelWindowMenu = NULL; + wxDELETE(m_accelWindowMenu); if ( menu && menu->HasAccels() ) m_accelWindowMenu = menu->CreateAccelTable(); @@ -398,14 +408,17 @@ void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu) } } -const wxMenuItem *wxMDIParentFrame::FindItemInMenuBar(int menuId) const +wxMenuItem *wxMDIParentFrame::FindItemInMenuBar(int menuId) const { - const wxMenuItem *item = wxFrame::FindItemInMenuBar(menuId); + wxMenuItem *item = wxFrame::FindItemInMenuBar(menuId); if ( !item && GetActiveChild() ) { item = GetActiveChild()->FindItemInMenuBar(menuId); } + if ( !item && m_windowMenu ) + item = m_windowMenu->FindItem(menuId); + return item; } @@ -484,7 +497,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 @@ -511,8 +524,8 @@ void wxMDIParentFrame::ActivatePrevious() // --------------------------------------------------------------------------- WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message, - WXWPARAM wParam, - WXLPARAM lParam) + WXWPARAM wParam, + WXLPARAM lParam) { WXLRESULT rc = 0; bool processed = false; @@ -530,22 +543,22 @@ 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 ( cmd == 0 /* menu */ && + id >= SC_SIZE /* first system menu command */ ) + { + MSWDefWindowProc(message, wParam, lParam); + processed = true; + } } - - // 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: @@ -560,18 +573,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 ) @@ -675,24 +676,20 @@ void wxMDIParentFrame::OnMDICommand(wxCommandEvent& event) ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, lParam); } -wxMenuItem *wxMDIParentFrame::MSWFindMenuBarItem(WXWORD id) -{ - wxMenuItem *mitem = wxFrame::MSWFindMenuBarItem(id); - if ( !mitem && m_windowMenu ) - mitem = m_windowMenu->FindItem((signed short)id); - - return mitem; -} - #endif // wxUSE_MENUS -bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) +bool wxMDIParentFrame::TryBefore(wxEvent& event) { - wxMDIChildFrame * const child = GetActiveChild(); - if ( child && child->HandleCommand(id, cmd, hwnd) ) - return true; + // 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->ProcessWindowEventLocally(event) ) + return true; + } - return wxFrame::HandleCommand(id, cmd, hwnd); + return wxMDIParentFrameBase::TryBefore(event); } WXLRESULT wxMDIParentFrame::MSWDefWindowProc(WXUINT message, @@ -730,7 +727,7 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg) // 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->Translate(this, msg) ) + if ( m_accelWindowMenu && m_accelWindowMenu->Translate(this, msg) ) return true; #endif // wxUSE_MENUS && wxUSE_ACCEL @@ -784,7 +781,7 @@ 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(); @@ -838,7 +835,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, if ( !m_hWnd ) { - wxLogLastError(_T("WM_MDICREATE")); + wxLogLastError(wxT("WM_MDICREATE")); return false; } @@ -894,6 +891,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) @@ -1032,8 +1037,8 @@ void wxMDIChildFrame::Activate() // --------------------------------------------------------------------------- WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message, - WXWPARAM wParam, - WXLPARAM lParam) + WXWPARAM wParam, + WXLPARAM lParam) { WXLRESULT rc = 0; bool processed = false; @@ -1066,11 +1071,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; @@ -1111,7 +1111,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), 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; @@ -1406,10 +1406,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 ) { @@ -1418,11 +1421,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); + } } } @@ -1435,61 +1438,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)).wx_str()); break; } } - if ( !success ) + if ( !inserted ) { ::AppendMenu(hmenu, MF_POPUP, - (UINT_PTR)subMenu, _("&Window").wx_str()); + (UINT_PTR)menuWin, + wxString(wxGetTranslation(WINDOW_MENU_LABEL)).wx_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")); @@ -1498,9 +1502,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")); } @@ -1513,11 +1517,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; @@ -1525,4 +1529,6 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam, *hwndDeact = (WXHWND)wParam; } +} // anonymous namespace + #endif // wxUSE_MDI && !defined(__WXUNIVERSAL__)