extern void wxRemoveHandleAssociation(wxWindow *win);
+namespace
+{
+
// ---------------------------------------------------------------------------
// constants
// ---------------------------------------------------------------------------
-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;
+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
// 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);
-
-// is this an id of an MDI child?
-inline bool IsMdiCommandId(int id)
-{
- return (id >= wxFIRST_MDI_CHILD) && (id <= wxLAST_MDI_CHILD);
-}
+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
// ===========================================================================
EVT_SIZE(wxMDIParentFrame::OnSize)
EVT_ICONIZE(wxMDIParentFrame::OnIconized)
EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
+
+#if wxUSE_MENUS
+ EVT_MENU_RANGE(wxFIRST_MDI_CHILD, wxLAST_MDI_CHILD,
+ wxMDIParentFrame::OnMDIChild)
+ EVT_MENU_RANGE(wxID_MDI_WINDOW_FIRST, wxID_MDI_WINDOW_LAST,
+ wxMDIParentFrame::OnMDICommand)
+#endif // wxUSE_MENUS
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
// the children
// ===========================================================================
-wxMDIParentFrame::wxMDIParentFrame()
+void wxMDIParentFrame::Init()
{
- m_parentFrameActive = true;
+#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,
// 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->Append(wxID_MDI_WINDOW_CASCADE, _("&Cascade"));
+ m_windowMenu->Append(wxID_MDI_WINDOW_TILE_HORZ, _("Tile &Horizontally"));
+ m_windowMenu->Append(wxID_MDI_WINDOW_TILE_VERT, _("Tile &Vertically"));
m_windowMenu->AppendSeparator();
- m_windowMenu->Append(IDM_WINDOWICONS, _("&Arrange Icons"));
- m_windowMenu->Append(IDM_WINDOWNEXT, _("&Next"));
- m_windowMenu->Append(IDM_WINDOWPREV, _("&Previous"));
+ m_windowMenu->Append(wxID_MDI_WINDOW_ARRANGE_ICONS, _("&Arrange Icons"));
+ m_windowMenu->Append(wxID_MDI_WINDOW_NEXT, _("&Next"));
+ m_windowMenu->Append(wxID_MDI_WINDOW_PREV, _("&Previous"));
}
- m_parentFrameActive = true;
-
if (!parent)
wxTopLevelWindows.Append(this);
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,
m_frameStatusBar = NULL;
#endif // wxUSE_STATUSBAR
+#if wxUSE_MENUS && wxUSE_ACCEL
+ delete m_accelWindowMenu;
+#endif // wxUSE_MENUS && wxUSE_ACCEL
+
DestroyChildren();
// the MDI frame menubar is not automatically deleted by Windows unlike for
// wxMDIParentFrame child management
// ----------------------------------------------------------------------------
+wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
+{
+ HWND hWnd = (HWND)::SendMessage(GetWinHwnd(GetClientWindow()),
+ WM_MDIGETACTIVE, 0, 0L);
+ if ( !hWnd )
+ return NULL;
+
+ return static_cast<wxMDIChildFrame *>(wxFindWinFromHandle(hWnd));
+}
+
int wxMDIParentFrame::GetChildFramesCount() const
{
int count = 0;
return count;
}
+#if wxUSE_MENUS
+
void wxMDIParentFrame::AddMDIChild(wxMDIChildFrame * WXUNUSED(child))
{
switch ( GetChildFramesCount() )
void wxMDIParentFrame::AddWindowMenu()
{
if ( m_windowMenu )
+ {
+ // For correct handling of the events from this menu we also must
+ // attach it to the menu bar.
+ m_windowMenu->Attach(GetMenuBar());
+
MDIInsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this));
+ }
}
void wxMDIParentFrame::RemoveWindowMenu()
{
if ( m_windowMenu )
+ {
MDIRemoveWindowMenu(GetClientWindow(), m_hMenu);
+
+ m_windowMenu->Detach();
+ }
}
void wxMDIParentFrame::UpdateWindowMenu(bool enable)
{
if ( m_windowMenu )
{
- m_windowMenu->Enable(IDM_WINDOWNEXT, enable);
- m_windowMenu->Enable(IDM_WINDOWPREV, enable);
+ m_windowMenu->Enable(wxID_MDI_WINDOW_NEXT, enable);
+ m_windowMenu->Enable(wxID_MDI_WINDOW_PREV, enable);
}
}
void wxMDIParentFrame::InternalSetMenuBar()
{
- m_parentFrameActive = true;
-
if ( GetActiveChild() )
{
AddWindowMenu();
void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
{
- // notice that Remove/AddWindowMenu() are safe to call even when
- // m_windowMenu is NULL
- RemoveWindowMenu();
+ if ( menu != m_windowMenu )
+ {
+ // notice that Remove/AddWindowMenu() are safe to call even when
+ // m_windowMenu is NULL
+ RemoveWindowMenu();
- delete m_windowMenu;
+ delete m_windowMenu;
- m_windowMenu = menu;
+ m_windowMenu = menu;
- AddWindowMenu();
+ AddWindowMenu();
+ }
+
+#if wxUSE_ACCEL
+ wxDELETE(m_accelWindowMenu);
+
+ if ( menu && menu->HasAccels() )
+ m_accelWindowMenu = menu->CreateAccelTable();
+#endif // wxUSE_ACCEL
}
+// ----------------------------------------------------------------------------
+// wxMDIParentFrame other menu-related stuff
+// ----------------------------------------------------------------------------
+
void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu)
{
wxMDIChildFrame *child = GetActiveChild();
}
}
-const wxMenuItem *wxMDIParentFrame::FindItemInMenuBar(int menuId) const
+wxMenuItem *wxMDIParentFrame::FindItemInMenuBar(int menuId) const
{
- const wxMenuItem *item = wxFrame::FindItemInMenuBar(menuId);
- if ( !item && m_currentChild )
+ wxMenuItem *item = wxFrame::FindItemInMenuBar(menuId);
+ if ( !item && GetActiveChild() )
{
- item = m_currentChild->FindItemInMenuBar(menuId);
+ item = GetActiveChild()->FindItemInMenuBar(menuId);
}
+ if ( !item && m_windowMenu )
+ item = m_windowMenu->FindItem(menuId);
+
return item;
}
+WXHMENU wxMDIParentFrame::MSWGetActiveMenu() const
+{
+ wxMDIChildFrame * const child = GetActiveChild();
+ if ( child )
+ {
+ const WXHMENU hmenu = child->MSWGetActiveMenu();
+ if ( hmenu )
+ return hmenu;
+ }
+
+ return wxFrame::MSWGetActiveMenu();
+}
+
+#endif // wxUSE_MENUS
+
+// ----------------------------------------------------------------------------
+// wxMDIParentFrame event handling
+// ----------------------------------------------------------------------------
+
void wxMDIParentFrame::UpdateClientSize()
{
if ( GetClientWindow() )
UpdateClientSize();
}
-// Returns the active MDI child window
-wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
-{
- HWND hWnd = (HWND)::SendMessage(GetWinHwnd(GetClientWindow()),
- WM_MDIGETACTIVE, 0, 0L);
- if ( hWnd == 0 )
- return NULL;
-
- return (wxMDIChildFrame *)wxFindWinFromHandle(hWnd);
-}
-
// Responds to colour changes, and passes event on to children.
void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
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
// ---------------------------------------------------------------------------
WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message,
- WXWPARAM wParam,
- WXLPARAM lParam)
+ WXWPARAM wParam,
+ WXLPARAM lParam)
{
WXLRESULT rc = 0;
bool processed = false;
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:
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 )
// If this window is an MDI parent, we must also send an OnActivate message
// to the current child.
- if ( (m_currentChild != NULL) &&
+ if ( GetActiveChild() &&
((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)) )
{
- wxActivateEvent event(wxEVT_ACTIVATE, true, m_currentChild->GetId());
- event.SetEventObject( m_currentChild );
- if ( m_currentChild->HandleWindowEvent(event) )
+ wxActivateEvent event(wxEVT_ACTIVATE, true, GetActiveChild()->GetId());
+ event.SetEventObject( GetActiveChild() );
+ if ( GetActiveChild()->HandleWindowEvent(event) )
processed = true;
}
return processed;
}
-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_;
+#if wxUSE_MENUS
- // In case it's e.g. a toolbar.
- if ( hwnd )
+void wxMDIParentFrame::OnMDIChild(wxCommandEvent& event)
+{
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+ while ( node )
{
- wxWindow *win = wxFindWinFromHandle(hwnd);
- if ( win )
- return win->MSWCommand(cmd, id);
- }
+ wxWindow *child = node->GetData();
+ if ( child->GetHWND() )
+ {
+ int childId = wxGetWindowId(child->GetHWND());
+ if ( childId == event.GetId() )
+ {
+ ::SendMessage( GetWinHwnd(GetClientWindow()),
+ WM_MDIACTIVATE,
+ (WPARAM)child->GetHWND(), 0);
+ return;
+ }
+ }
- if (wxCurrentPopupMenu)
- {
- wxMenu *popupMenu = wxCurrentPopupMenu;
- wxCurrentPopupMenu = NULL;
- if (popupMenu->MSWCommand(cmd, id))
- return true;
+ node = node->GetNext();
}
- // is it one of standard MDI commands?
+ wxFAIL_MSG( "unknown MDI child selected?" );
+}
+
+void wxMDIParentFrame::OnMDICommand(wxCommandEvent& event)
+{
WXWPARAM wParam = 0;
WXLPARAM lParam = 0;
int msg;
- switch ( id )
+ switch ( event.GetId() )
{
- case IDM_WINDOWCASCADE:
+ case wxID_MDI_WINDOW_CASCADE:
msg = WM_MDICASCADE;
wParam = MDITILE_SKIPDISABLED;
break;
- case IDM_WINDOWTILEHOR:
+ case wxID_MDI_WINDOW_TILE_HORZ:
wParam |= MDITILE_HORIZONTAL;
// fall through
- case IDM_WINDOWTILEVERT:
+ case wxID_MDI_WINDOW_TILE_VERT:
if ( !wParam )
wParam = MDITILE_VERTICAL;
msg = WM_MDITILE;
wParam |= MDITILE_SKIPDISABLED;
break;
- case IDM_WINDOWICONS:
+ case wxID_MDI_WINDOW_ARRANGE_ICONS:
msg = WM_MDIICONARRANGE;
break;
- case IDM_WINDOWNEXT:
+ case wxID_MDI_WINDOW_NEXT:
msg = WM_MDINEXT;
lParam = 0; // next child
break;
- case IDM_WINDOWPREV:
+ case wxID_MDI_WINDOW_PREV:
msg = WM_MDINEXT;
lParam = 1; // previous child
break;
default:
- msg = 0;
+ wxFAIL_MSG( "unknown MDI command" );
+ return;
}
- if ( msg )
- {
- ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, lParam);
-
- return true;
- }
+ ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, lParam);
+}
- // FIXME VZ: what does this test do??
- if (id >= 0xF000)
- {
- return false; // Get WndProc to call default proc
- }
+#endif // wxUSE_MENUS
- if ( IsMdiCommandId(id) )
- {
- wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
- while ( node )
- {
- wxWindow *child = node->GetData();
- if ( child->GetHWND() )
- {
- int childId = wxGetWindowId(child->GetHWND());
- if ( childId == (signed short)id )
- {
- ::SendMessage( GetWinHwnd(GetClientWindow()),
- WM_MDIACTIVATE,
- (WPARAM)child->GetHWND(), 0);
- return true;
- }
- }
- node = node->GetNext();
- }
- }
- else if ( m_parentFrameActive )
- {
- return ProcessCommand(id);
- }
- else if ( m_currentChild )
- {
- return m_currentChild->HandleCommand(id, cmd, hwnd);
- }
- else
+bool wxMDIParentFrame::TryBefore(wxEvent& event)
+{
+ // menu (and toolbar) events should be sent to the active child frame
+ // first, if any
+ if ( event.GetEventType() == wxEVT_COMMAND_MENU_SELECTED )
{
- // 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(wxT("MDI parent frame is not active, yet there is no active MDI child?"));
+ wxMDIChildFrame * const child = GetActiveChild();
+ if ( child && child->ProcessWindowEventLocally(event) )
+ return true;
}
- return false;
+ return wxMDIParentFrameBase::TryBefore(event);
}
WXLRESULT wxMDIParentFrame::MSWDefWindowProc(WXUINT message,
MSG *pMsg = (MSG *)msg;
// first let the current child get it
- if ( m_currentChild && m_currentChild->GetHWND() &&
- m_currentChild->MSWTranslateMessage(msg) )
+ wxMDIChildFrame * const child = GetActiveChild();
+ if ( child && child->MSWTranslateMessage(msg) )
{
return true;
}
- // then try out accel table (will also check the menu accels)
+ // then try out accelerator table (will also check the accelerators for the
+ // normal menu items)
if ( wxFrame::MSWTranslateMessage(msg) )
{
return true;
}
- // finally, check for MDI specific built in accel keys
+#if wxUSE_MENUS && wxUSE_ACCEL
+ // 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 && m_accelWindowMenu->Translate(this, msg) )
+ return true;
+#endif // wxUSE_MENUS && wxUSE_ACCEL
+
+ // finally, check for MDI specific built-in accelerators
if ( pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN )
{
if ( ::TranslateMDISysAccel(GetWinHwnd(GetClientWindow()), pMsg))
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();
if ( !m_hWnd )
{
- wxLogLastError(_T("WM_MDICREATE"));
+ wxLogLastError(wxT("WM_MDICREATE"));
return false;
}
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)
MDIInsertWindowMenu(parent->GetClientWindow(),
m_hMenu, GetMDIWindowMenu(parent));
-
- parent->m_parentFrameActive = false;
}
void wxMDIChildFrame::DetachMenuBar()
// ---------------------------------------------------------------------------
WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message,
- WXWPARAM wParam,
- WXLPARAM lParam)
+ WXWPARAM wParam,
+ WXLPARAM lParam)
{
WXLRESULT rc = 0;
bool processed = false;
switch ( message )
{
- case WM_COMMAND:
- {
- WORD id, cmd;
- WXHWND hwnd;
- UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam,
- &id, &hwnd, &cmd);
-
- processed = HandleCommand(id, cmd, (WXHWND)hwnd);
- }
- break;
-
case WM_GETMINMAXINFO:
processed = HandleGetMinMaxInfo((MINMAXINFO *)lParam);
break;
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;
return rc;
}
-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 )
- {
- wxWindow *win = wxFindWinFromHandle(hwnd);
- if (win)
- return win->MSWCommand(cmd, id);
- }
-
- if (wxCurrentPopupMenu)
- {
- wxMenu *popupMenu = wxCurrentPopupMenu;
- wxCurrentPopupMenu = NULL;
- if (popupMenu->MSWCommand(cmd, id))
- return true;
- }
-
- bool processed;
- if (GetMenuBar() && GetMenuBar()->FindItem(id))
- {
- processed = ProcessCommand(id);
- }
- else
- {
- processed = false;
- }
-
- return processed;
-}
-
bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
WXHWND hwndAct,
WXHWND hwndDeact)
{
wxMDIParentFrame * const parent = GetMDIParent();
- HMENU menuToSet = 0;
+ WXHMENU hMenuToSet = 0;
bool activated;
if ( m_hWnd == hwndAct )
{
activated = true;
- parent->m_currentChild = this;
-
- HMENU child_menu = (HMENU)GetWinMenu();
- if ( child_menu )
- {
- parent->m_parentFrameActive = false;
+ parent->SetActiveChild(this);
- menuToSet = child_menu;
- }
+ WXHMENU hMenuChild = m_hMenu;
+ if ( hMenuChild )
+ hMenuToSet = hMenuChild;
}
else if ( m_hWnd == hwndDeact )
{
- wxASSERT_MSG( parent->m_currentChild == this,
+ wxASSERT_MSG( parent->GetActiveChild() == this,
wxT("can't deactivate MDI child which wasn't active!") );
activated = false;
- parent->m_currentChild = NULL;
+ parent->SetActiveChild(NULL);
- HMENU parent_menu = (HMENU)parent->GetWinMenu();
+ 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 ( parent_menu && !hwndAct )
- {
- parent->m_parentFrameActive = true;
-
- menuToSet = parent_menu;
- }
+ if ( hMenuParent && !hwndAct )
+ hMenuToSet = hMenuParent;
}
else
{
return false;
}
- if ( menuToSet )
+ if ( hMenuToSet )
{
MDISetMenu(parent->GetClientWindow(),
- menuToSet, GetMDIWindowMenu(parent));
+ (HMENU)hMenuToSet, GetMDIWindowMenu(parent));
}
wxActivateEvent event(wxEVT_ACTIVATE, activated, m_windowId);
}
// ---------------------------------------------------------------------------
-// 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 )
{
(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);
+ }
}
}
::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"));
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"));
}
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;
*hwndDeact = (WXHWND)wParam;
}
+} // anonymous namespace
+
#endif // wxUSE_MDI && !defined(__WXUNIVERSAL__)
projects / wxWidgets.git / blobdiff