diff options
| -rw-r--r-- | Bus/IvyProbe/ETSLayout.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Bus/IvyProbe/ETSLayout.cpp b/Bus/IvyProbe/ETSLayout.cpp index fa62a7b..e7f52bb 100644 --- a/Bus/IvyProbe/ETSLayout.cpp +++ b/Bus/IvyProbe/ETSLayout.cpp @@ -1748,7 +1748,7 @@ bool ETSLayoutMgr::Pane::resizeTo(CRect& rcNewArea) #pragma warning(disable: 4355)
ETSLayoutDialog::ETSLayoutDialog(UINT nID, CWnd* pParent /*=NULL*/, LPCTSTR strName /*=NULL*/, bool bGripper /*=true*/)
- : CBaseDialog(nID, pParent), ETSLayoutMgr( this )
+ : CDialog(nID, pParent), ETSLayoutMgr( this )
{
//{{AFX_DATA_INIT(ETSLayoutDialog)
// NOTE: the ClassWizard will add member initialization here
@@ -1760,7 +1760,7 @@ ETSLayoutDialog::ETSLayoutDialog(UINT nID, CWnd* pParent /*=NULL*/, LPCTSTR strN }
#pragma warning(default: 4355)
-BEGIN_MESSAGE_MAP(ETSLayoutDialog, CBaseDialog)
+BEGIN_MESSAGE_MAP(ETSLayoutDialog, CDialog)
//{{AFX_MSG_MAP(ETSLayoutDialog)
ON_WM_SIZE()
ON_WM_GETMINMAXINFO()
@@ -1917,7 +1917,7 @@ ETSLayoutDialogBar::ETSLayoutDialogBar() }
#pragma warning(default: 4355)
-BEGIN_MESSAGE_MAP(ETSLayoutDialogBar, CBaseDialogBar)
+BEGIN_MESSAGE_MAP(ETSLayoutDialogBar, CDialogBar)
//{{AFX_MSG_MAP(ETSLayoutDialogBar)
ON_WM_SIZE()
ON_WM_GETMINMAXINFO()
@@ -2034,14 +2034,14 @@ IMPLEMENT_DYNAMIC(ETSLayoutFormView, CFormView) #pragma warning(disable: 4355)
ETSLayoutFormView::ETSLayoutFormView(UINT nID, LPCTSTR strName /*=NULL*/)
- : CBaseFormView(nID), ETSLayoutMgr( this )
+ : CFormView(nID), ETSLayoutMgr( this )
{
if(strName)
m_strRegStore = strName;
}
#pragma warning(default: 4355)
-BEGIN_MESSAGE_MAP(ETSLayoutFormView, CBaseFormView)
+BEGIN_MESSAGE_MAP(ETSLayoutFormView, CFormView)
//{{AFX_MSG_MAP(ETSLayoutFormView)
ON_WM_SIZE()
ON_WM_GETMINMAXINFO()
@@ -2164,7 +2164,7 @@ ETSLayoutPropertyPage::ETSLayoutPropertyPage( UINT nIDTemplate, UINT nIDCaption }
ETSLayoutPropertyPage::ETSLayoutPropertyPage( LPCTSTR lpszTemplateName, UINT nIDCaption /*= 0*/ )
- : CBasePropertyPage(lpszTemplateName, nIDCaption), ETSLayoutMgr( this )
+ : CPropertyPage(lpszTemplateName, nIDCaption), ETSLayoutMgr( this )
{
m_bLockMove = false;
}
@@ -2175,7 +2175,7 @@ ETSLayoutPropertyPage::~ETSLayoutPropertyPage() }
-BEGIN_MESSAGE_MAP(ETSLayoutPropertyPage, CBasePropertyPage)
+BEGIN_MESSAGE_MAP(ETSLayoutPropertyPage, CPropertyPage)
//{{AFX_MSG_MAP(ETSLayoutPropertyPage)
ON_WM_SIZE()
ON_WM_GETMINMAXINFO()
@@ -2485,7 +2485,7 @@ BOOL ETSLayoutPropertySheet::OnInitDialog() pPage->GetClientRect(&rcPage);
CreateRoot(VERTICAL);
- ASSERT(m_RootPane);
+ //ASSERT(m_RootPane);
// Add Tabcontrol to root pane
m_ItemTab = item( GetTabControl(), GREEDY, 0, 0, 0, 0);
|