#include "stdafx.h"
#include "resource.h"
+#include "Merge.h"
#include "LanguageSelect.h"
#include "MainFrm.h"
#include <locale.h>
{
// set the menu of the main frame window
UINT idMenu = GetDocResId();
- CMainFrame * pMainFrame = dynamic_cast<CMainFrame *> ((CFrameWnd*)AfxGetApp()->m_pMainWnd);
+ CMergeApp *pApp = dynamic_cast<CMergeApp *> (AfxGetApp());
+ CMainFrame * pMainFrame = dynamic_cast<CMainFrame *> ((CFrameWnd*)pApp->m_pMainWnd);
HMENU hNewMenu = pMainFrame->NewDefaultMenu(idMenu);
if (hNewMenu)
{
// m_hMenuDefault is used to redraw the main menu when we close a child frame
// if this child frame had a different menu
pMainFrame->m_hMenuDefault = hNewMenu;
+ pApp->m_pDiffTemplate->m_hMenuShared = pMainFrame->NewMergeViewMenu();
+ pApp->m_pDirTemplate->m_hMenuShared = pMainFrame->NewDirViewMenu();
// force redrawing the menu bar
- pMainFrame->DrawMenuBar();
+ pMainFrame->DrawMenuBar();
}
}
}
Src: DirDoc.cpp DirDoc.h DirView.cpp DirView.h
Cannot create valid (archive) temp paths without valid document pointer
Src: MainFrm.cpp
+ PATCH: [ 1193262 ] Switch language on run-time not change all menus
+ Src/Common: LanguageSelect.cpp
2005-06-29 Perry
PATCH: [ 1220421 ] warning in cvs trunk (probably a bool/BOOL mismatch)