X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e85709e97f9d02b5b670fe92ecbfceb810438c6..fcdd53359135f790b85728c4254b97095a56dad8:/src/msw/mdi.cpp?ds=sidebyside diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 874d23d937..6b9cdbcc9a 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -44,10 +44,6 @@ #include "wx/stockitem.h" #include "wx/msw/private.h" -#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR - #include "wx/msw/statbr95.h" -#endif - #include // --------------------------------------------------------------------------- @@ -56,9 +52,6 @@ extern wxMenu *wxCurrentPopupMenu; -extern const wxChar *wxMDIFrameClassName; // from app.cpp -extern const wxChar *wxMDIChildFrameClassName; -extern const wxChar *wxMDIChildFrameClassNameNoRedraw; extern void wxRemoveHandleAssociation(wxWindow *win); // --------------------------------------------------------------------------- @@ -86,10 +79,10 @@ static 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 InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu); +static void MDIInsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu); // Remove the window menu -static void RemoveWindowMenu(wxWindow *win, WXHMENU menu); +static void MDIRemoveWindowMenu(wxWindow *win, WXHMENU menu); // is this an id of an MDI child? inline bool IsMdiCommandId(int id) @@ -102,6 +95,9 @@ static 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) { wxMenu *menu = frame->GetWindowMenu(); @@ -141,9 +137,6 @@ END_EVENT_TABLE() wxMDIParentFrame::wxMDIParentFrame() { - m_clientWindow = NULL; - m_currentChild = NULL; - m_windowMenu = (wxMenu*) NULL; m_parentFrameActive = true; } @@ -155,17 +148,11 @@ bool wxMDIParentFrame::Create(wxWindow *parent, long style, const wxString& name) { - m_clientWindow = NULL; - m_currentChild = NULL; - // this style can be used to prevent a window from having the standard MDI // "Window" menu - if ( style & wxFRAME_NO_WINDOW_MENU ) - { - m_windowMenu = (wxMenu *)NULL; - } - else // normal case: we have the window menu, so construct it + if ( !(style & wxFRAME_NO_WINDOW_MENU) ) { + // normal case: we have the window menu, so construct it m_windowMenu = new wxMenu; m_windowMenu->Append(IDM_WINDOWCASCADE, _("&Cascade")); @@ -198,8 +185,8 @@ bool wxMDIParentFrame::Create(wxWindow *parent, msflags &= ~WS_VSCROLL; msflags &= ~WS_HSCROLL; - if ( !wxWindow::MSWCreate(wxMDIFrameClassName, - title, + if ( !wxWindow::MSWCreate(wxApp::GetRegisteredClassName(_T("wxMDIFrame")), + title.wx_str(), pos, size, msflags, exflags) ) @@ -227,19 +214,10 @@ wxMDIParentFrame::~wxMDIParentFrame() DestroyChildren(); - if (m_windowMenu) - { - delete m_windowMenu; - m_windowMenu = (wxMenu*) NULL; - } - // the MDI frame menubar is not automatically deleted by Windows unlike for // the normal frames if ( m_hMenu ) - { ::DestroyMenu((HMENU)m_hMenu); - m_hMenu = (WXHMENU)NULL; - } if ( m_clientWindow ) { @@ -251,40 +229,91 @@ wxMDIParentFrame::~wxMDIParentFrame() } } +// ---------------------------------------------------------------------------- +// wxMDIParentFrame child management +// ---------------------------------------------------------------------------- + +int wxMDIParentFrame::GetChildFramesCount() const +{ + int count = 0; + for ( wxWindowList::const_iterator i = GetChildren().begin(); + i != GetChildren().end(); + ++i ) + { + if ( wxDynamicCast(*i, wxMDIChildFrame) ) + count++; + } + + return count; +} + +void wxMDIParentFrame::AddMDIChild(wxMDIChildFrame * WXUNUSED(child)) +{ + if ( GetChildFramesCount() == 1 ) + { + // first MDI child added, we need to insert the window menu now if we + // have it + AddWindowMenu(); + } +} + +void wxMDIParentFrame::RemoveMDIChild(wxMDIChildFrame * WXUNUSED(child)) +{ + if ( GetChildFramesCount() == 1 ) + { + // last MDI child is being removed, remove the now unnecessary window + // menu too + RemoveWindowMenu(); + } +} + +// ---------------------------------------------------------------------------- +// wxMDIParentFrame window menu handling +// ---------------------------------------------------------------------------- + +void wxMDIParentFrame::AddWindowMenu() +{ + if ( m_windowMenu ) + MDIInsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this)); +} + +void wxMDIParentFrame::RemoveWindowMenu() +{ + if ( m_windowMenu ) + MDIRemoveWindowMenu(GetClientWindow(), m_hMenu); +} + #if wxUSE_MENUS_NATIVE void wxMDIParentFrame::InternalSetMenuBar() { m_parentFrameActive = true; - InsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this)); + if ( GetActiveChild() ) + { + AddWindowMenu(); + } + else // we don't have any MDI children yet + { + // wait until we do to add the window menu but do set the main menu for + // now (this is done by AddWindowMenu() as a side effect) + MDISetMenu(GetClientWindow(), (HMENU)m_hMenu, NULL); + } } #endif // wxUSE_MENUS_NATIVE void wxMDIParentFrame::SetWindowMenu(wxMenu* menu) { - if (m_windowMenu) - { - if (GetMenuBar()) - { - // Remove old window menu - RemoveWindowMenu(GetClientWindow(), m_hMenu); - } + // notice that Remove/AddWindowMenu() are safe to call even when + // m_windowMenu is NULL + RemoveWindowMenu(); - delete m_windowMenu; - m_windowMenu = (wxMenu*) NULL; - } + delete m_windowMenu; - if (menu) - { - m_windowMenu = menu; - if (GetMenuBar()) - { - InsertWindowMenu(GetClientWindow(), m_hMenu, - GetHmenuOf(m_windowMenu)); - } - } + m_windowMenu = menu; + + AddWindowMenu(); } void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu) @@ -315,6 +344,17 @@ void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu) } } +const wxMenuItem *wxMDIParentFrame::FindItemInMenuBar(int menuId) const +{ + const wxMenuItem *item = wxFrame::FindItemInMenuBar(menuId); + if ( !item && m_currentChild ) + { + item = m_currentChild->FindItemInMenuBar(menuId); + } + + return item; +} + void wxMDIParentFrame::UpdateClientSize() { if ( GetClientWindow() ) @@ -337,10 +377,8 @@ void wxMDIParentFrame::OnIconized(wxIconizeEvent& event) { event.Skip(); - if ( !event.Iconized() ) - { + if ( !event.IsIconized() ) UpdateClientSize(); - } } // Returns the active MDI child window @@ -350,15 +388,8 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const WM_MDIGETACTIVE, 0, 0L); if ( hWnd == 0 ) return NULL; - else - return (wxMDIChildFrame *)wxFindWinFromHandle((WXHWND) hWnd); -} -// Create the client window class (don't Create the window, just return a new -// class) -wxMDIClientWindow *wxMDIParentFrame::OnCreateClient() -{ - return new wxMDIClientWindow; + return (wxMDIChildFrame *)wxFindWinFromHandle(hWnd); } // Responds to colour changes, and passes event on to children. @@ -475,24 +506,6 @@ WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message, rc = true; break; - case WM_MENUSELECT: - { - WXWORD item, flags; - WXHMENU hmenu; - UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu); - - if ( m_parentFrameActive ) - { - processed = HandleMenuSelect(item, flags, hmenu); - } - else if (m_currentChild) - { - processed = m_currentChild-> - HandleMenuSelect(item, flags, hmenu); - } - } - 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 @@ -522,15 +535,18 @@ bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate { wxActivateEvent event(wxEVT_ACTIVATE, true, m_currentChild->GetId()); event.SetEventObject( m_currentChild ); - if ( m_currentChild->GetEventHandler()->ProcessEvent(event) ) + if ( m_currentChild->HandleWindowEvent(event) ) processed = true; } return processed; } -bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) +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_; + // In case it's e.g. a toolbar. if ( hwnd ) { @@ -608,8 +624,8 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) wxWindow *child = node->GetData(); if ( child->GetHWND() ) { - long childId = wxGetWindowId(child->GetHWND()); - if (childId == (long)id) + int childId = wxGetWindowId(child->GetHWND()); + if ( childId == (signed short)id ) { ::SendMessage( GetWinHwnd(GetClientWindow()), WM_MDIACTIVATE, @@ -696,12 +712,14 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, long style, const wxString& name) { + m_mdiParent = parent; + SetName(name); if ( id != wxID_ANY ) m_windowId = id; else - m_windowId = (int)NewControlId(); + m_windowId = NewControlId(); if ( parent ) { @@ -715,10 +733,13 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, MDICREATESTRUCT mcs; - mcs.szClass = style & wxFULL_REPAINT_ON_RESIZE - ? wxMDIChildFrameClassName - : wxMDIChildFrameClassNameNoRedraw; - mcs.szTitle = title; + wxString className = + wxApp::GetRegisteredClassName(_T("wxMDIChildFrame"), COLOR_WINDOW); + if ( !(style & wxFULL_REPAINT_ON_RESIZE) ) + className += wxApp::GetNoRedrawClassSuffix(); + + mcs.szClass = className.wx_str(); + mcs.szTitle = title.wx_str(); mcs.hOwner = wxGetInstance(); if (x != wxDefaultCoord) mcs.x = x; @@ -763,7 +784,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, wxWindowCreationHook hook(this); m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()), - WM_MDICREATE, 0, (LONG)(LPSTR)&mcs); + WM_MDICREATE, 0, (LPARAM)&mcs); if ( !m_hWnd ) { @@ -773,11 +794,19 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, SubclassWin(m_hWnd); + parent->AddMDIChild(this); + return true; } wxMDIChildFrame::~wxMDIChildFrame() { + // if we hadn't been created, there is nothing to destroy + if ( !m_hWnd ) + return; + + GetMDIParent()->RemoveMDIChild(this); + // will be destroyed by DestroyChildren() but reset them before calling it // to avoid using dangling pointers if a callback comes in the meanwhile #if wxUSE_TOOLBAR @@ -789,7 +818,7 @@ wxMDIChildFrame::~wxMDIChildFrame() DestroyChildren(); - RemoveWindowMenu(NULL, m_hMenu); + MDIRemoveWindowMenu(NULL, m_hMenu); MSWDestroyWindow(); } @@ -809,7 +838,7 @@ bool wxMDIChildFrame::Show(bool show) // we need to refresh the MDI frame window menu to include (or exclude if // we've been hidden) this frame - wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); + wxMDIParentFrame * const parent = GetMDIParent(); MDISetMenu(parent->GetClientWindow(), NULL, NULL); return true; @@ -848,15 +877,15 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height) // If there's an MDI parent, must subtract the parent's top left corner // since MoveWindow moves relative to the parent - wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent(); - ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point); + wxMDIParentFrame * const mdiParent = GetMDIParent(); + ::ScreenToClient(GetHwndOf(mdiParent->GetClientWindow()), &point); MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)true); wxSize size(width, height); wxSizeEvent event(size, m_windowId); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); } // Unlike other wxTopLevelWindowBase, the mdi child's "GetPosition" is not the @@ -884,8 +913,8 @@ void wxMDIChildFrame::DoGetPosition(int *x, int *y) const // Since we now have the absolute screen coords, // if there's a parent we must subtract its top left corner - wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent(); - ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point); + wxMDIParentFrame * const mdiParent = GetMDIParent(); + ::ScreenToClient(GetHwndOf(mdiParent->GetClientWindow()), &point); if (x) *x = point.x; @@ -895,9 +924,9 @@ void wxMDIChildFrame::DoGetPosition(int *x, int *y) const void wxMDIChildFrame::InternalSetMenuBar() { - wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); + wxMDIParentFrame * const parent = GetMDIParent(); - InsertWindowMenu(parent->GetClientWindow(), + MDIInsertWindowMenu(parent->GetClientWindow(), m_hMenu, GetMDIWindowMenu(parent)); parent->m_parentFrameActive = false; @@ -905,7 +934,7 @@ void wxMDIChildFrame::InternalSetMenuBar() void wxMDIChildFrame::DetachMenuBar() { - RemoveWindowMenu(NULL, m_hMenu); + MDIRemoveWindowMenu(NULL, m_hMenu); wxFrame::DetachMenuBar(); } @@ -921,7 +950,7 @@ WXHICON wxMDIChildFrame::GetDefaultIcon() const void wxMDIChildFrame::Maximize(bool maximize) { - wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); + wxMDIParentFrame * const parent = GetMDIParent(); if ( parent && parent->GetClientWindow() ) { ::SendMessage(GetWinHwnd(parent->GetClientWindow()), @@ -932,7 +961,7 @@ void wxMDIChildFrame::Maximize(bool maximize) void wxMDIChildFrame::Restore() { - wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); + wxMDIParentFrame * const parent = GetMDIParent(); if ( parent && parent->GetClientWindow() ) { ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIRESTORE, @@ -942,7 +971,7 @@ void wxMDIChildFrame::Restore() void wxMDIChildFrame::Activate() { - wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); + wxMDIParentFrame * const parent = GetMDIParent(); if ( parent && parent->GetClientWindow() ) { ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIACTIVATE, @@ -1016,8 +1045,11 @@ WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message, return rc; } -bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) +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 ) { @@ -1051,7 +1083,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), WXHWND hwndAct, WXHWND hwndDeact) { - wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); + wxMDIParentFrame * const parent = GetMDIParent(); HMENU menuToSet = 0; @@ -1106,7 +1138,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), ResetWindowStyle((void *)NULL); - return GetEventHandler()->ProcessEvent(event); + return HandleWindowEvent(event); } bool wxMDIChildFrame::HandleWindowPosChanging(void *pos) @@ -1175,7 +1207,7 @@ bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg) { // we must pass the parent frame to ::TranslateAccelerator(), otherwise it // doesn't do its job correctly for MDI child menus - return MSWDoTranslateMessage((wxMDIChildFrame *)GetParent(), msg); + return MSWDoTranslateMessage(GetMDIParent(), msg); } // --------------------------------------------------------------------------- @@ -1184,7 +1216,7 @@ bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg) void wxMDIChildFrame::MSWDestroyWindow() { - wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); + wxMDIParentFrame * const parent = GetMDIParent(); // Must make sure this handle is invalidated (set to NULL) since all sorts // of things could happen after the child client is destroyed, but before @@ -1194,8 +1226,8 @@ void wxMDIChildFrame::MSWDestroyWindow() SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIDESTROY, (WPARAM)oldHandle, 0); - if (parent->GetActiveChild() == (wxMDIChildFrame*) NULL) - ResetWindowStyle((void*) NULL); + if (parent->GetActiveChild() == NULL) + ResetWindowStyle(NULL); if (m_hMenu) { @@ -1211,7 +1243,7 @@ void wxMDIChildFrame::MSWDestroyWindow() bool wxMDIChildFrame::ResetWindowStyle(void *vrect) { RECT *rect = (RECT *)vrect; - wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent(); + wxMDIParentFrame * const pFrameWnd = GetMDIParent(); wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild(); if (!pChild || (pChild == this)) @@ -1391,7 +1423,11 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow) (WPARAM)hmenuFrame, (LPARAM)hmenuWindow) ) { - wxLogLastError(_T("SendMessage(WM_MDISETMENU)")); +#ifdef __WXDEBUG__ + DWORD err = ::GetLastError(); + if ( err ) + wxLogApiError(_T("SendMessage(WM_MDISETMENU)"), err); +#endif // __WXDEBUG__ } } @@ -1404,7 +1440,7 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow) ::DrawMenuBar(GetWinHwnd(parent)); } -static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu) +static void MDIInsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu) { // Try to insert Window menu in front of Help, otherwise append it. HMENU hmenu = (HMENU)menu; @@ -1429,21 +1465,22 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu) { success = true; ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING, - (UINT)subMenu, _("&Window")); + (UINT_PTR)subMenu, _("&Window").wx_str()); break; } } if ( !success ) { - ::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, _("&Window")); + ::AppendMenu(hmenu, MF_POPUP, + (UINT_PTR)subMenu, _("&Window").wx_str()); } } MDISetMenu(win, hmenu, subMenu); } -static void RemoveWindowMenu(wxWindow *win, WXHMENU menu) +static void MDIRemoveWindowMenu(wxWindow *win, WXHMENU menu) { HMENU hMenu = (HMENU)menu;