[GME-commit] GMESRC/GME/GMEActiveBrowser ActiveBrowserPropertyPage.cpp,1.52,1.53 ActiveBrowserPropertyPage.h,1.15,1.16

Wed Dec 6 20:47:54 CST 2006

Update of /project/gme-repository/GMESRC/GME/GMEActiveBrowser
In directory escher:/tmp/cvs-serv725

Modified Files:
	ActiveBrowserPropertyPage.cpp ActiveBrowserPropertyPage.h 
Log Message:
CPropertyPageEx obsolete in VS2003. Prevented IntelliSense and object property viewability.
Replaced with CPropertyPage. 

CVS User: Zoltan Molnar, ISIS (zolmol)

Index: ActiveBrowserPropertyPage.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/ActiveBrowserPropertyPage.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ActiveBrowserPropertyPage.h	13 Mar 2006 19:24:24 -0000	1.15
--- ActiveBrowserPropertyPage.h	6 Dec 2006 20:47:52 -0000	1.16
***************
*** 20,24 ****

! class CAggregatePropertyPage : public CPropertyPageEx
  {
  	DECLARE_DYNCREATE(CAggregatePropertyPage)
--- 20,24 ----

! class CAggregatePropertyPage : public CPropertyPage
  {
  	DECLARE_DYNCREATE(CAggregatePropertyPage)
***************
*** 129,133 ****
  // CInheritancePropertyPage dialog

! class CInheritancePropertyPage : public CPropertyPageEx
  {
  	DECLARE_DYNCREATE(CInheritancePropertyPage)
--- 129,133 ----
  // CInheritancePropertyPage dialog

! class CInheritancePropertyPage : public CPropertyPage
  {
  	DECLARE_DYNCREATE(CInheritancePropertyPage)
***************
*** 210,214 ****

! class CMetaPropertyPage : public CPropertyPageEx
  {
  	DECLARE_DYNCREATE(CMetaPropertyPage)
--- 210,214 ----

! class CMetaPropertyPage : public CPropertyPage
  {
  	DECLARE_DYNCREATE(CMetaPropertyPage)

Index: ActiveBrowserPropertyPage.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/ActiveBrowserPropertyPage.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** ActiveBrowserPropertyPage.cpp	15 Aug 2006 17:48:03 -0000	1.52
--- ActiveBrowserPropertyPage.cpp	6 Dec 2006 20:47:52 -0000	1.53
***************
*** 26,32 ****
  #endif

! IMPLEMENT_DYNCREATE(CAggregatePropertyPage, CPropertyPageEx)
! IMPLEMENT_DYNCREATE(CInheritancePropertyPage, CPropertyPageEx)
! IMPLEMENT_DYNCREATE(CMetaPropertyPage, CPropertyPageEx)

--- 26,32 ----
  #endif

! IMPLEMENT_DYNCREATE(CAggregatePropertyPage, CPropertyPage)
! IMPLEMENT_DYNCREATE(CInheritancePropertyPage, CPropertyPage)
! IMPLEMENT_DYNCREATE(CMetaPropertyPage, CPropertyPage)

***************
*** 48,52 ****

! CAggregatePropertyPage::CAggregatePropertyPage() : CPropertyPageEx(CAggregatePropertyPage::IDD),
  				m_ComboEditCtrl(&m_ComboSearchCtrl), m_ComboSearchCtrl(&m_TreeAggregate)
  {
--- 48,52 ----

! CAggregatePropertyPage::CAggregatePropertyPage() : CPropertyPage(CAggregatePropertyPage::IDD),
  				m_ComboEditCtrl(&m_ComboSearchCtrl), m_ComboSearchCtrl(&m_TreeAggregate)
  {
***************
*** 63,67 ****
  void CAggregatePropertyPage::DoDataExchange(CDataExchange* pDX)
  {
! 	CPropertyPageEx::DoDataExchange(pDX);
  	//{{AFX_DATA_MAP(CAggregatePropertyPage)
  	DDX_Control(pDX, IDC_COMBO_SEARCH_AGGREGATE, m_ComboSearchCtrl);
--- 63,67 ----
  void CAggregatePropertyPage::DoDataExchange(CDataExchange* pDX)
  {
! 	CPropertyPage::DoDataExchange(pDX);
  	//{{AFX_DATA_MAP(CAggregatePropertyPage)
  	DDX_Control(pDX, IDC_COMBO_SEARCH_AGGREGATE, m_ComboSearchCtrl);
***************
*** 72,76 ****

! BEGIN_MESSAGE_MAP(CAggregatePropertyPage, CPropertyPageEx)
  	ON_WM_CONTEXTMENU()
  	//{{AFX_MSG_MAP(CAggregatePropertyPage)
--- 72,76 ----

! BEGIN_MESSAGE_MAP(CAggregatePropertyPage, CPropertyPage)
  	ON_WM_CONTEXTMENU()
  	//{{AFX_MSG_MAP(CAggregatePropertyPage)
***************
*** 95,99 ****
  {

! //	CPropertyPageEx::OnSize(nType, cx, cy);
  	if(	::IsWindow(m_ComboSearchCtrl.GetSafeHwnd()) )
  	{
--- 95,99 ----
  {

! //	CPropertyPage::OnSize(nType, cx, cy);
  	if(	::IsWindow(m_ComboSearchCtrl.GetSafeHwnd()) )
  	{
***************
*** 114,118 ****
  BOOL CAggregatePropertyPage::OnInitDialog() 
  {
! 	CPropertyPageEx::OnInitDialog();

--- 114,118 ----
  BOOL CAggregatePropertyPage::OnInitDialog() 
  {
! 	CPropertyPage::OnInitDialog();

***************
*** 2292,2296 ****
  	// TODO: Add your specialized code here and/or call the base class

! 	return CPropertyPageEx::OnCmdMsg(nID, nCode, pExtra, pHandlerInfo);
  }

--- 2292,2296 ----
  	// TODO: Add your specialized code here and/or call the base class

! 	return CPropertyPage::OnCmdMsg(nID, nCode, pExtra, pHandlerInfo);
  }

***************
*** 2307,2311 ****
  	pParent->SendMessage(DM_SETDEFID,IDC_SEARCH,0);
  	::SetFocus(GetDlgItem(IDC_SEARCH)->GetSafeHwnd());
! 	return CPropertyPageEx::OnSetActive();
  }

--- 2307,2311 ----
  	pParent->SendMessage(DM_SETDEFID,IDC_SEARCH,0);
  	::SetFocus(GetDlgItem(IDC_SEARCH)->GetSafeHwnd());
! 	return CPropertyPage::OnSetActive();
  }

***************
*** 2357,2361 ****

  CInheritancePropertyPage::CInheritancePropertyPage() 
! 	: CPropertyPageEx(CInheritancePropertyPage::IDD)
  	, m_ComboEditCtrl(&m_ComboSearchCtrl)
  	, m_ComboSearchCtrl(&m_TreeInheritance)
--- 2357,2361 ----

  CInheritancePropertyPage::CInheritancePropertyPage() 
! 	: CPropertyPage(CInheritancePropertyPage::IDD)
  	, m_ComboEditCtrl(&m_ComboSearchCtrl)
  	, m_ComboSearchCtrl(&m_TreeInheritance)
***************
*** 2375,2379 ****
  void CInheritancePropertyPage::DoDataExchange(CDataExchange* pDX)
  {
! 	CPropertyPageEx::DoDataExchange(pDX);
  	//{{AFX_DATA_MAP(CInheritancePropertyPage)
  	DDX_Control(pDX, IDC__COMBO_SEARCH_INHERITANCE, m_ComboSearchCtrl);
--- 2375,2379 ----
  void CInheritancePropertyPage::DoDataExchange(CDataExchange* pDX)
  {
! 	CPropertyPage::DoDataExchange(pDX);
  	//{{AFX_DATA_MAP(CInheritancePropertyPage)
  	DDX_Control(pDX, IDC__COMBO_SEARCH_INHERITANCE, m_ComboSearchCtrl);
***************
*** 2383,2387 ****

! BEGIN_MESSAGE_MAP(CInheritancePropertyPage, CPropertyPageEx)
  	//{{AFX_MSG_MAP(CInheritancePropertyPage)
  	ON_WM_SIZE()
--- 2383,2387 ----

! BEGIN_MESSAGE_MAP(CInheritancePropertyPage, CPropertyPage)
  	//{{AFX_MSG_MAP(CInheritancePropertyPage)
  	ON_WM_SIZE()
***************
*** 2397,2401 ****
  BOOL CInheritancePropertyPage::OnInitDialog() 
  {
! 	CPropertyPageEx::OnInitDialog();

--- 2397,2401 ----
  BOOL CInheritancePropertyPage::OnInitDialog() 
  {
! 	CPropertyPage::OnInitDialog();

***************
*** 2427,2431 ****
  void CInheritancePropertyPage::OnSize(UINT nType, int cx, int cy) 
  {
! 	CPropertyPageEx::OnSize(nType, cx, cy);

  	if(	::IsWindow(m_ComboSearchCtrl.GetSafeHwnd()) )
--- 2427,2431 ----
  void CInheritancePropertyPage::OnSize(UINT nType, int cx, int cy) 
  {
! 	CPropertyPage::OnSize(nType, cx, cy);

  	if(	::IsWindow(m_ComboSearchCtrl.GetSafeHwnd()) )
***************
*** 2872,2876 ****
  	ResetRoot();
  	SetupTree();
! 	return CPropertyPageEx::OnSetActive();
  }

--- 2872,2876 ----
  	ResetRoot();
  	SetupTree();
! 	return CPropertyPage::OnSetActive();
  }

***************
*** 2957,2961 ****

! CMetaPropertyPage::CMetaPropertyPage() : CPropertyPageEx(CMetaPropertyPage::IDD),
  			m_ComboEditCtrl(&m_ComboSearchCtrl), m_ComboSearchCtrl(&m_TreeMeta)
  {
--- 2957,2961 ----

! CMetaPropertyPage::CMetaPropertyPage() : CPropertyPage(CMetaPropertyPage::IDD),
  			m_ComboEditCtrl(&m_ComboSearchCtrl), m_ComboSearchCtrl(&m_TreeMeta)
  {
***************
*** 2970,2974 ****
  void CMetaPropertyPage::DoDataExchange(CDataExchange* pDX)
  {
! 	CPropertyPageEx::DoDataExchange(pDX);
  	//{{AFX_DATA_MAP(CMetaPropertyPage)
  	DDX_Control(pDX, IDC_COMBO_SERACH_META, m_ComboSearchCtrl);
--- 2970,2974 ----
  void CMetaPropertyPage::DoDataExchange(CDataExchange* pDX)
  {
! 	CPropertyPage::DoDataExchange(pDX);
  	//{{AFX_DATA_MAP(CMetaPropertyPage)
  	DDX_Control(pDX, IDC_COMBO_SERACH_META, m_ComboSearchCtrl);
***************
*** 2978,2982 ****

! BEGIN_MESSAGE_MAP(CMetaPropertyPage, CPropertyPageEx)
  	//{{AFX_MSG_MAP(CMetaPropertyPage)
  	ON_WM_SIZE()
--- 2978,2982 ----

! BEGIN_MESSAGE_MAP(CMetaPropertyPage, CPropertyPage)
  	//{{AFX_MSG_MAP(CMetaPropertyPage)
  	ON_WM_SIZE()
***************
*** 2990,2994 ****
  BOOL CMetaPropertyPage::OnInitDialog() 
  {
! 	CPropertyPageEx::OnInitDialog();

  	m_TreeMeta.ModifyStyle(0,TVS_HASLINES|TVS_HASBUTTONS|TVS_LINESATROOT
--- 2990,2994 ----
  BOOL CMetaPropertyPage::OnInitDialog() 
  {
! 	CPropertyPage::OnInitDialog();

  	m_TreeMeta.ModifyStyle(0,TVS_HASLINES|TVS_HASBUTTONS|TVS_LINESATROOT
***************
*** 3026,3035 ****
  	CActiveBrowserPropertySheet* pParent=(CActiveBrowserPropertySheet*)GetParent();
  	pParent->m_PageInheritance.ResetRoot();
! 	return CPropertyPageEx::OnSetActive();
  }

  void CMetaPropertyPage::OnSize(UINT nType, int cx, int cy) 
  {
! 	CPropertyPageEx::OnSize(nType, cx, cy);

  	if(	::IsWindow(m_ComboSearchCtrl.GetSafeHwnd()) )
--- 3026,3035 ----
  	CActiveBrowserPropertySheet* pParent=(CActiveBrowserPropertySheet*)GetParent();
  	pParent->m_PageInheritance.ResetRoot();
! 	return CPropertyPage::OnSetActive();
  }

  void CMetaPropertyPage::OnSize(UINT nType, int cx, int cy) 
  {
! 	CPropertyPage::OnSize(nType, cx, cy);

  	if(	::IsWindow(m_ComboSearchCtrl.GetSafeHwnd()) )
***************
*** 3517,3521 ****
  void CAggregatePropertyPage::OnKillFocus(CWnd* pNewWnd) 
  {
! 	CPropertyPageEx::OnKillFocus(pNewWnd);
  	HTREEITEM hItem=m_TreeAggregate.GetFirstSelectedItem();

--- 3517,3521 ----
  void CAggregatePropertyPage::OnKillFocus(CWnd* pNewWnd) 
  {
! 	CPropertyPage::OnKillFocus(pNewWnd);
  	HTREEITEM hItem=m_TreeAggregate.GetFirstSelectedItem();