Use __super

diff --git a/Src/Common/MessageBoxDialog.cpp b/Src/Common/MessageBoxDialog.cpp
index 2eadf12..34a7a28 100644 (file)
--- a/Src/Common/MessageBoxDialog.cpp
+++ b/Src/Common/MessageBoxDialog.cpp
@@ -442,7 +442,7 @@ INT_PTR CMessageBoxDialog::DoModal ( )
        }
 
        // Call the parent method.
-       return CDialog::DoModal();
+       return __super::DoModal();
 }
 
 /*
@@ -477,7 +477,7 @@ void CMessageBoxDialog::EndDialog ( int nResult )
        }
        
        // Call the parent method.
-       CDialog::EndDialog(nResult);
+       __super::EndDialog(nResult);
 }
 
 /*
@@ -490,7 +490,7 @@ void CMessageBoxDialog::EndDialog ( int nResult )
 BOOL CMessageBoxDialog::OnInitDialog ( )
 {
        // Call the parent method.
-       if ( !CDialog::OnInitDialog() )
+       if ( !__super::OnInitDialog() )
        {
                // Return with an error.
                return FALSE;
@@ -635,7 +635,7 @@ BOOL CMessageBoxDialog::OnCmdMsg ( UINT nID, int nCode, void* pExtra,
        }
 
        // Call the parent method.
-       return CDialog::OnCmdMsg(nID, nCode, pExtra, pHandlerInfo);
+       return __super::OnCmdMsg(nID, nCode, pExtra, pHandlerInfo);
 }
 
 /*
@@ -713,7 +713,7 @@ BOOL CMessageBoxDialog::PreTranslateMessage ( MSG* pMsg )
        }
 
        // Call the parent method.
-       return CDialog::PreTranslateMessage(pMsg);
+       return __super::PreTranslateMessage(pMsg);
 }
 
 /*
@@ -795,7 +795,7 @@ void CMessageBoxDialog::OnTimer ( UINT_PTR nIDEvent )
        }
 
        // Call the parent method.
-       CDialog::OnTimer(nIDEvent);
+       __super::OnTimer(nIDEvent);
 }
 
 BOOL CMessageBoxDialog::OnEraseBkgnd(CDC* pDC)
@@ -817,7 +817,7 @@ HBRUSH CMessageBoxDialog::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
                pDC->SetTextColor(m_clrMainInstructionFont);
                return static_cast<HBRUSH>(GetSysColorBrush(COLOR_WINDOW));
        }
-       return CDialog::OnCtlColor(pDC, pWnd, nCtlColor);
+       return __super::OnCtlColor(pDC, pWnd, nCtlColor);
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -851,7 +851,7 @@ BOOL CMessageBoxDialog::OnWndMsg ( UINT message, WPARAM wParam, LPARAM lParam,
        }
 
        // Call the parent method.
-       return CDialog::OnWndMsg(message, wParam, lParam, pResult);
+       return __super::OnWndMsg(message, wParam, lParam, pResult);
 }
 
 BEGIN_MESSAGE_MAP(CMessageBoxDialog, CDialog)

diff --git a/Src/Common/SuperComboBox.cpp b/Src/Common/SuperComboBox.cpp
index cc5a0f6..8ce33f0 100644 (file)
--- a/Src/Common/SuperComboBox.cpp
+++ b/Src/Common/SuperComboBox.cpp
@@ -74,7 +74,7 @@ END_MESSAGE_MAP()
 
 void CSuperComboBox::PreSubclassWindow()
 {
-       CComboBoxEx::PreSubclassWindow();
+       __super::PreSubclassWindow();
        m_pDropHandler = new DropHandler(std::bind(&CSuperComboBox::OnDropFiles, this, std::placeholders::_1));
        RegisterDragDrop(m_hWnd, m_pDropHandler);
        
@@ -115,7 +115,7 @@ int CSuperComboBox::InsertString(int nIndex, LPCTSTR lpszItem)
 {
        if (m_bComboBoxEx)
        {
-               CString sShortName;             // scoped to remain valid for calling CComboBoxEx::InsertItem()
+               CString sShortName;             // scoped to remain valid for calling __super::InsertItem()
                if (m_bExtendedFileNames)
                {
                        if (nIndex >= static_cast<int>(m_sFullStateText.size()))
@@ -150,7 +150,7 @@ int CSuperComboBox::InsertString(int nIndex, LPCTSTR lpszItem)
                cbitem.iItem = nIndex;
                cbitem.iImage = I_IMAGECALLBACK;
                cbitem.iSelectedImage = I_IMAGECALLBACK;
-               return CComboBoxEx::InsertItem(&cbitem);
+               return __super::InsertItem(&cbitem);
        }
        else
        {
@@ -165,7 +165,7 @@ int CSuperComboBox::DeleteString(int nIndex)
        {
                m_sFullStateText.erase(m_sFullStateText.begin() + nIndex);
        }
-       return CComboBoxEx::DeleteString(nIndex);
+       return __super::DeleteString(nIndex);
 }
 
 int CSuperComboBox::FindString(int nStartAfter, LPCTSTR lpszString) const
@@ -256,7 +256,7 @@ void CSuperComboBox::GetLBText(int nIndex, CString &rString) const
        }
        else
        {
-               CComboBoxEx::GetLBText(nIndex, rString.GetBufferSetLength(GetLBTextLen(nIndex)));
+               __super::GetLBText(nIndex, rString.GetBufferSetLength(GetLBTextLen(nIndex)));
                rString.ReleaseBuffer();
        }
 }
@@ -269,7 +269,7 @@ int CSuperComboBox::GetLBTextLen(int nIndex) const
        }
        else
        {
-               return CComboBoxEx::GetLBTextLen(nIndex);
+               return __super::GetLBTextLen(nIndex);
        }
 }
 
@@ -419,7 +419,7 @@ BOOL CSuperComboBox::PreTranslateMessage(MSG* pMsg)
                }
     }
 
-    return CComboBoxEx::PreTranslateMessage(pMsg);
+    return __super::PreTranslateMessage(pMsg);
 }
 
 void CSuperComboBox::SetAutoComplete(INT nSource)
@@ -463,12 +463,12 @@ void CSuperComboBox::ResetContent()
                        m_sFullStateText[i].Empty();
                }
        }
-       CComboBoxEx::ResetContent();
+       __super::ResetContent();
 }
 
 int CSuperComboBox::OnCreate(LPCREATESTRUCT lpCreateStruct) 
 {
-       if (CComboBoxEx::OnCreate(lpCreateStruct) == -1)
+       if (__super::OnCreate(lpCreateStruct) == -1)
                return -1;
        
        m_pDropHandler = new DropHandler(std::bind(&CSuperComboBox::OnDropFiles, this, std::placeholders::_1));
@@ -578,7 +578,7 @@ void CSuperComboBox::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct)
                        0, 0, GetSysColor(COLOR_WINDOW), CLR_NONE, ILD_NORMAL);
                return;
        }
-       CComboBoxEx::OnDrawItem(nIDCtl, lpDrawItemStruct);
+       __super::OnDrawItem(nIDCtl, lpDrawItemStruct);
 }
 
 /**

diff --git a/Src/Common/scbarcf.cpp b/Src/Common/scbarcf.cpp
index 0b547b5..218ead2 100644 (file)
--- a/Src/Common/scbarcf.cpp
+++ b/Src/Common/scbarcf.cpp
@@ -67,7 +67,7 @@ END_MESSAGE_MAP()
 
 void CSizingControlBarCF::OnUpdateCmdUI(CFrameWnd* pTarget, BOOL bDisableIfNoHndler)
 {
-    baseCSizingControlBarCF::OnUpdateCmdUI(pTarget, bDisableIfNoHndler);
+    __super::OnUpdateCmdUI(pTarget, bDisableIfNoHndler);
 
     if (!HasGripper())
         return;
@@ -215,7 +215,7 @@ void CSizingControlBarCF::NcPaintGripper(CDC* pDC, const CRect& rcClient)
 
 LRESULT CSizingControlBarCF::OnSetText(WPARAM wParam, LPARAM lParam)
 {
-    LRESULT lResult = baseCSizingControlBarCF::OnSetText(wParam, lParam);
+    LRESULT lResult = __super::OnSetText(wParam, lParam);
 
     SendMessage(WM_NCPAINT);
 

diff --git a/Src/Common/scbarg.cpp b/Src/Common/scbarg.cpp
index 1af9850..1a566e3 100644 (file)
--- a/Src/Common/scbarg.cpp
+++ b/Src/Common/scbarg.cpp
@@ -68,14 +68,14 @@ void CSizingControlBarG::OnNcLButtonUp(UINT nHitTest, CPoint point)
     if (nHitTest == HTCLOSE)
         m_pDockSite->ShowControlBar(this, FALSE, FALSE); // hide
 
-    baseCSizingControlBarG::OnNcLButtonUp(nHitTest, point);
+    __super::OnNcLButtonUp(nHitTest, point);
 }
 
 void CSizingControlBarG::NcCalcClient(LPRECT pRc, UINT nDockBarID)
 {
     CRect rcBar(pRc); // save the bar rect
     // subtract edges
-    baseCSizingControlBarG::NcCalcClient(pRc, nDockBarID);
+    __super::NcCalcClient(pRc, nDockBarID);
 
     if (!HasGripper())
         return;
@@ -148,7 +148,7 @@ NCHITTEST_RESULT CSizingControlBarG::OnNcHitTest(CPoint point)
     CRect rcBar;
     GetWindowRect(rcBar);
 
-    LRESULT nRet = baseCSizingControlBarG::OnNcHitTest(point);
+    LRESULT nRet = __super::OnNcHitTest(point);
     if (nRet != HTCLIENT)
         return nRet;
 

diff --git a/Src/Common/sizecbar.cpp b/Src/Common/sizecbar.cpp
index 7cfb004..cceaa76 100644 (file)
--- a/Src/Common/sizecbar.cpp
+++ b/Src/Common/sizecbar.cpp
@@ -152,7 +152,7 @@ void CSizingControlBar::EnableDocking(DWORD dwDockStyle)
 
 int CSizingControlBar::OnCreate(LPCREATESTRUCT lpCreateStruct) 
 {
-    if (baseCSizingControlBar::OnCreate(lpCreateStruct) == -1)
+    if (__super::OnCreate(lpCreateStruct) == -1)
         return -1;
 
     // query SPI_GETDRAGFULLWINDOWS system parameter
@@ -263,7 +263,7 @@ CSize CSizingControlBar::CalcDynamicLayout(int nLength, DWORD dwMode)
         if (nLength == -1)
             m_bParentSizing = true;
 
-        return baseCSizingControlBar::CalcDynamicLayout(nLength, dwMode);
+        return __super::CalcDynamicLayout(nLength, dwMode);
     }
 
     if (dwMode & LM_MRUWIDTH) return m_szFloat;
@@ -318,7 +318,7 @@ void CSizingControlBar::OnWindowPosChanging(WINDOWPOS FAR* lpwndpos)
     // force non-client recalc if moved or resized
     lpwndpos->flags |= SWP_FRAMECHANGED;
 
-    baseCSizingControlBar::OnWindowPosChanging(lpwndpos);
+    __super::OnWindowPosChanging(lpwndpos);
 
     // find on which side are we docked
     m_nDockBarID = GetParent()->GetDlgCtrlID();
@@ -372,7 +372,7 @@ void CSizingControlBar::OnLButtonUp(UINT nFlags, CPoint point)
     if (m_bTracking)
         StopTracking();
 
-    baseCSizingControlBar::OnLButtonUp(nFlags, point);
+    __super::OnLButtonUp(nFlags, point);
 }
 
 void CSizingControlBar::OnRButtonDown(UINT nFlags, CPoint point)
@@ -380,7 +380,7 @@ void CSizingControlBar::OnRButtonDown(UINT nFlags, CPoint point)
     if (m_bTracking)
         StopTracking();
 
-    baseCSizingControlBar::OnRButtonDown(nFlags, point);
+    __super::OnRButtonDown(nFlags, point);
 }
 
 void CSizingControlBar::OnMouseMove(UINT nFlags, CPoint point)
@@ -393,7 +393,7 @@ void CSizingControlBar::OnMouseMove(UINT nFlags, CPoint point)
         OnTrackUpdateSize(ptScreen);
     }
 
-    baseCSizingControlBar::OnMouseMove(nFlags, point);
+    __super::OnMouseMove(nFlags, point);
 }
 
 void CSizingControlBar::OnCaptureChanged(CWnd *pWnd)
@@ -401,7 +401,7 @@ void CSizingControlBar::OnCaptureChanged(CWnd *pWnd)
     if (m_bTracking && (pWnd != this))
         StopTracking();
 
-    baseCSizingControlBar::OnCaptureChanged(pWnd);
+    __super::OnCaptureChanged(pWnd);
 }
 
 void CSizingControlBar::OnNcCalcSize(BOOL bCalcValidRects,
@@ -558,7 +558,7 @@ NCHITTEST_RESULT CSizingControlBar::OnNcHitTest(CPoint point)
 
 void CSizingControlBar::OnSettingChange(UINT uFlags, LPCTSTR lpszSection)
 {
-    baseCSizingControlBar::OnSettingChange(uFlags, lpszSection);
+    __super::OnSettingChange(uFlags, lpszSection);
 
     BOOL bDragShowContent = m_bDragShowContent = false;
     ::SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0,

diff --git a/Src/DirFrame.cpp b/Src/DirFrame.cpp
index 0f71a13..3eef232 100644 (file)
--- a/Src/DirFrame.cpp
+++ b/Src/DirFrame.cpp
@@ -90,7 +90,7 @@ END_MESSAGE_MAP()
  */
 int CDirFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) 
 {
-       if (CMDIChildWnd::OnCreate(lpCreateStruct) == -1)
+       if (__super::OnCreate(lpCreateStruct) == -1)
                return -1;
 
        EnableDocking(CBRS_ALIGN_TOP);
@@ -163,7 +163,7 @@ void CDirFrame::SetFilterStatusDisplay(LPCTSTR szFilter)
  */
 void CDirFrame::ActivateFrame(int nCmdShow) 
 {
-       CMergeFrameCommon::ActivateFrame(nCmdShow);
+       __super::ActivateFrame(nCmdShow);
 }
 
 /**
@@ -175,7 +175,7 @@ void CDirFrame::UpdateResources()
 
 void CDirFrame::OnClose() 
 {      
-       CMDIChildWnd::OnClose();
+       __super::OnClose();
 }
 
 /**
@@ -188,12 +188,12 @@ BOOL CDirFrame::DestroyWindow()
        GetDockState(dockState);
        dockState.SaveState(_T("Settings-DirFrame"));
        SaveWindowState();
-       return CMDIChildWnd::DestroyWindow();
+       return __super::DestroyWindow();
 }
 
 void CDirFrame::OnSize(UINT nType, int cx, int cy) 
 {
-       CMDIChildWnd::OnSize(nType, cx, cy);
+       __super::OnSize(nType, cx, cy);
        
        m_wndFilePathBar.Resize();
 }

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 3278ae2..e21a88b 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -394,7 +394,7 @@ void CDirView::OnInitialUpdate()
                return 48;
        }();
        const int iconCY = iconCX;
-       CListView::OnInitialUpdate();
+       __super::OnInitialUpdate();
        m_pList = &GetListCtrl();
        m_pIList.reset(new IListCtrlImpl(m_pList->m_hWnd, m_listViewItems));
        CDirDoc* pDoc = GetDocument();
@@ -464,7 +464,7 @@ void CDirView::OnInitialUpdate()
 
 BOOL CDirView::PreCreateWindow(CREATESTRUCT& cs)
 {
-       CListView::PreCreateWindow(cs);
+       __super::PreCreateWindow(cs);
        cs.dwExStyle &= ~WS_EX_CLIENTEDGE;
        return TRUE;
 }
@@ -505,7 +505,7 @@ void CDirView::OnLButtonDblClk(UINT nFlags, CPoint point)
                }
        }
        if (GetFocus() == this)
-               CListView::OnLButtonDblClk(nFlags, point);
+               __super::OnLButtonDblClk(nFlags, point);
 }
 
 /**
@@ -1154,7 +1154,7 @@ void CDirView::OnDestroy()
                        m_pColItems->SaveColumnWidths(std::bind(&CListCtrl::GetColumnWidth, m_pList, _1)));
        }
 
-       CListView::OnDestroy();
+       __super::OnDestroy();
 }
 
 /**
@@ -1181,7 +1181,7 @@ void CDirView::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags)
                        }
                }
        }
-       CListView::OnChar(nChar, nRepCnt, nFlags);
+       __super::OnChar(nChar, nRepCnt, nFlags);
 }
 
 /**
@@ -2363,7 +2363,7 @@ CDirFrame * CDirView::GetParentFrame()
 {
        // can't verify cast without introducing more coupling
        // (CDirView doesn't include DirFrame.h)
-       return static_cast<CDirFrame *>(CListView::GetParentFrame());
+       return static_cast<CDirFrame *>(__super::GetParentFrame());
 }
 
 void CDirView::OnRefresh()
@@ -2474,7 +2474,7 @@ BOOL CDirView::PreTranslateMessage(MSG* pMsg)
                        }
                }
        }
-       return CListView::PreTranslateMessage(pMsg);
+       return __super::PreTranslateMessage(pMsg);
 }
 
 void CDirView::OnUpdateRefresh(CCmdUI* pCmdUI)
@@ -2566,7 +2566,7 @@ BOOL CDirView::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
        if (hdr->code == HDN_BEGINDRAG)
                return OnHeaderBeginDrag((LPNMHEADER)hdr, pResult);
 
-       return CListView::OnNotify(wParam, lParam, pResult);
+       return __super::OnNotify(wParam, lParam, pResult);
 }
 
 BOOL CDirView::OnChildNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* pResult)
@@ -2584,7 +2584,7 @@ BOOL CDirView::OnChildNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* p
                        return TRUE;
                }
        }
-       return CListView::OnChildNotify(uMsg, wParam, lParam, pResult);
+       return __super::OnChildNotify(uMsg, wParam, lParam, pResult);
 }
 
 /**
@@ -2706,7 +2706,7 @@ void CDirView::OnTimer(UINT_PTR nIDEvent)
                GetParentFrame()->SetStatus(msg.c_str());
        }
        
-       CListView::OnTimer(nIDEvent);
+       __super::OnTimer(nIDEvent);
 }
 
 /**
@@ -3382,7 +3382,7 @@ void CDirView::OnUpdateCtxtDirMoveTo(CCmdUI* pCmdUI)
  */
 void CDirView::OnSize(UINT nType, int cx, int cy)
 {
-       CListView::OnSize(nType, cx, cy);
+       __super::OnSize(nType, cx, cy);
        GetDocument()->SetTitle(nullptr);
 }
 
@@ -4183,7 +4183,7 @@ LRESULT CDirView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
                pMenu->HandleMenuMessage(message, wParam, lParam, res);
        }
 
-       return CListView::WindowProc(message, wParam, lParam);
+       return __super::WindowProc(message, wParam, lParam);
 }
 
 /**

diff --git a/Src/EditorFilepathBar.cpp b/Src/EditorFilepathBar.cpp
index 2c57a0c..7700e63 100644 (file)
--- a/Src/EditorFilepathBar.cpp
+++ b/Src/EditorFilepathBar.cpp
@@ -49,7 +49,7 @@ CEditorFilePathBar::~CEditorFilePathBar()
  */
 BOOL CEditorFilePathBar::Create(CWnd* pParentWnd)
 {
-       if (! CDialogBar::Create(pParentWnd, CEditorFilePathBar::IDD, 
+       if (! __super::Create(pParentWnd, CEditorFilePathBar::IDD, 
                        CBRS_ALIGN_TOP | CBRS_TOOLTIPS | CBRS_FLYBY, CEditorFilePathBar::IDD))
                return FALSE;
 

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 51ad29d..492c909 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -373,7 +373,7 @@ const TCHAR CMainFrame::szClassName[] = _T("WinMergeWindowClassW");
 BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
 {
        WNDCLASS wndcls;
-       BOOL bRes = CMDIFrameWnd::PreCreateWindow(cs);
+       BOOL bRes = __super::PreCreateWindow(cs);
        HINSTANCE hInst = AfxGetInstanceHandle();
        // see if the class already exists
        if (!::GetClassInfo(hInst, szClassName, &wndcls))
@@ -391,7 +391,7 @@ BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
 
 int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 {
-       if (CMDIFrameWnd::OnCreate(lpCreateStruct) == -1)
+       if (__super::OnCreate(lpCreateStruct) == -1)
                return -1;
 
        m_wndMDIClient.SubclassWindow(m_hWndMDIClient);
@@ -410,7 +410,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
        m_wndTabBar.SetAutoMaxWidth(GetOptionsMgr()->GetBool(OPT_TABBAR_AUTO_MAXWIDTH));
 
        if (!GetOptionsMgr()->GetBool(OPT_SHOW_TABBAR))
-               CMDIFrameWnd::ShowControlBar(&m_wndTabBar, false, 0);
+               __super::ShowControlBar(&m_wndTabBar, false, 0);
 
        if (!m_wndStatusBar.Create(this))
        {
@@ -428,7 +428,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
        m_wndStatusBar.SetPaneInfo(3, ID_STATUS_DIFFNUM, 0, pointToPixel(112)); 
 
        if (!GetOptionsMgr()->GetBool(OPT_SHOW_STATUSBAR))
-               CMDIFrameWnd::ShowControlBar(&m_wndStatusBar, false, 0);
+               __super::ShowControlBar(&m_wndStatusBar, false, 0);
 
        m_pDropHandler = new DropHandler(std::bind(&CMainFrame::OnDropFiles, this, std::placeholders::_1));
        RegisterDragDrop(m_hWnd, m_pDropHandler);
@@ -440,7 +440,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 
 void CMainFrame::OnTimer(UINT_PTR nIDEvent)
 {
-       CMDIFrameWnd::OnTimer(nIDEvent);
+       __super::OnTimer(nIDEvent);
 
        if (nIDEvent == IDT_UPDATEMAINMENU)
        {
@@ -652,7 +652,7 @@ void CMainFrame::OnMeasureItem(int nIDCtl,
        }
 
        if (!setflag)
-               CMDIFrameWnd::OnMeasureItem(nIDCtl, lpMeasureItemStruct);
+               __super::OnMeasureItem(nIDCtl, lpMeasureItemStruct);
 }
 
 /**
@@ -665,7 +665,7 @@ LRESULT CMainFrame::OnMenuChar(UINT nChar, UINT nFlags,
        if(m_pMenus[MENU_DEFAULT]->IsMenu(pMenu))
                lresult=BCMenu::FindKeyboardShortcut(nChar, nFlags, pMenu);
        else
-               lresult=CMDIFrameWnd::OnMenuChar(nChar, nFlags, pMenu);
+               lresult=__super::OnMenuChar(nChar, nFlags, pMenu);
        return lresult;
 }
 
@@ -1570,7 +1570,7 @@ void CMainFrame::ActivateFrame(int nCmdShow)
 {
        if (!m_bFirstTime)
        {
-               CMDIFrameWnd::ActivateFrame(nCmdShow);
+               __super::ActivateFrame(nCmdShow);
                return;
        }
 
@@ -1604,10 +1604,10 @@ void CMainFrame::ActivateFrame(int nCmdShow)
                if (dsk_rc.PtInRect(ptTopLeft))
                        SetWindowPlacement(&wp);
                else
-                       CMDIFrameWnd::ActivateFrame(nCmdShow);
+                       __super::ActivateFrame(nCmdShow);
        }
        else
-               CMDIFrameWnd::ActivateFrame(nCmdShow);
+               __super::ActivateFrame(nCmdShow);
 }
 
 /**
@@ -1650,7 +1650,7 @@ void CMainFrame::OnClose()
                        return;
        }
 
-       CMDIFrameWnd::OnClose();
+       __super::OnClose();
 }
 
 /**
@@ -2164,7 +2164,7 @@ BOOL CMainFrame::PreTranslateMessage(MSG* pMsg)
                return TRUE;
        }
 
-       return CMDIFrameWnd::PreTranslateMessage(pMsg);
+       return __super::PreTranslateMessage(pMsg);
 }
 
 /**
@@ -2175,7 +2175,7 @@ void CMainFrame::OnViewStatusBar()
        bool bShow = !GetOptionsMgr()->GetBool(OPT_SHOW_STATUSBAR);
        GetOptionsMgr()->SaveOption(OPT_SHOW_STATUSBAR, bShow);
 
-       CMDIFrameWnd::ShowControlBar(&m_wndStatusBar, bShow, 0);
+       __super::ShowControlBar(&m_wndStatusBar, bShow, 0);
 }
 
 /**
@@ -2194,7 +2194,7 @@ void CMainFrame::OnViewTabBar()
        bool bShow = !GetOptionsMgr()->GetBool(OPT_SHOW_TABBAR);
        GetOptionsMgr()->SaveOption(OPT_SHOW_TABBAR, bShow);
 
-       CMDIFrameWnd::ShowControlBar(&m_wndTabBar, bShow, 0);
+       __super::ShowControlBar(&m_wndTabBar, bShow, 0);
 }
 
 /**
@@ -2435,9 +2435,9 @@ void CMainFrame::OnActivateApp(BOOL bActive, HTASK hTask)
 #endif
 {
 #if _MFC_VER > 0x0600
-       CMDIFrameWnd::OnActivateApp(bActive, dwThreadID);
+       __super::OnActivateApp(bActive, dwThreadID);
 #else
-       CMDIFrameWnd::OnActivateApp(bActive, hTask);
+       __super::OnActivateApp(bActive, hTask);
 #endif
 
        if (IMergeDoc *pMergeDoc = GetActiveIMergeDoc())
@@ -2481,7 +2481,7 @@ BOOL CMainFrame::CreateToolbar()
 
        if (!GetOptionsMgr()->GetBool(OPT_SHOW_TOOLBAR))
        {
-               CMDIFrameWnd::ShowControlBar(&m_wndToolBar, false, 0);
+               __super::ShowControlBar(&m_wndToolBar, false, 0);
        }
 
        return TRUE;
@@ -2563,7 +2563,7 @@ void CMainFrame::OnToolbarSize(UINT id)
        if (id == ID_TOOLBAR_NONE)
        {
                GetOptionsMgr()->SaveOption(OPT_SHOW_TOOLBAR, false);
-               CMDIFrameWnd::ShowControlBar(&m_wndToolBar, false, 0);
+               __super::ShowControlBar(&m_wndToolBar, false, 0);
        }
        else
        {
@@ -2572,7 +2572,7 @@ void CMainFrame::OnToolbarSize(UINT id)
 
                LoadToolbarImages();
 
-               CMDIFrameWnd::ShowControlBar(&m_wndToolBar, true, 0);
+               __super::ShowControlBar(&m_wndToolBar, true, 0);
        }
 }
 

diff --git a/Src/MergeEditFrm.cpp b/Src/MergeEditFrm.cpp
index 1a1efd9..274da3c 100644 (file)
--- a/Src/MergeEditFrm.cpp
+++ b/Src/MergeEditFrm.cpp
@@ -166,7 +166,7 @@ BOOL CMergeEditFrame::OnCreateClient( LPCREATESTRUCT /*lpcs*/,
 */
 int CMergeEditFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) 
 {
-       if (CMDIChildWnd::OnCreate(lpCreateStruct) == -1)
+       if (__super::OnCreate(lpCreateStruct) == -1)
                return -1;
 
        EnableDocking(CBRS_ALIGN_TOP|CBRS_ALIGN_BOTTOM|CBRS_ALIGN_LEFT|CBRS_ALIGN_RIGHT);
@@ -453,7 +453,7 @@ LRESULT CMergeEditFrame::OnStorePaneSizes(WPARAM wParam, LPARAM lParam)
 
 void CMergeEditFrame::OnSize(UINT nType, int cx, int cy) 
 {
-       CMDIChildWnd::OnSize(nType, cx, cy);
+       __super::OnSize(nType, cx, cy);
        
        UpdateHeaderSizes();
 }

diff --git a/Src/MergeFrameCommon.cpp b/Src/MergeFrameCommon.cpp
index 7c079c6..4014a5e 100644 (file)
--- a/Src/MergeFrameCommon.cpp
+++ b/Src/MergeFrameCommon.cpp
@@ -56,7 +56,7 @@ void CMergeFrameCommon::ActivateFrame(int nCmdShow)
                        nCmdShow = SW_SHOWNORMAL;\r
        }\r
 \r
-       CMDIChildWnd::ActivateFrame(nCmdShow);\r
+       __super::ActivateFrame(nCmdShow);\r
 }\r
 \r
 void CMergeFrameCommon::SaveWindowState()\r
@@ -368,7 +368,7 @@ std::pair<int, int> CMergeFrameCommon::MenuIDtoXY(UINT nID, int nActivePane, int
 \r
 void CMergeFrameCommon::OnGetMinMaxInfo(MINMAXINFO* lpMMI)\r
 {\r
-       CMDIChildWnd::OnGetMinMaxInfo(lpMMI);\r
+       __super::OnGetMinMaxInfo(lpMMI);\r
        // [Fix for MFC 8.0 MDI Maximizing Child Window bug on Vista]\r
        // https://groups.google.com/forum/#!topic/microsoft.public.vc.mfc/iajCdW5DzTM\r
 #if _MFC_VER >= 0x0800\r
@@ -387,7 +387,7 @@ void CMergeFrameCommon::OnMDIActivate(BOOL bActivate, CWnd* pActivateWnd, CWnd*
 {\r
        // call the base class to let standard processing switch to\r
        // the top-level menu associated with this window\r
-       CMDIChildWnd::OnMDIActivate(bActivate, pActivateWnd, pDeactivateWnd);\r
+       __super::OnMDIActivate(bActivate, pActivateWnd, pDeactivateWnd);\r
 \r
        if (bActivate)\r
                ::PostMessage(AfxGetMainWnd()->GetSafeHwnd(), WMU_CHILDFRAMEACTIVATED, 0, reinterpret_cast<LPARAM>(this));\r

diff --git a/Src/MergeStatusBar.cpp b/Src/MergeStatusBar.cpp
index f071d21..63adff2 100644 (file)
--- a/Src/MergeStatusBar.cpp
+++ b/Src/MergeStatusBar.cpp
@@ -94,7 +94,7 @@ CMergeStatusBar::~CMergeStatusBar()
 
 BOOL CMergeStatusBar::Create(CWnd* pParentWnd)
 {
-       if (! CStatusBar::Create(pParentWnd))
+       if (! __super::Create(pParentWnd))
                return FALSE;
 
        SetIndicators(indicatorsBottom, sizeof(indicatorsBottom) / sizeof(UINT));

diff --git a/Src/OpenFrm.cpp b/Src/OpenFrm.cpp
index 4f4b918..014430c 100644 (file)
--- a/Src/OpenFrm.cpp
+++ b/Src/OpenFrm.cpp
@@ -39,7 +39,7 @@ COpenFrame::~COpenFrame()
 BOOL COpenFrame::PreCreateWindow(CREATESTRUCT& cs)
 {
        // TODO: Modify the Window class or styles here by modifying the CREATESTRUCT cs
-       if( !CMDIChildWnd::PreCreateWindow(cs) )
+       if( !__super::PreCreateWindow(cs) )
                return FALSE;
        cs.style |= WS_CLIPCHILDREN;
        return TRUE;
@@ -89,7 +89,7 @@ void COpenFrame::OnWindowPosChanging(WINDOWPOS* lpwndpos)
 
 void COpenFrame::ActivateFrame(int nCmdShow) 
 {
-       CMergeFrameCommon::ActivateFrame(nCmdShow);
+       __super::ActivateFrame(nCmdShow);
        if (CView *const pView = GetActiveView())
        {
                WINDOWPLACEMENT wp = {};
@@ -118,7 +118,7 @@ void COpenFrame::UpdateResources()
 BOOL COpenFrame::DestroyWindow() 
 {
        SaveWindowState();
-       return CMDIChildWnd::DestroyWindow();
+       return __super::DestroyWindow();
 }
 
 // COpenFrame message handlers

diff --git a/Src/OpenView.cpp b/Src/OpenView.cpp
index 0b42946..b2105e8 100644 (file)
--- a/Src/OpenView.cpp
+++ b/Src/OpenView.cpp
@@ -153,7 +153,7 @@ COpenView::~COpenView()
 
 void COpenView::DoDataExchange(CDataExchange* pDX)
 {
-       CFormView::DoDataExchange(pDX);
+       __super::DoDataExchange(pDX);
        //{{AFX_DATA_MAP(COpenView)
        DDX_Control(pDX, IDC_EXT_COMBO, m_ctlExt);
        DDX_Control(pDX, IDC_PATH0_COMBO, m_ctlPath[0]);
@@ -180,7 +180,7 @@ BOOL COpenView::PreCreateWindow(CREATESTRUCT& cs)
        //  the CREATESTRUCT cs
        cs.style &= ~WS_BORDER;
        cs.dwExStyle &= ~WS_EX_CLIENTEDGE;
-       return CFormView::PreCreateWindow(cs);
+       return __super::PreCreateWindow(cs);
 }
 
 void COpenView::OnInitialUpdate()
@@ -203,7 +203,7 @@ void COpenView::OnInitialUpdate()
                m_image.Create(1, 1, 24, 0);
        }
 
-       CFormView::OnInitialUpdate();
+       __super::OnInitialUpdate();
 
        // set caption to "swap paths" button
        LOGFONT lf;
@@ -387,7 +387,7 @@ void COpenView::OnPaint()
        dc.LineTo(rc.right, rcStatus.top - 3);
        dc.SelectObject(oldpen);
 
-       CFormView::OnPaint();
+       __super::OnPaint();
 }
 
 void COpenView::OnLButtonUp(UINT nFlags, CPoint point)
@@ -512,7 +512,7 @@ void COpenView::OnWindowPosChanged(WINDOWPOS* lpwndpos)
                        pFrameWnd->SetWindowPlacement(&wp);
                }
        }
-       CFormView::OnWindowPosChanged(lpwndpos);
+       __super::OnWindowPosChanged(lpwndpos);
 }
 
 void COpenView::OnDestroy()
@@ -520,7 +520,7 @@ void COpenView::OnDestroy()
        if (m_pDropHandler != nullptr)
                RevokeDragDrop(m_hWnd);
 
-       CFormView::OnDestroy();
+       __super::OnDestroy();
 }
 
 LRESULT COpenView::OnNcHitTest(CPoint point)
@@ -534,7 +534,7 @@ LRESULT COpenView::OnNcHitTest(CPoint point)
                if (PtInRect(&rc, point))
                        return HTRIGHT;
        }
-       return CFormView::OnNcHitTest(point);
+       return __super::OnNcHitTest(point);
 }
 
 /** 
@@ -1318,7 +1318,7 @@ void COpenView::OnTimer(UINT_PTR nIDEvent)
        if (nIDEvent == IDT_CHECKFILES || nIDEvent == IDT_RETRY)
                UpdateButtonStates();
 
-       CFormView::OnTimer(nIDEvent);
+       __super::OnTimer(nIDEvent);
 }
 
 /**
@@ -1615,7 +1615,7 @@ void COpenView::TrimPaths()
  */
 void COpenView::OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized)
 {
-       CFormView::OnActivate(nState, pWndOther, bMinimized);
+       __super::OnActivate(nState, pWndOther, bMinimized);
 
        if (nState == WA_ACTIVE || nState == WA_CLICKACTIVE)
                UpdateButtonStates();

diff --git a/Src/TrDialogs.cpp b/Src/TrDialogs.cpp
index f034f84..e3eaea9 100644 (file)
--- a/Src/TrDialogs.cpp
+++ b/Src/TrDialogs.cpp
@@ -29,21 +29,21 @@ void StaticDlgUtils::WildcardRemoveDuplicatePatterns(String& patterns)
 BOOL CTrDialog::OnInitDialog()\r
 {\r
        theApp.TranslateDialog(m_hWnd);\r
-       CDialog::OnInitDialog();\r
+       __super::OnInitDialog();\r
        return TRUE;\r
 }\r
 \r
 BOOL CTrPropertyPage::OnInitDialog()\r
 {\r
        theApp.TranslateDialog(m_hWnd);\r
-       CPropertyPage::OnInitDialog();\r
+       __super::OnInitDialog();\r
        return TRUE;\r
 }\r
 \r
 BOOL CTrDialogBar::Create(CWnd* pParentWnd, LPCTSTR lpszTemplateName,\r
        UINT nStyle, UINT nID)\r
 {\r
-       BOOL bSucceeded = CDialogBar::Create(pParentWnd, lpszTemplateName, nStyle, nID);\r
+       BOOL bSucceeded = __super::Create(pParentWnd, lpszTemplateName, nStyle, nID);\r
        if (bSucceeded)\r
                theApp.TranslateDialog(m_hWnd);\r
        return bSucceeded;\r
@@ -52,7 +52,7 @@ BOOL CTrDialogBar::Create(CWnd* pParentWnd, LPCTSTR lpszTemplateName,
 BOOL CTrDialogBar::Create(CWnd* pParentWnd, UINT nIDTemplate,\r
        UINT nStyle, UINT nID)\r
 {\r
-       BOOL bSucceeded = CDialogBar::Create(pParentWnd, nIDTemplate, nStyle, nID);\r
+       BOOL bSucceeded = __super::Create(pParentWnd, nIDTemplate, nStyle, nID);\r
        if (bSucceeded)\r
                theApp.TranslateDialog(m_hWnd);\r
        return bSucceeded;\r