X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2917e9204382ec1ecc96de7fc98bd3068da2233c..889f0b7c67f207f230d8bf9f558ae35445d57e10:/src/msw/mdi.cpp diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 950de37d67..b0ede88e4e 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: mdi.cpp -// Purpose: MDI classes +// Name: src/msw/mdi.cpp +// Purpose: MDI classes for wxMSW // Author: Julian Smart // Modified by: // Created: 04/01/98 @@ -35,17 +35,25 @@ #include "wx/app.h" #include "wx/utils.h" #include "wx/dialog.h" - #include "wx/statusbr.h" + #if wxUSE_STATUSBAR + #include "wx/statusbr.h" + #endif #include "wx/settings.h" + #include "wx/intl.h" + #include "wx/log.h" #endif #include "wx/mdi.h" #include "wx/msw/private.h" -#if wxUSE_NATIVE_STATUSBAR - #include +#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR + #include "wx/msw/statbr95.h" #endif +#if wxUSE_TOOLBAR + #include "wx/toolbar.h" +#endif // wxUSE_TOOLBAR + #include // --------------------------------------------------------------------------- @@ -55,11 +63,14 @@ extern wxWindowList wxModelessWindows; // from dialog.cpp extern wxMenu *wxCurrentPopupMenu; -extern char wxMDIFrameClassName[]; -extern char wxMDIChildFrameClassName[]; +extern const wxChar *wxMDIFrameClassName; // from app.cpp +extern const wxChar *wxMDIChildFrameClassName; +extern const wxChar *wxMDIChildFrameClassNameNoRedraw; + extern wxWindow *wxWndHook; // from window.cpp -extern wxList *wxWinHandleList; +extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win); +extern void wxRemoveHandleAssociation(wxWindow *win); static HWND invalidHandle = 0; @@ -94,6 +105,9 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow); // the very end if not found static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu); +// Remove the window menu +static void RemoveWindowMenu(wxWindow *win, WXHMENU menu); + // is this an id of an MDI child? inline bool IsMdiCommandId(int id) { @@ -111,17 +125,19 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam, // wxWin macros // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame) - IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame) - IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow) -#endif // USE_SHARED_LIBRARY +IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame) +IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame) +IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow) BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame) EVT_SIZE(wxMDIParentFrame::OnSize) EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged) END_EVENT_TABLE() +BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame) + EVT_IDLE(wxMDIChildFrame::OnIdle) +END_EVENT_TABLE() + BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow) EVT_SCROLL(wxMDIClientWindow::OnScroll) END_EVENT_TABLE() @@ -135,7 +151,7 @@ wxMDIParentFrame::wxMDIParentFrame() { m_clientWindow = NULL; m_currentChild = NULL; - m_windowMenu = 0; + m_windowMenu = (wxMenu*) NULL; m_parentFrameActive = TRUE; } @@ -147,11 +163,31 @@ bool wxMDIParentFrame::Create(wxWindow *parent, long style, const wxString& name) { - m_defaultIcon = (WXHICON) (wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON : wxDEFAULT_MDIPARENTFRAME_ICON); + m_defaultIcon = (WXHICON) (wxSTD_MDIPARENTFRAME_ICON + ? wxSTD_MDIPARENTFRAME_ICON + : wxDEFAULT_MDIPARENTFRAME_ICON); m_clientWindow = NULL; m_currentChild = NULL; - m_windowMenu = 0; + + // 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 + { + 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->AppendSeparator(); + m_windowMenu->Append(IDM_WINDOWICONS, _("&Arrange Icons")); + m_windowMenu->Append(IDM_WINDOWNEXT, _("&Next")); + } + m_parentFrameActive = TRUE; if (!parent) @@ -172,8 +208,6 @@ bool wxMDIParentFrame::Create(wxWindow *parent, int width = size.x; int height = size.y; - m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), "wxWindowMenu"); - DWORD msflags = WS_OVERLAPPED; if (style & wxMINIMIZE_BOX) msflags |= WS_MINIMIZEBOX; @@ -190,25 +224,41 @@ bool wxMDIParentFrame::Create(wxWindow *parent, if (style & wxCAPTION) msflags |= WS_CAPTION; - // Adding WS_CLIPCHILDREN causes children not to be properly - // drawn when first displaying them. -// if (style & wxCLIP_CHILDREN) -// msflags |= WS_CLIPCHILDREN; + if (style & wxCLIP_CHILDREN) + msflags |= WS_CLIPCHILDREN; - wxWindow::MSWCreate(m_windowId, parent, wxMDIFrameClassName, this, title, x, y, width, height, - msflags); + if ( !wxWindow::MSWCreate(m_windowId, + parent, + wxMDIFrameClassName, + this, + title, + x, y, width, height, + msflags) ) + { + return FALSE; + } wxModelessWindows.Append(this); + // unlike (almost?) all other windows, frames are created hidden + m_isShown = FALSE; + return TRUE; } wxMDIParentFrame::~wxMDIParentFrame() { DestroyChildren(); + // already delete by DestroyChildren() + m_frameToolBar = NULL; + m_frameStatusBar = NULL; - ::DestroyMenu((HMENU)m_windowMenu); - m_windowMenu = 0; + // ::DestroyMenu((HMENU)m_windowMenu); + if (m_windowMenu) + { + delete m_windowMenu; + m_windowMenu = (wxMenu*) NULL; + } if ( m_clientWindow ) { @@ -222,14 +272,42 @@ wxMDIParentFrame::~wxMDIParentFrame() void wxMDIParentFrame::InternalSetMenuBar() { - HMENU subMenu = GetSubMenu((HMENU) m_windowMenu, 0); +// HMENU subMenu = GetSubMenu((HMENU) m_windowMenu, 0); m_parentFrameActive = TRUE; + HMENU subMenu = (HMENU) 0; + if (GetWindowMenu()) + subMenu = (HMENU) GetWindowMenu()->GetHMenu(); + InsertWindowMenu(GetClientWindow(), m_hMenu, subMenu); } -void wxMDIParentFrame::OnSize(wxSizeEvent& event) +void wxMDIParentFrame::SetWindowMenu(wxMenu* menu) +{ + if (m_windowMenu) + { + if (GetMenuBar()) + { + // Remove old window menu + RemoveWindowMenu(GetClientWindow(), m_hMenu); + } + + delete m_windowMenu; + m_windowMenu = (wxMenu*) NULL; + } + if (menu) + { + m_windowMenu = menu; + if (GetMenuBar()) + { + InsertWindowMenu(GetClientWindow(), m_hMenu, + GetHmenuOf(m_windowMenu)); + } + } +} + +void wxMDIParentFrame::OnSize(wxSizeEvent&) { if ( GetClientWindow() ) { @@ -336,6 +414,10 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message, // so pretend we processed the message anyhow processed = TRUE; } + + // always pass this message DefFrameProc(), otherwise MDI menu + // commands (and sys commands - more surprizingly!) won't work + MSWDefWindowProc(message, wParam, lParam); break; case WM_CREATE: @@ -375,6 +457,12 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message, } } break; + + case WM_SIZE: + // as we don't (usually) resize the MDI client to exactly fit the + // client area (we put it below the toolbar, above statusbar &c), + // we should not pass this one to DefFrameProc + break; } if ( !processed ) @@ -472,7 +560,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) if ( child->GetHWND() ) { long childId = wxGetWindowId(child->GetHWND()); - if (childId == id) + if (childId == (long)id) { ::SendMessage( GetWinHwnd(GetClientWindow()), WM_MDIACTIVATE, @@ -495,8 +583,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) { // 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(_T("MDI parent frame is not active, " - "yet there is no active MDI child?")); + wxFAIL_MSG(wxT("MDI parent frame is not active, yet there is no active MDI child?")); } return FALSE; @@ -519,20 +606,20 @@ 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) ) { return TRUE; } - if ( m_acceleratorTable.Ok() && - ::TranslateAccelerator(GetHwnd(), - GetTableHaccel(m_acceleratorTable), - pMsg) ) + // then try out accel table (will also check the menu accels) + if ( wxFrame::MSWTranslateMessage(msg) ) { return TRUE; } + // finally, check for MDI specific built in accel keys if ( pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN ) { if ( ::TranslateMDISysAccel(GetWinHwnd(GetClientWindow()), pMsg)) @@ -546,8 +633,9 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg) // wxMDIChildFrame // =========================================================================== -wxMDIChildFrame::wxMDIChildFrame() +void wxMDIChildFrame::Init() { + m_needsResize = TRUE; } bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, @@ -582,7 +670,9 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, MDICREATESTRUCT mcs; - mcs.szClass = wxMDIChildFrameClassName; + mcs.szClass = style & wxNO_FULL_REPAINT_ON_RESIZE + ? wxMDIChildFrameClassNameNoRedraw + : wxMDIChildFrameClassName; mcs.szTitle = title; mcs.hOwner = wxGetInstance(); if (x > -1) @@ -605,7 +695,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, else mcs.cy = CW_USEDEFAULT; - DWORD msflags = WS_OVERLAPPED | WS_CLIPCHILDREN; + DWORD msflags = WS_OVERLAPPED | WS_CLIPCHILDREN | WS_THICKFRAME; if (style & wxMINIMIZE_BOX) msflags |= WS_MINIMIZEBOX; if (style & wxMAXIMIZE_BOX) @@ -625,27 +715,28 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, mcs.lParam = 0; - DWORD Return = SendMessage((HWND) parent->GetClientWindow()->GetHWND(), - WM_MDICREATE, 0, (LONG)(LPSTR)&mcs); - - //handle = (HWND)LOWORD(Return); - // Must be the DWORRD for WIN32. And in 16 bits, HIWORD=0 (says Microsoft) - m_hWnd = (WXHWND)Return; - - // This gets reassigned so can't be stored -// m_windowId = GetWindowLong((HWND) m_hWnd, GWL_ID); + m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()), + WM_MDICREATE, 0, (LONG)(LPSTR)&mcs); wxWndHook = NULL; - wxWinHandleList->Append((long)GetHWND(), this); + wxAssociateWinWithHandle((HWND) GetHWND(), this); - SetWindowLong((HWND) GetHWND(), 0, (long)this); + // VZ: what's this? an act of piracy? + //SetWindowLong(GetHwnd(), 0, (long)this); wxModelessWindows.Append(this); + return TRUE; } wxMDIChildFrame::~wxMDIChildFrame() { + DestroyChildren(); + + // already delete by DestroyChildren() + m_frameToolBar = NULL; + m_frameStatusBar = NULL; + MSWDestroyWindow(); } @@ -653,7 +744,7 @@ wxMDIChildFrame::~wxMDIChildFrame() // to wxWindows) void wxMDIChildFrame::DoSetClientSize(int width, int height) { - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); RECT rect; ::GetClientRect(hWnd, &rect); @@ -667,7 +758,7 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height) int actual_width = rect2.right - rect2.left - rect.right + width; int actual_height = rect2.bottom - rect2.top - rect.bottom + height; - if (GetStatusBar()) + if (GetStatusBar() && GetStatusBar()->IsShown()) { int sx, sy; GetStatusBar()->GetSize(&sx, &sy); @@ -693,7 +784,7 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height) void wxMDIChildFrame::DoGetPosition(int *x, int *y) const { RECT rect; - GetWindowRect((HWND) GetHWND(), &rect); + GetWindowRect(GetHwnd(), &rect); POINT point; point.x = rect.left; point.y = rect.top; @@ -711,7 +802,10 @@ void wxMDIChildFrame::InternalSetMenuBar() { wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); - HMENU subMenu = GetSubMenu((HMENU)parent->GetWindowMenu(), 0); + // HMENU subMenu = GetSubMenu((HMENU)parent->GetWindowMenu(), 0); + HMENU subMenu = (HMENU) 0; + if (parent->GetWindowMenu()) + subMenu = (HMENU) parent->GetWindowMenu()->GetHMenu(); InsertWindowMenu(parent->GetClientWindow(), m_hMenu, subMenu); @@ -722,25 +816,35 @@ void wxMDIChildFrame::InternalSetMenuBar() // MDI operations // --------------------------------------------------------------------------- -void wxMDIChildFrame::Maximize() +void wxMDIChildFrame::Maximize(bool maximize) { wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); if ( parent && parent->GetClientWindow() ) - ::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIMAXIMIZE, (WPARAM) (HWND) GetHWND(), 0); + { + ::SendMessage(GetWinHwnd(parent->GetClientWindow()), + maximize ? WM_MDIMAXIMIZE : WM_MDIRESTORE, + (WPARAM)GetHwnd(), 0); + } } void wxMDIChildFrame::Restore() { wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); if ( parent && parent->GetClientWindow() ) - ::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIRESTORE, (WPARAM) (HWND) GetHWND(), 0); + { + ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIRESTORE, + (WPARAM) GetHwnd(), 0); + } } void wxMDIChildFrame::Activate() { wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); if ( parent && parent->GetClientWindow() ) - ::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIACTIVATE, (WPARAM) (HWND) GetHWND(), 0); + { + ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIACTIVATE, + (WPARAM) GetHwnd(), 0); + } } // --------------------------------------------------------------------------- @@ -767,10 +871,6 @@ long wxMDIChildFrame::MSWWindowProc(WXUINT message, } break; - case WM_SIZE: - processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam); - break; - case WM_GETMINMAXINFO: // let the default window proc calculate the size of MDI children // frames because it is based on the size of the MDI client window, @@ -785,8 +885,25 @@ long wxMDIChildFrame::MSWWindowProc(WXUINT message, processed = HandleMDIActivate(act, hwndAct, hwndDeact); } + // fall through + + case WM_MOVE: + // must pass WM_MOVE to DefMDIChildProc() to recalculate MDI client + // scrollbars if necessary + + // fall through + + case WM_SIZE: + // must pass WM_SIZE to DefMDIChildProc(), otherwise many weird + // things happen + 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; @@ -798,51 +915,6 @@ long wxMDIChildFrame::MSWWindowProc(WXUINT message, return rc; } -bool wxMDIChildFrame::HandleSize(int x, int y, WXUINT id) -{ - HWND hwnd = GetHwnd(); - - if ( !hwnd || hwnd == invalidHandle ) - { - return FALSE; - } - - switch (id) - { - case SIZEFULLSCREEN: - case SIZENORMAL: - m_iconized = FALSE; - break; - - case SIZEICONIC: - m_iconized = TRUE; - break; - } - - if ( !m_iconized ) - { - // forward WM_SIZE to status bar control -#if wxUSE_NATIVE_STATUSBAR - if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))) - { - wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId()); - event.SetEventObject( m_frameStatusBar ); - - ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event); - } -#endif // wxUSE_NATIVE_STATUSBAR - - PositionStatusBar(); - PositionToolBar(); - - return wxWindow::HandleSize(x, y, id); - } - else - { - return FALSE; - } -} - bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) { // In case it's e.g. a toolbar. @@ -861,15 +933,17 @@ bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) return TRUE; } - if (GetMenuBar() && GetMenuBar()->FindItemForId(id)) + bool processed; + if (GetMenuBar() && GetMenuBar()->FindItem(id)) { - ProcessCommand(id); - return TRUE; + processed = ProcessCommand(id); } else - return FALSE; + { + processed = FALSE; + } - return TRUE; + return processed; } bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), @@ -898,7 +972,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), else if ( m_hWnd == hwndDeact ) { wxASSERT_MSG( parent->m_currentChild == this, - _T("can't deactivate MDI child which wasn't active!") ); + wxT("can't deactivate MDI child which wasn't active!") ); activated = FALSE; parent->m_currentChild = NULL; @@ -913,13 +987,15 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), } else { - // we have nothing to with it + // we have nothing to do with it return FALSE; } if ( menuToSet ) { - HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0); + HMENU subMenu = (HMENU) 0; + if (parent->GetWindowMenu()) + subMenu = (HMENU) parent->GetWindowMenu()->GetHMenu(); MDISetMenu(parent->GetClientWindow(), menuToSet, subMenu); } @@ -927,6 +1003,8 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), wxActivateEvent event(wxEVT_ACTIVATE, activated, m_windowId); event.SetEventObject( this ); + ResetWindowStyle((void *)NULL); + return GetEventHandler()->ProcessEvent(event); } @@ -937,8 +1015,8 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos) if (!(lpPos->flags & SWP_NOSIZE)) { RECT rectClient; - DWORD dwExStyle = ::GetWindowLong((HWND) GetHWND(), GWL_EXSTYLE); - DWORD dwStyle = ::GetWindowLong((HWND) GetHWND(), GWL_STYLE); + DWORD dwExStyle = ::GetWindowLong(GetHwnd(), GWL_EXSTYLE); + DWORD dwStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE); if (ResetWindowStyle((void *) & rectClient) && (dwStyle & WS_MAXIMIZE)) { ::AdjustWindowRectEx(&rectClient, dwStyle, FALSE, dwExStyle); @@ -948,7 +1026,7 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos) lpPos->cy = rectClient.bottom - rectClient.top; } wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent(); - if (pFrameWnd && pFrameWnd->GetToolBar()) + if (pFrameWnd && pFrameWnd->GetToolBar() && pFrameWnd->GetToolBar()->IsShown()) { pFrameWnd->GetToolBar()->Refresh(); } @@ -970,15 +1048,7 @@ long wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXUINT wParam, WXLPARAM l bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg) { - MSG *pMsg = (MSG *)msg; - if ( m_acceleratorTable.Ok() ) - { - return ::TranslateAccelerator(GetWinHwnd(GetParent()), - GetTableHaccel(m_acceleratorTable), - pMsg) != 0; - } - - return FALSE; + return wxFrame::MSWTranslateMessage(msg); } // --------------------------------------------------------------------------- @@ -988,7 +1058,7 @@ bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg) void wxMDIChildFrame::MSWDestroyWindow() { MSWDetachWindowMenu(); - invalidHandle = (HWND) GetHWND(); + invalidHandle = GetHwnd(); wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); @@ -997,11 +1067,12 @@ void wxMDIChildFrame::MSWDestroyWindow() // the wxFrame is destroyed. HWND oldHandle = (HWND)GetHWND(); -#ifdef __WIN32__ - SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (WPARAM)oldHandle, (LPARAM)0); -#else - SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (HWND)oldHandle, 0); -#endif + SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIDESTROY, + (WPARAM)oldHandle, 0); + + if (parent->GetActiveChild() == (wxMDIChildFrame*) NULL) + ResetWindowStyle((void*) NULL); + invalidHandle = 0; if (m_hMenu) @@ -1009,6 +1080,7 @@ void wxMDIChildFrame::MSWDestroyWindow() ::DestroyMenu((HMENU) m_hMenu); m_hMenu = 0; } + wxRemoveHandleAssociation(this); m_hWnd = 0; } @@ -1022,25 +1094,31 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect) wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild(); if (!pChild || (pChild == this)) { - DWORD dwStyle = ::GetWindowLong((HWND) pFrameWnd->GetClientWindow()->GetHWND(), GWL_EXSTYLE); - DWORD dwThisStyle = ::GetWindowLong((HWND) GetHWND(), GWL_STYLE); + HWND hwndClient = GetWinHwnd(pFrameWnd->GetClientWindow()); + DWORD dwStyle = ::GetWindowLong(hwndClient, GWL_EXSTYLE); + + // we want to test whether there is a maximized child, so just set + // dwThisStyle to 0 if there is no child at all + DWORD dwThisStyle = pChild + ? ::GetWindowLong(GetWinHwnd(pChild), GWL_STYLE) : 0; DWORD dwNewStyle = dwStyle; - if (pChild != NULL && (dwThisStyle & WS_MAXIMIZE)) + if ( dwThisStyle & WS_MAXIMIZE ) dwNewStyle &= ~(WS_EX_CLIENTEDGE); else dwNewStyle |= WS_EX_CLIENTEDGE; if (dwStyle != dwNewStyle) { - HWND hwnd = GetWinHwnd(pFrameWnd->GetClientWindow()); - ::RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN); - ::SetWindowLong(hwnd, GWL_EXSTYLE, dwNewStyle); - ::SetWindowPos(hwnd, NULL, 0, 0, 0, 0, + // force update of everything + ::RedrawWindow(hwndClient, NULL, NULL, + RDW_INVALIDATE | RDW_ALLCHILDREN); + ::SetWindowLong(hwndClient, GWL_EXSTYLE, dwNewStyle); + ::SetWindowPos(hwndClient, NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOCOPYBITS); if (rect) - ::GetClientRect(hwnd, rect); + ::GetClientRect(hwndClient, rect); return TRUE; } @@ -1063,10 +1141,14 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) m_windowStyle = style; m_parent = parent; - ccs.hWindowMenu = (HMENU)parent->GetWindowMenu(); + ccs.hWindowMenu = (HMENU) 0; + if (parent->GetWindowMenu()) + ccs.hWindowMenu = (HMENU) parent->GetWindowMenu()->GetHMenu(); ccs.idFirstChild = wxFIRST_MDI_CHILD; - DWORD msStyle = WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN; + DWORD msStyle = MDIS_ALLCHILDSTYLES | WS_VISIBLE | WS_CHILD | + WS_CLIPCHILDREN | WS_CLIPSIBLINGS; + if ( style & wxHSCROLL ) msStyle |= WS_HSCROLL; if ( style & wxVSCROLL ) @@ -1082,7 +1164,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) m_hWnd = (WXHWND)::CreateWindowEx ( exStyle, - "MDICLIENT", + wxT("MDICLIENT"), NULL, msStyle, 0, 0, 0, 0, @@ -1092,7 +1174,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) (LPSTR)(LPCLIENTCREATESTRUCT)&ccs); if ( !m_hWnd ) { - wxLogLastError("CreateWindowEx(MDI client)"); + wxLogLastError(wxT("CreateWindowEx(MDI client)")); return FALSE; } @@ -1120,6 +1202,54 @@ void wxMDIClientWindow::OnScroll(wxScrollEvent& event) event.Skip(); } +void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) +{ + // Try to fix a problem whereby if you show an MDI child frame, then reposition the + // client area, you can end up with a non-refreshed portion in the client window + // (see OGL studio sample). So check if the position is changed and if so, + // redraw the MDI child frames. + + wxPoint oldPos = GetPosition(); + + wxWindow::DoSetSize(x, y, width, height, sizeFlags); + + wxPoint newPos = GetPosition(); + + if ((newPos.x != oldPos.x) || (newPos.y != oldPos.y)) + { + if (GetParent()) + { + wxNode* node = GetParent()->GetChildren().First(); + while (node) + { + wxWindow* child = (wxWindow*) node->Data(); + if (child->IsKindOf(CLASSINFO(wxMDIChildFrame))) + { + HWND hWnd = (HWND) child->GetHWND(); + ::RedrawWindow(hWnd, NULL, NULL, RDW_FRAME|RDW_ALLCHILDREN|RDW_INVALIDATE ); + } + node = node->Next(); + } + } + } +} + +void wxMDIChildFrame::OnIdle(wxIdleEvent& event) +{ + // MDI child frames get their WM_SIZE when they're constructed but at this + // moment they don't have any children yet so all child windows will be + // positioned incorrectly when they are added later - to fix this, we + // generate an artificial size event here + if ( m_needsResize ) + { + m_needsResize = FALSE; // avoid any possibility of recursion + + SendSizeEvent(); + } + + event.Skip(); +} + // --------------------------------------------------------------------------- // non member functions // --------------------------------------------------------------------------- @@ -1128,14 +1258,19 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow) { ::SendMessage(GetWinHwnd(win), WM_MDISETMENU, #ifdef __WIN32__ - (WPARAM)hmenuFrame, (LPARAM)hmenuWindow); + (WPARAM)hmenuFrame, (LPARAM)hmenuWindow #else - 0, MAKELPARAM(hmenuFrame, hmenuWindow)); + 0, MAKELPARAM(hmenuFrame, hmenuWindow) #endif + ); // update menu bar of the parent window wxWindow *parent = win->GetParent(); - wxCHECK_RET( parent, "MDI client without parent frame? weird..." ); + wxCHECK_RET( parent, wxT("MDI client without parent frame? weird...") ); + +#ifndef __WIN16__ + ::SendMessage(GetWinHwnd(win), WM_MDIREFRESHMENU, 0, 0L); +#endif ::DrawMenuBar(GetWinHwnd(parent)); } @@ -1144,15 +1279,18 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu) { // Try to insert Window menu in front of Help, otherwise append it. HMENU hmenu = (HMENU)menu; + + if (subMenu) + { int N = GetMenuItemCount(hmenu); bool success = FALSE; for ( int i = 0; i < N; i++ ) { - char buf[256]; + wxChar buf[256]; int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION); if ( chars == 0 ) { - wxLogLastError("GetMenuString"); + wxLogLastError(wxT("GetMenuString")); continue; } @@ -1161,7 +1299,7 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu) { success = TRUE; ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING, - (UINT)subMenu, "&Window"); + (UINT)subMenu, _("&Window")); break; } } @@ -1170,10 +1308,38 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu) { ::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, _("&Window")); } + } MDISetMenu(win, hmenu, subMenu); } +static void RemoveWindowMenu(wxWindow *win, WXHMENU menu) +{ + // Try to insert Window menu in front of Help, otherwise append it. + HMENU hmenu = (HMENU)menu; + int N = GetMenuItemCount(hmenu); + for ( int i = 0; i < N; i++ ) + { + wxChar buf[256]; + int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION); + if ( chars == 0 ) + { + wxLogLastError(wxT("GetMenuString")); + + continue; + } + + if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Window")) ) + { + ::RemoveMenu(hmenu, i, MF_BYPOSITION); + break; + } + } + + // Does passing 0 for the window menu really work with WM_MDISETMENU? + MDISetMenu(win, hmenu, 0); +} + static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam, WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact) {