X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b225f65995e9eccefe9b502568b1b8e40629cd1a..bf6d45ebf663a0f31021893d2369a95d96198c8f:/src/msw/mdi.cpp diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 9edbdbf703..7114765e93 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -5,8 +5,8 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // =========================================================================== @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "mdi.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,69 +24,58 @@ #pragma hdrstop #endif +#if wxUSE_MDI && !defined(__WXUNIVERSAL__) + +#include "wx/mdi.h" + #ifndef WX_PRECOMP - #include "wx/setup.h" #include "wx/frame.h" #include "wx/menu.h" #include "wx/app.h" #include "wx/utils.h" #include "wx/dialog.h" - #if wxUSE_STATUSBAR - #include "wx/statusbr.h" - #endif + #include "wx/statusbr.h" #include "wx/settings.h" #include "wx/intl.h" #include "wx/log.h" + #include "wx/toolbar.h" #endif -#include "wx/mdi.h" +#include "wx/stockitem.h" #include "wx/msw/private.h" #if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR #include "wx/msw/statbr95.h" #endif -#if wxUSE_TOOLBAR - #include "wx/toolbar.h" -#endif // wxUSE_TOOLBAR - #include // --------------------------------------------------------------------------- // global variables // --------------------------------------------------------------------------- -extern wxWindowList wxModelessWindows; // from dialog.cpp extern wxMenu *wxCurrentPopupMenu; extern const wxChar *wxMDIFrameClassName; // from app.cpp extern const wxChar *wxMDIChildFrameClassName; extern const wxChar *wxMDIChildFrameClassNameNoRedraw; - -extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win); extern void wxRemoveHandleAssociation(wxWindow *win); -static HWND invalidHandle = 0; - // --------------------------------------------------------------------------- // constants // --------------------------------------------------------------------------- -static const int IDM_WINDOWTILE = 4001; 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; // 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; -// Status border dimensions -static const int wxTHICK_LINE_BORDER = 3; -static const int wxTHICK_LINE_WIDTH = 1; - // --------------------------------------------------------------------------- // private functions // --------------------------------------------------------------------------- @@ -112,9 +97,17 @@ inline bool IsMdiCommandId(int id) return (id >= wxFIRST_MDI_CHILD) && (id <= wxLAST_MDI_CHILD); } +// unpack the parameters of WM_MDIACTIVATE message static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam, WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact); +// return the HMENU of the MDI menu +static inline HMENU GetMDIWindowMenu(wxMDIParentFrame *frame) +{ + wxMenu *menu = frame->GetWindowMenu(); + return menu ? GetHmenuOf(menu) : 0; +} + // =========================================================================== // implementation // =========================================================================== @@ -129,6 +122,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow) BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame) EVT_SIZE(wxMDIParentFrame::OnSize) + EVT_ICONIZE(wxMDIParentFrame::OnIconized) EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged) END_EVENT_TABLE() @@ -150,7 +144,7 @@ wxMDIParentFrame::wxMDIParentFrame() m_clientWindow = NULL; m_currentChild = NULL; m_windowMenu = (wxMenu*) NULL; - m_parentFrameActive = TRUE; + m_parentFrameActive = true; } bool wxMDIParentFrame::Create(wxWindow *parent, @@ -180,9 +174,10 @@ bool wxMDIParentFrame::Create(wxWindow *parent, m_windowMenu->AppendSeparator(); m_windowMenu->Append(IDM_WINDOWICONS, _("&Arrange Icons")); m_windowMenu->Append(IDM_WINDOWNEXT, _("&Next")); + m_windowMenu->Append(IDM_WINDOWPREV, _("&Previous")); } - m_parentFrameActive = TRUE; + m_parentFrameActive = true; if (!parent) wxTopLevelWindows.Append(this); @@ -193,45 +188,59 @@ bool wxMDIParentFrame::Create(wxWindow *parent, if ( parent ) parent->AddChild(this); - if ( id > -1 ) + if ( id != wxID_ANY ) m_windowId = id; else m_windowId = NewControlId(); - long exflags; - long msflags = MSWGetCreateWindowFlags(&exflags); + WXDWORD exflags; + WXDWORD msflags = MSWGetCreateWindowFlags(&exflags); + msflags &= ~WS_VSCROLL; + msflags &= ~WS_HSCROLL; if ( !wxWindow::MSWCreate(wxMDIFrameClassName, - title, + title.wx_str(), pos, size, msflags, exflags) ) { - return FALSE; + return false; } - wxModelessWindows.Append(this); + SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); // unlike (almost?) all other windows, frames are created hidden - m_isShown = FALSE; + m_isShown = false; - return TRUE; + return true; } wxMDIParentFrame::~wxMDIParentFrame() { - DestroyChildren(); - // already delete by DestroyChildren() + // see comment in ~wxMDIChildFrame +#if wxUSE_TOOLBAR m_frameToolBar = NULL; +#endif +#if wxUSE_STATUSBAR m_frameStatusBar = NULL; +#endif // wxUSE_STATUSBAR + + DestroyChildren(); - // ::DestroyMenu((HMENU)m_windowMenu); 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 ) { if ( m_clientWindow->MSWGetOldWndProc() ) @@ -246,12 +255,9 @@ wxMDIParentFrame::~wxMDIParentFrame() void wxMDIParentFrame::InternalSetMenuBar() { - m_parentFrameActive = TRUE; - - wxMenu *menu = GetWindowMenu(); - HMENU subMenu = menu ? GetHmenuOf(menu) : 0; + m_parentFrameActive = true; - InsertWindowMenu(GetClientWindow(), m_hMenu, subMenu); + InsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this)); } #endif // wxUSE_MENUS_NATIVE @@ -269,6 +275,7 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu) delete m_windowMenu; m_windowMenu = (wxMenu*) NULL; } + if (menu) { m_windowMenu = menu; @@ -280,7 +287,46 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu) } } -void wxMDIParentFrame::OnSize(wxSizeEvent&) +void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu) +{ + wxMDIChildFrame *child = GetActiveChild(); + if ( child ) + { + wxEvtHandler* source = child->GetEventHandler(); + wxMenuBar* bar = child->GetMenuBar(); + + if (menu) + { + menu->UpdateUI(source); + } + else + { + if ( bar != NULL ) + { + int nCount = bar->GetMenuCount(); + for (int n = 0; n < nCount; n++) + bar->GetMenu(n)->UpdateUI(source); + } + } + } + else + { + wxFrameBase::DoMenuUpdates(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() ) { @@ -291,6 +337,23 @@ void wxMDIParentFrame::OnSize(wxSizeEvent&) } } +void wxMDIParentFrame::OnSize(wxSizeEvent& WXUNUSED(event)) +{ + UpdateClientSize(); + + // do not call event.Skip() here, it somehow messes up MDI client window +} + +void wxMDIParentFrame::OnIconized(wxIconizeEvent& event) +{ + event.Skip(); + + if ( !event.Iconized() ) + { + UpdateClientSize(); + } +} + // Returns the active MDI child window wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const { @@ -314,7 +377,7 @@ void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event) { if ( m_clientWindow ) { - m_clientWindow->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); + m_clientWindow->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); m_clientWindow->Refresh(); } @@ -323,8 +386,8 @@ void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event) WXHICON wxMDIParentFrame::GetDefaultIcon() const { - return (WXHICON)(wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON - : wxDEFAULT_MDIPARENTFRAME_ICON); + // we don't have any standard icons (any more) + return (WXHICON)0; } // --------------------------------------------------------------------------- @@ -336,10 +399,14 @@ void wxMDIParentFrame::Cascade() ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDICASCADE, 0, 0); } -// TODO: add a direction argument (hor/vert) -void wxMDIParentFrame::Tile() +void wxMDIParentFrame::Tile(wxOrientation orient) { - ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDITILE, MDITILE_HORIZONTAL, 0); + wxASSERT_MSG( orient == wxHORIZONTAL || orient == wxVERTICAL, + _T("invalid orientation value") ); + + ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDITILE, + orient == wxHORIZONTAL ? MDITILE_HORIZONTAL + : MDITILE_VERTICAL, 0); } void wxMDIParentFrame::ArrangeIcons() @@ -361,12 +428,12 @@ void wxMDIParentFrame::ActivatePrevious() // the MDI parent frame window proc // --------------------------------------------------------------------------- -long wxMDIParentFrame::MSWWindowProc(WXUINT message, +WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { - long rc = 0; - bool processed = FALSE; + WXLRESULT rc = 0; + bool processed = false; switch ( message ) { @@ -389,13 +456,13 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message, (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 dud it, + // once again (i.e. call wxFrame::HandleCommand()) - we just did it, // so pretend we processed the message anyhow - processed = TRUE; + processed = true; } // always pass this message DefFrameProc(), otherwise MDI menu - // commands (and sys commands - more surprizingly!) won't work + // commands (and sys commands - more surprisingly!) won't work MSWDefWindowProc(message, wParam, lParam); break; @@ -409,38 +476,19 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message, rc = -1; } - processed = TRUE; + processed = true; break; case WM_ERASEBKGND: - processed = TRUE; + processed = true; // we erase background ourselves - 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); - } - } + rc = true; 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 + // 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; } @@ -452,12 +500,12 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message, bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate) { - bool processed = FALSE; + bool processed = false; if ( wxWindow::HandleActivate(state, minimized, activate) ) { // already processed - processed = TRUE; + processed = true; } // If this window is an MDI parent, we must also send an OnActivate message @@ -465,10 +513,10 @@ bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate if ( (m_currentChild != NULL) && ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)) ) { - wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_currentChild->GetId()); + wxActivateEvent event(wxEVT_ACTIVATE, true, m_currentChild->GetId()); event.SetEventObject( m_currentChild ); if ( m_currentChild->GetEventHandler()->ProcessEvent(event) ) - processed = TRUE; + processed = true; } return processed; @@ -484,8 +532,17 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) return win->MSWCommand(cmd, id); } + if (wxCurrentPopupMenu) + { + wxMenu *popupMenu = wxCurrentPopupMenu; + wxCurrentPopupMenu = NULL; + if (popupMenu->MSWCommand(cmd, id)) + return true; + } + // is it one of standard MDI commands? WXWPARAM wParam = 0; + WXLPARAM lParam = 0; int msg; switch ( id ) { @@ -511,6 +568,12 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) case IDM_WINDOWNEXT: msg = WM_MDINEXT; + lParam = 0; // next child + break; + + case IDM_WINDOWPREV: + msg = WM_MDINEXT; + lParam = 1; // previous child break; default: @@ -519,23 +582,23 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) if ( msg ) { - ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, 0); + ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, lParam); - return TRUE; + return true; } // FIXME VZ: what does this test do?? if (id >= 0xF000) { - return FALSE; // Get WndProc to call default proc + return false; // Get WndProc to call default proc } if ( IsMdiCommandId(id) ) { - wxWindowList::Node* node = GetChildren().GetFirst(); + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); while ( node ) { - wxWindow* child = node->GetData(); + wxWindow *child = node->GetData(); if ( child->GetHWND() ) { long childId = wxGetWindowId(child->GetHWND()); @@ -544,7 +607,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) ::SendMessage( GetWinHwnd(GetClientWindow()), WM_MDIACTIVATE, (WPARAM)child->GetHWND(), 0); - return TRUE; + return true; } } node = node->GetNext(); @@ -565,10 +628,10 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) wxFAIL_MSG(wxT("MDI parent frame is not active, yet there is no active MDI child?")); } - return FALSE; + return false; } -long wxMDIParentFrame::MSWDefWindowProc(WXUINT message, +WXLRESULT wxMDIParentFrame::MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { @@ -589,23 +652,23 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg) if ( m_currentChild && m_currentChild->GetHWND() && m_currentChild->MSWTranslateMessage(msg) ) { - return TRUE; + return true; } // then try out accel table (will also check the menu accels) if ( wxFrame::MSWTranslateMessage(msg) ) { - return TRUE; + 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)) - return TRUE; + return true; } - return FALSE; + return false; } // =========================================================================== @@ -614,7 +677,8 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg) void wxMDIChildFrame::Init() { - m_needsResize = TRUE; + m_needsResize = true; + m_needsInitialShow = true; } bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, @@ -626,9 +690,8 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, const wxString& name) { SetName(name); - wxWindowBase::Show(TRUE); // MDI child frame starts off shown - if ( id > -1 ) + if ( id != wxID_ANY ) m_windowId = id; else m_windowId = (int)NewControlId(); @@ -645,37 +708,37 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, MDICREATESTRUCT mcs; - mcs.szClass = style & wxNO_FULL_REPAINT_ON_RESIZE - ? wxMDIChildFrameClassNameNoRedraw - : wxMDIChildFrameClassName; - mcs.szTitle = title; + mcs.szClass = style & wxFULL_REPAINT_ON_RESIZE + ? wxMDIChildFrameClassName + : wxMDIChildFrameClassNameNoRedraw; + mcs.szTitle = title.wx_str(); mcs.hOwner = wxGetInstance(); - if (x > -1) + if (x != wxDefaultCoord) mcs.x = x; else mcs.x = CW_USEDEFAULT; - if (y > -1) + if (y != wxDefaultCoord) mcs.y = y; else mcs.y = CW_USEDEFAULT; - if (width > -1) + if (width != wxDefaultCoord) mcs.cx = width; else mcs.cx = CW_USEDEFAULT; - if (height > -1) + if (height != wxDefaultCoord) mcs.cy = height; else mcs.cy = CW_USEDEFAULT; - DWORD msflags = WS_OVERLAPPED | WS_CLIPCHILDREN | WS_THICKFRAME | WS_VISIBLE ; + DWORD msflags = WS_OVERLAPPED | WS_CLIPCHILDREN; if (style & wxMINIMIZE_BOX) msflags |= WS_MINIMIZEBOX; if (style & wxMAXIMIZE_BOX) msflags |= WS_MAXIMIZEBOX; - if (style & wxTHICK_FRAME) + if (style & wxRESIZE_BORDER) msflags |= WS_THICKFRAME; if (style & wxSYSTEM_MENU) msflags |= WS_SYSMENU; @@ -695,26 +758,62 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDICREATE, 0, (LONG)(LPSTR)&mcs); - wxAssociateWinWithHandle((HWND) GetHWND(), this); + if ( !m_hWnd ) + { + wxLogLastError(_T("WM_MDICREATE")); + return false; + } - wxModelessWindows.Append(this); + SubclassWin(m_hWnd); - return TRUE; + return true; } wxMDIChildFrame::~wxMDIChildFrame() { - DestroyChildren(); + // if we hadn't been created, there is nothing to destroy + if ( !m_hWnd ) + return; - // already delete by DestroyChildren() + // 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 m_frameToolBar = NULL; +#endif +#if wxUSE_STATUSBAR m_frameStatusBar = NULL; +#endif // wxUSE_STATUSBAR + + DestroyChildren(); + + RemoveWindowMenu(NULL, m_hMenu); MSWDestroyWindow(); } +bool wxMDIChildFrame::Show(bool show) +{ + m_needsInitialShow = false; + + if (!wxFrame::Show(show)) + return false; + + // KH: Without this call, new MDI children do not become active. + // This was added here after the same BringWindowToTop call was + // removed from wxTopLevelWindow::Show (November 2005) + if ( show ) + ::BringWindowToTop(GetHwnd()); + + // we need to refresh the MDI frame window menu to include (or exclude if + // we've been hidden) this frame + wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); + MDISetMenu(parent->GetClientWindow(), NULL, NULL); + + return true; +} + // Set the client size (i.e. leave the calculation of borders etc. -// to wxWindows) +// to wxWidgets) void wxMDIChildFrame::DoSetClientSize(int width, int height) { HWND hWnd = GetHwnd(); @@ -731,12 +830,14 @@ 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 wxUSE_STATUSBAR if (GetStatusBar() && GetStatusBar()->IsShown()) { int sx, sy; GetStatusBar()->GetSize(&sx, &sy); actual_height += sy; } +#endif // wxUSE_STATUSBAR POINT point; point.x = rect2.left; @@ -747,13 +848,29 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height) wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent(); ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point); - MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE); + MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)true); - wxSizeEvent event(wxSize(width, height), m_windowId); + wxSize size(width, height); + wxSizeEvent event(size, m_windowId); event.SetEventObject( this ); GetEventHandler()->ProcessEvent(event); } +// Unlike other wxTopLevelWindowBase, the mdi child's "GetPosition" is not the +// same as its GetScreenPosition +void wxMDIChildFrame::DoGetScreenPosition(int *x, int *y) const +{ + HWND hWnd = GetHwnd(); + + RECT rect; + ::GetWindowRect(hWnd, &rect); + if (x) + *x = rect.left; + if (y) + *y = rect.top; +} + + void wxMDIChildFrame::DoGetPosition(int *x, int *y) const { RECT rect; @@ -767,28 +884,32 @@ void wxMDIChildFrame::DoGetPosition(int *x, int *y) const wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent(); ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point); - *x = point.x; - *y = point.y; + if (x) + *x = point.x; + if (y) + *y = point.y; } void wxMDIChildFrame::InternalSetMenuBar() { wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); - // HMENU subMenu = GetSubMenu((HMENU)parent->GetWindowMenu(), 0); - HMENU subMenu = (HMENU) 0; - if (parent->GetWindowMenu()) - subMenu = (HMENU) parent->GetWindowMenu()->GetHMenu(); + InsertWindowMenu(parent->GetClientWindow(), + m_hMenu, GetMDIWindowMenu(parent)); - InsertWindowMenu(parent->GetClientWindow(), m_hMenu, subMenu); + parent->m_parentFrameActive = false; +} - parent->m_parentFrameActive = FALSE; +void wxMDIChildFrame::DetachMenuBar() +{ + RemoveWindowMenu(NULL, m_hMenu); + wxFrame::DetachMenuBar(); } WXHICON wxMDIChildFrame::GetDefaultIcon() const { - return (WXHICON)(wxSTD_MDICHILDFRAME_ICON ? wxSTD_MDICHILDFRAME_ICON - : wxDEFAULT_MDICHILDFRAME_ICON); + // we don't have any standard icons (any more) + return (WXHICON)0; } // --------------------------------------------------------------------------- @@ -830,12 +951,12 @@ void wxMDIChildFrame::Activate() // MDI window proc and message handlers // --------------------------------------------------------------------------- -long wxMDIChildFrame::MSWWindowProc(WXUINT message, +WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { - long rc = 0; - bool processed = FALSE; + WXLRESULT rc = 0; + bool processed = false; switch ( message ) { @@ -907,7 +1028,7 @@ bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) wxMenu *popupMenu = wxCurrentPopupMenu; wxCurrentPopupMenu = NULL; if (popupMenu->MSWCommand(cmd, id)) - return TRUE; + return true; } bool processed; @@ -917,7 +1038,7 @@ bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) } else { - processed = FALSE; + processed = false; } return processed; @@ -935,13 +1056,13 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), if ( m_hWnd == hwndAct ) { - activated = TRUE; + activated = true; parent->m_currentChild = this; HMENU child_menu = (HMENU)GetWinMenu(); if ( child_menu ) { - parent->m_parentFrameActive = FALSE; + parent->m_parentFrameActive = false; menuToSet = child_menu; } @@ -951,7 +1072,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), wxASSERT_MSG( parent->m_currentChild == this, wxT("can't deactivate MDI child which wasn't active!") ); - activated = FALSE; + activated = false; parent->m_currentChild = NULL; HMENU parent_menu = (HMENU)parent->GetWinMenu(); @@ -960,7 +1081,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), // that has been activated if ( parent_menu && !hwndAct ) { - parent->m_parentFrameActive = TRUE; + parent->m_parentFrameActive = true; menuToSet = parent_menu; } @@ -968,16 +1089,13 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), else { // we have nothing to do with it - return FALSE; + return false; } if ( menuToSet ) { - HMENU subMenu = (HMENU) 0; - if (parent->GetWindowMenu()) - subMenu = (HMENU) parent->GetWindowMenu()->GetHMenu(); - - MDISetMenu(parent->GetClientWindow(), menuToSet, subMenu); + MDISetMenu(parent->GetClientWindow(), + menuToSet, GetMDIWindowMenu(parent)); } wxActivateEvent event(wxEVT_ACTIVATE, activated, m_windowId); @@ -991,7 +1109,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), bool wxMDIChildFrame::HandleWindowPosChanging(void *pos) { WINDOWPOS *lpPos = (WINDOWPOS *)pos; -#if defined(__WIN95__) + if (!(lpPos->flags & SWP_NOSIZE)) { RECT rectClient; @@ -999,21 +1117,15 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos) DWORD dwStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE); if (ResetWindowStyle((void *) & rectClient) && (dwStyle & WS_MAXIMIZE)) { - ::AdjustWindowRectEx(&rectClient, dwStyle, FALSE, dwExStyle); + ::AdjustWindowRectEx(&rectClient, dwStyle, false, dwExStyle); lpPos->x = rectClient.left; lpPos->y = rectClient.top; lpPos->cx = rectClient.right - rectClient.left; lpPos->cy = rectClient.bottom - rectClient.top; } - wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent(); - if (pFrameWnd && pFrameWnd->GetToolBar() && pFrameWnd->GetToolBar()->IsShown()) - { - pFrameWnd->GetToolBar()->Refresh(); - } } -#endif // Win95 - return FALSE; + return false; } bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo) @@ -1025,29 +1137,32 @@ bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo) // not on the values specified in wxWindow m_max variables bool processed = MSWDefWindowProc(WM_GETMINMAXINFO, 0, (LPARAM)mmInfo) != 0; + int minWidth = GetMinWidth(), + minHeight = GetMinHeight(); + // but allow GetSizeHints() to set the min size - if ( m_minWidth != -1 ) + if ( minWidth != wxDefaultCoord ) { - info->ptMinTrackSize.x = m_minWidth; + info->ptMinTrackSize.x = minWidth; - processed = TRUE; + processed = true; } - if ( m_minHeight != -1 ) + if ( minHeight != wxDefaultCoord ) { - info->ptMinTrackSize.y = m_minHeight; + info->ptMinTrackSize.y = minHeight; - processed = TRUE; + processed = true; } - return TRUE; + return processed; } // --------------------------------------------------------------------------- // MDI specific message translation/preprocessing // --------------------------------------------------------------------------- -long wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXUINT wParam, WXLPARAM lParam) +WXLRESULT wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { return DefMDIChildProc(GetHwnd(), (UINT)message, (WPARAM)wParam, (LPARAM)lParam); @@ -1055,7 +1170,9 @@ long wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXUINT wParam, WXLPARAM l bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg) { - return wxFrame::MSWTranslateMessage(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); } // --------------------------------------------------------------------------- @@ -1064,9 +1181,6 @@ bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg) void wxMDIChildFrame::MSWDestroyWindow() { - MSWDetachWindowMenu(); - invalidHandle = GetHwnd(); - wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); // Must make sure this handle is invalidated (set to NULL) since all sorts @@ -1080,8 +1194,6 @@ void wxMDIChildFrame::MSWDestroyWindow() if (parent->GetActiveChild() == (wxMDIChildFrame*) NULL) ResetWindowStyle((void*) NULL); - invalidHandle = 0; - if (m_hMenu) { ::DestroyMenu((HMENU) m_hMenu); @@ -1095,10 +1207,10 @@ void wxMDIChildFrame::MSWDestroyWindow() // style when a child is maximised (a double border looks silly.) bool wxMDIChildFrame::ResetWindowStyle(void *vrect) { -#if defined(__WIN95__) RECT *rect = (RECT *)vrect; wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent(); wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild(); + if (!pChild || (pChild == this)) { HWND hwndClient = GetWinHwnd(pFrameWnd->GetClientWindow()); @@ -1127,12 +1239,11 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect) if (rect) ::GetClientRect(hwndClient, rect); - return TRUE; + return true; } } -#endif // Win95 - return FALSE; + return false; } // =========================================================================== @@ -1142,15 +1253,13 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect) bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) { - m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE); + m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE); CLIENTCREATESTRUCT ccs; m_windowStyle = style; m_parent = parent; - ccs.hWindowMenu = (HMENU) 0; - if (parent->GetWindowMenu()) - ccs.hWindowMenu = (HMENU) parent->GetWindowMenu()->GetHMenu(); + ccs.hWindowMenu = GetMDIWindowMenu(parent); ccs.idFirstChild = wxFIRST_MDI_CHILD; DWORD msStyle = MDIS_ALLCHILDSTYLES | WS_VISIBLE | WS_CHILD | @@ -1161,11 +1270,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) if ( style & wxVSCROLL ) msStyle |= WS_VSCROLL; -#if defined(__WIN95__) DWORD exStyle = WS_EX_CLIENTEDGE; -#else - DWORD exStyle = 0; -#endif wxWindowCreationHook hook(this); m_hWnd = (WXHWND)::CreateWindowEx @@ -1183,12 +1288,12 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) { wxLogLastError(wxT("CreateWindowEx(MDI client)")); - return FALSE; + return false; } SubclassWin(m_hWnd); - return TRUE; + return true; } // Explicitly call default scroll behaviour @@ -1215,26 +1320,30 @@ void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeF // (see OGL studio sample). So check if the position is changed and if so, // redraw the MDI child frames. - wxPoint oldPos = GetPosition(); + const wxPoint oldPos = GetPosition(); - wxWindow::DoSetSize(x, y, width, height, sizeFlags); + wxWindow::DoSetSize(x, y, width, height, sizeFlags | wxSIZE_FORCE); - wxPoint newPos = GetPosition(); + const wxPoint newPos = GetPosition(); if ((newPos.x != oldPos.x) || (newPos.y != oldPos.y)) { if (GetParent()) { - wxNode* node = GetParent()->GetChildren().First(); + wxWindowList::compatibility_iterator node = GetParent()->GetChildren().GetFirst(); while (node) { - wxWindow* child = (wxWindow*) node->Data(); + wxWindow *child = node->GetData(); if (child->IsKindOf(CLASSINFO(wxMDIChildFrame))) { - HWND hWnd = (HWND) child->GetHWND(); - ::RedrawWindow(hWnd, NULL, NULL, RDW_FRAME|RDW_ALLCHILDREN|RDW_INVALIDATE ); + ::RedrawWindow(GetHwndOf(child), + NULL, + NULL, + RDW_FRAME | + RDW_ALLCHILDREN | + RDW_INVALIDATE); } - node = node->Next(); + node = node->GetNext(); } } } @@ -1242,13 +1351,23 @@ void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeF void wxMDIChildFrame::OnIdle(wxIdleEvent& event) { + // wxMSW prior to 2.5.3 created MDI child frames as visible, which resulted + // in flicker e.g. when the frame contained controls with non-trivial + // layout. Since 2.5.3, the frame is created hidden as all other top level + // windows. In order to maintain backward compatibility, the frame is shown + // in OnIdle, unless Show(false) was called by the programmer before. + if ( m_needsInitialShow ) + { + Show(true); + } + // 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 + m_needsResize = false; // avoid any possibility of recursion SendSizeEvent(); } @@ -1262,21 +1381,26 @@ void wxMDIChildFrame::OnIdle(wxIdleEvent& event) static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow) { - ::SendMessage(GetWinHwnd(win), WM_MDISETMENU, -#ifdef __WIN32__ - (WPARAM)hmenuFrame, (LPARAM)hmenuWindow -#else - 0, MAKELPARAM(hmenuFrame, hmenuWindow) -#endif - ); + if ( hmenuFrame || hmenuWindow ) + { + if ( !::SendMessage(GetWinHwnd(win), + WM_MDISETMENU, + (WPARAM)hmenuFrame, + (LPARAM)hmenuWindow) ) + { +#ifdef __WXDEBUG__ + DWORD err = ::GetLastError(); + if ( err ) + wxLogApiError(_T("SendMessage(WM_MDISETMENU)"), err); +#endif // __WXDEBUG__ + } + } // update menu bar of the parent window wxWindow *parent = win->GetParent(); wxCHECK_RET( parent, wxT("MDI client without parent frame? weird...") ); -#ifndef __WIN16__ ::SendMessage(GetWinHwnd(win), WM_MDIREFRESHMENU, 0, 0L); -#endif ::DrawMenuBar(GetWinHwnd(parent)); } @@ -1288,74 +1412,86 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu) if (subMenu) { - int N = GetMenuItemCount(hmenu); - bool success = FALSE; - for ( int i = 0; i < N; i++ ) - { - wxChar buf[256]; - int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION); - if ( chars == 0 ) + int N = GetMenuItemCount(hmenu); + bool success = false; + for ( int i = 0; i < N; i++ ) { - wxLogLastError(wxT("GetMenuString")); + wxChar buf[256]; + int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION); + if ( chars == 0 ) + { + wxLogLastError(wxT("GetMenuString")); - continue; + continue; + } + + wxString strBuf(buf); + if ( wxStripMenuCodes(strBuf) == wxGetStockLabel(wxID_HELP,false) ) + { + success = true; + ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING, + (UINT)subMenu, _("&Window").wx_str()); + break; + } } - if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) ) + if ( !success ) { - success = TRUE; - ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING, - (UINT)subMenu, _("&Window")); - break; + ::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, _("&Window").wx_str()); } } - if ( !success ) - { - ::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++ ) + HMENU hMenu = (HMENU)menu; + + if ( hMenu ) { - wxChar buf[256]; - int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION); - if ( chars == 0 ) + wxChar buf[1024]; + + int N = ::GetMenuItemCount(hMenu); + for ( int i = 0; i < N; i++ ) { - wxLogLastError(wxT("GetMenuString")); + 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 + if ( ::GetLastError() != 0 ) + { + wxLogLastError(wxT("GetMenuString")); + } - continue; - } + continue; + } - if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Window")) ) - { - ::RemoveMenu(hmenu, i, MF_BYPOSITION); - break; + if ( wxStrcmp(buf, _("&Window")) == 0 ) + { + if ( !::RemoveMenu(hMenu, i, MF_BYPOSITION) ) + { + wxLogLastError(wxT("RemoveMenu")); + } + + break; + } } } - // Does passing 0 for the window menu really work with WM_MDISETMENU? - MDISetMenu(win, hmenu, 0); + if ( win ) + { + // we don't change the windows menu, but we update the main one + MDISetMenu(win, hMenu, NULL); + } } static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam, WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact) { -#ifdef __WIN32__ - *activate = TRUE; + *activate = true; *hwndAct = (WXHWND)lParam; *hwndDeact = (WXHWND)wParam; -#else // Win16 - *activate = (WXWORD)wParam; - *hwndAct = (WXHWND)LOWORD(lParam); - *hwndDeact = (WXHWND)HIWORD(lParam); -#endif // Win32/Win16 } + +#endif // wxUSE_MDI && !defined(__WXUNIVERSAL__)