From 7a53399722e129ed9c00f0c37d0c20c0387c829d Mon Sep 17 00:00:00 2001 From: Kevin Wasserman Date: Tue, 3 Apr 2012 07:02:43 -0400 Subject: Prep for KfW conversion to ribbon toolbar Upgrade classes: CWinApp->CWinAppEx, CFrameWnd->CFrameWndEx, CStatusBar->CMFCStatusBar, CToolBar->CMFCToolBar. Call AfxOleInit() from CLeashApp::InitInstance() Do not call LoadBarState() (crashes) or GetToolBarCtrl() (no longer exists) Signed-off-by: Kevin Wasserman ticket: 7244 (new) queue: kfw target_version: 1.10.4 tags: pullup --- src/windows/leash/LeashFrame.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/windows/leash/LeashFrame.cpp') diff --git a/src/windows/leash/LeashFrame.cpp b/src/windows/leash/LeashFrame.cpp index f7e4b56e8f..2247833047 100644 --- a/src/windows/leash/LeashFrame.cpp +++ b/src/windows/leash/LeashFrame.cpp @@ -31,9 +31,9 @@ const char CLeashFrame::s_profileMax[] = "max"; const char CLeashFrame::s_profileTool[] = "tool"; const char CLeashFrame::s_profileStatus[] = "status"; -IMPLEMENT_DYNAMIC(CLeashFrame, CFrameWnd) +IMPLEMENT_DYNAMIC(CLeashFrame, CFrameWndEx) -BEGIN_MESSAGE_MAP(CLeashFrame, CFrameWnd) +BEGIN_MESSAGE_MAP(CLeashFrame, CFrameWndEx) //{{AFX_MSG_MAP(CLeashFrame) ON_WM_DESTROY() //}}AFX_MSG_MAP @@ -101,7 +101,7 @@ void CLeashFrame::OnDestroy() SaveBarState(AfxGetApp()->m_pszProfileName); - CFrameWnd::OnDestroy(); + CFrameWndEx::OnDestroy(); } /////////////////////////////////////////////////////////////// @@ -112,8 +112,7 @@ void CLeashFrame::ActivateFrame(int nCmdShow) { m_bFirstTime = FALSE; - LoadBarState(AfxGetApp()->m_pszProfileName); } - CFrameWnd::ActivateFrame(nCmdShow); + CFrameWndEx::ActivateFrame(nCmdShow); } -- cgit