X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e949bf13c5a79f20b91eaed882d3246b1023718f..718cf16095911aff708013e3615ee56f6b730313:/src/msw/mdi.cpp diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 46f92ba543..ee869d9759 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -67,8 +67,6 @@ extern const wxChar *wxMDIFrameClassName; // from app.cpp extern const wxChar *wxMDIChildFrameClassName; extern const wxChar *wxMDIChildFrameClassNameNoRedraw; -extern wxWindow *wxWndHook; // from window.cpp - extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win); extern void wxRemoveHandleAssociation(wxWindow *win); @@ -114,9 +112,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 // =========================================================================== @@ -163,10 +169,6 @@ bool wxMDIParentFrame::Create(wxWindow *parent, long style, const wxString& name) { - m_defaultIcon = (WXHICON) (wxSTD_MDIPARENTFRAME_ICON - ? wxSTD_MDIPARENTFRAME_ICON - : wxDEFAULT_MDIPARENTFRAME_ICON); - m_clientWindow = NULL; m_currentChild = NULL; @@ -196,44 +198,22 @@ bool wxMDIParentFrame::Create(wxWindow *parent, SetName(name); m_windowStyle = style; - if (parent) parent->AddChild(this); + if ( parent ) + parent->AddChild(this); if ( id > -1 ) m_windowId = id; else - m_windowId = (int)NewControlId(); + m_windowId = NewControlId(); - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; + WXDWORD exflags; + WXDWORD msflags = MSWGetCreateWindowFlags(&exflags); - DWORD msflags = WS_OVERLAPPED; - if (style & wxMINIMIZE_BOX) - msflags |= WS_MINIMIZEBOX; - if (style & wxMAXIMIZE_BOX) - msflags |= WS_MAXIMIZEBOX; - if (style & wxTHICK_FRAME) - msflags |= WS_THICKFRAME; - if (style & wxSYSTEM_MENU) - msflags |= WS_SYSMENU; - if ((style & wxMINIMIZE) || (style & wxICONIZE)) - msflags |= WS_MINIMIZE; - if (style & wxMAXIMIZE) - msflags |= WS_MAXIMIZE; - if (style & wxCAPTION) - msflags |= WS_CAPTION; - - if (style & wxCLIP_CHILDREN) - msflags |= WS_CLIPCHILDREN; - - if ( !wxWindow::MSWCreate(m_windowId, - parent, - wxMDIFrameClassName, - this, + if ( !wxWindow::MSWCreate(wxMDIFrameClassName, title, - x, y, width, height, - msflags) ) + pos, size, + msflags, + exflags) ) { return FALSE; } @@ -249,17 +229,25 @@ bool wxMDIParentFrame::Create(wxWindow *parent, wxMDIParentFrame::~wxMDIParentFrame() { DestroyChildren(); + // already delete by DestroyChildren() m_frameToolBar = NULL; m_frameStatusBar = NULL; - // ::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 = NULL; + } + if ( m_clientWindow ) { if ( m_clientWindow->MSWGetOldWndProc() ) @@ -270,19 +258,17 @@ wxMDIParentFrame::~wxMDIParentFrame() } } +#if wxUSE_MENUS_NATIVE + void wxMDIParentFrame::InternalSetMenuBar() { -// 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); + InsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this)); } +#endif // wxUSE_MENUS_NATIVE + void wxMDIParentFrame::SetWindowMenu(wxMenu* menu) { if (m_windowMenu) @@ -296,6 +282,7 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu) delete m_windowMenu; m_windowMenu = (wxMenu*) NULL; } + if (menu) { m_windowMenu = menu; @@ -341,13 +328,19 @@ 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(); } event.Skip(); } +WXHICON wxMDIParentFrame::GetDefaultIcon() const +{ + return (WXHICON)(wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON + : wxDEFAULT_MDIPARENTFRAME_ICON); +} + // --------------------------------------------------------------------------- // MDI operations // --------------------------------------------------------------------------- @@ -646,9 +639,6 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, long style, const wxString& name) { - m_defaultIcon = (WXHICON)(wxSTD_MDICHILDFRAME_ICON ? wxSTD_MDICHILDFRAME_ICON - : wxDEFAULT_MDICHILDFRAME_ICON); - SetName(name); wxWindowBase::Show(TRUE); // MDI child frame starts off shown @@ -662,8 +652,6 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, parent->AddChild(this); } - wxWndHook = this; - int x = pos.x; int y = pos.y; int width = size.x; @@ -716,15 +704,13 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, mcs.lParam = 0; + wxWindowCreationHook hook(this); + m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDICREATE, 0, (LONG)(LPSTR)&mcs); - wxWndHook = NULL; wxAssociateWinWithHandle((HWND) GetHWND(), this); - // VZ: what's this? an act of piracy? - //SetWindowLong(GetHwnd(), 0, (long)this); - wxModelessWindows.Append(this); return TRUE; @@ -734,10 +720,12 @@ wxMDIChildFrame::~wxMDIChildFrame() { DestroyChildren(); - // already delete by DestroyChildren() + // already deleted by DestroyChildren() m_frameToolBar = NULL; m_frameStatusBar = NULL; + RemoveWindowMenu(NULL, m_hMenu); + MSWDestroyWindow(); } @@ -803,16 +791,18 @@ 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, subMenu); + InsertWindowMenu(parent->GetClientWindow(), + m_hMenu, GetMDIWindowMenu(parent)); parent->m_parentFrameActive = FALSE; } +WXHICON wxMDIChildFrame::GetDefaultIcon() const +{ + return (WXHICON)(wxSTD_MDICHILDFRAME_ICON ? wxSTD_MDICHILDFRAME_ICON + : wxDEFAULT_MDICHILDFRAME_ICON); +} + // --------------------------------------------------------------------------- // MDI operations // --------------------------------------------------------------------------- @@ -873,10 +863,8 @@ long wxMDIChildFrame::MSWWindowProc(WXUINT message, 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, - // not on the values specified in wxWindow m_min/max variables - return MSWDefWindowProc(message, wParam, lParam); + processed = HandleGetMinMaxInfo((MINMAXINFO *)lParam); + break; case WM_MDIACTIVATE: { @@ -979,7 +967,10 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), parent->m_currentChild = NULL; HMENU parent_menu = (HMENU)parent->GetWinMenu(); - if ( parent_menu ) + + // activate the the parent menu only when there is no other child + // that has been activated + if ( parent_menu && !hwndAct ) { parent->m_parentFrameActive = TRUE; @@ -994,11 +985,8 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), 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); @@ -1037,6 +1025,36 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos) return FALSE; } +bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo) +{ + MINMAXINFO *info = (MINMAXINFO *)mmInfo; + + // let the default window proc calculate the size of MDI children + // frames because it is based on the size of the MDI client window, + // 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 ( minWidth != -1 ) + { + info->ptMinTrackSize.x = minWidth; + + processed = TRUE; + } + + if ( minHeight != -1 ) + { + info->ptMinTrackSize.y = minHeight; + + processed = TRUE; + } + + return TRUE; +} + // --------------------------------------------------------------------------- // MDI specific message translation/preprocessing // --------------------------------------------------------------------------- @@ -1058,7 +1076,6 @@ bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg) void wxMDIChildFrame::MSWDestroyWindow() { - MSWDetachWindowMenu(); invalidHandle = GetHwnd(); wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); @@ -1136,15 +1153,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,7 +1176,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) DWORD exStyle = 0; #endif - wxWndHook = this; + wxWindowCreationHook hook(this); m_hWnd = (WXHWND)::CreateWindowEx ( exStyle, @@ -1181,7 +1196,6 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) } SubclassWin(m_hWnd); - wxWndHook = NULL; return TRUE; } @@ -1283,62 +1297,72 @@ 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; + } + + if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) ) + { + success = TRUE; + ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING, + (UINT)subMenu, _("&Window")); + 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")); } } - 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) ) + { + 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,