[GME-commit] GMESRC/GME/ObjectInspector ObjectInspectorCtl.cpp, 1.39, 1.40 ObjectInspectorCtl.h, 1.15, 1.16 InspectorDlg.h, 1.10, 1.11 InspectorDlg.cpp, 1.26, 1.27 ObjectInspector.odl, 1.3, 1.4 Property.cpp, 1.15, 1.16

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/ObjectInspector
In directory escher:/tmp/cvs-serv27997

Modified Files:
	ObjectInspectorCtl.cpp ObjectInspectorCtl.h InspectorDlg.h 
	InspectorDlg.cpp ObjectInspector.odl Property.cpp 
Log Message:
Page cycling back and forth.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: ObjectInspectorCtl.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ObjectInspector/ObjectInspectorCtl.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** ObjectInspectorCtl.cpp	26 Mar 2007 18:29:48 -0000	1.39
--- ObjectInspectorCtl.cpp	3 May 2007 18:57:57 -0000	1.40
***************
*** 7,10 ****
--- 7,11 ----
  #include "Preference.h"
  #include "Mga_i.c"
+ #include ".\objectinspectorctl.h"
  
  #ifdef _DEBUG
***************
*** 37,40 ****
--- 38,42 ----
  	DISP_FUNCTION(CObjectInspectorCtrl, "ShowPanel", ShowPanel, VT_EMPTY, VTS_I4)
  	DISP_FUNCTION(CObjectInspectorCtrl, "EditName", EditName, VT_EMPTY, VTS_NONE)
+ 	DISP_FUNCTION_ID(CObjectInspectorCtrl, "CyclePanel", dispidCyclePanel, CyclePanel, VT_EMPTY, VTS_BOOL)
  	//}}AFX_DISPATCH_MAP
  	DISP_FUNCTION_ID(CObjectInspectorCtrl, "AboutBox", DISPID_ABOUTBOX, AboutBox, VT_EMPTY, VTS_NONE)
***************
*** 304,307 ****
--- 306,314 ----
  }
  
+ void CObjectInspectorCtrl::CyclePanel(VARIANT_BOOL frwd)
+ {
+ 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+ 	m_inspectorDlg.CyclePanel( frwd != VARIANT_FALSE);
+ }
  
  LPUNKNOWN CObjectInspectorCtrl::GetMgaProject() 
***************
*** 1109,1110 ****
--- 1116,1118 ----
  	else if( !undo && rsz > 0) COMTHROW( m_project->Redo());
  }
+ 

Index: InspectorDlg.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ObjectInspector/InspectorDlg.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** InspectorDlg.h	23 Jul 2002 16:07:00 -0000	1.10
--- InspectorDlg.h	3 May 2007 18:57:57 -0000	1.11
***************
*** 38,41 ****
--- 38,42 ----
  	void Reset(bool preserveScrollPos = false);
  	void ShowPanel(int panel);
+ 	void CyclePanel(bool frwd);
  // Dialog Data
  	//{{AFX_DATA(CInspectorDlg)

Index: ObjectInspector.odl
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ObjectInspector/ObjectInspector.odl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ObjectInspector.odl	7 Dec 2006 19:49:59 -0000	1.3
--- ObjectInspector.odl	3 May 2007 18:57:57 -0000	1.4
***************
*** 37,40 ****
--- 37,41 ----
  			[id(3)] void ShowPanel(long panelID);
  			[id(4)] void EditName();
+ 			[id(5)] void CyclePanel(VARIANT_BOOL frwd);
  			//}}AFX_ODL_METHOD
  

Index: ObjectInspectorCtl.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ObjectInspector/ObjectInspectorCtl.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ObjectInspectorCtl.h	16 Jan 2007 17:52:24 -0000	1.15
--- ObjectInspectorCtl.h	3 May 2007 18:57:57 -0000	1.16
***************
*** 85,88 ****
--- 85,89 ----
  	afx_msg void ShowPanel(long panelID);
  	afx_msg void EditName();
+ 	afx_msg void CyclePanel(VARIANT_BOOL frwd);
  	//}}AFX_DISPATCH
  	DECLARE_DISPATCH_MAP()
***************
*** 133,136 ****
--- 134,138 ----
  	dispidShowPanel = 3L,
  	dispidEditName = 4L,
+ 	dispidCyclePanel = 5L,
  	eventidRootFolderNameChanged = 1L
  	//}}AFX_DISP_ID
***************
*** 140,144 ****
  	CMgaObjectEventList m_MgaObjectEventList;
  	void PropagateMgaMessages();
- 
  };
  
--- 142,145 ----

Index: Property.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ObjectInspector/Property.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Property.cpp	25 Jan 2004 18:42:58 -0000	1.15
--- Property.cpp	3 May 2007 18:57:57 -0000	1.16
***************
*** 658,661 ****
--- 658,663 ----
  		COMTHROW( ccpMgaSimpleConn->get_Src(&ccpTempFCO) );
  		ASSERT(ccpTempFCO != NULL);
+ 		if( !ccpTempFCO) 
+ 			continue;
  		COMTHROW( ccpTempFCO->get_Name(&bstrTemp) );
  
***************
*** 686,689 ****
--- 688,694 ----
  		COMTHROW( ccpMgaSimpleConn->get_Dst(&ccpTempFCO) );
  		ASSERT(ccpTempFCO != NULL);
+ 		if( !ccpTempFCO) 
+ 			continue;
+ 
  		COMTHROW( ccpTempFCO->get_Name(&bstrTemp) );
  

Index: InspectorDlg.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ObjectInspector/InspectorDlg.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** InspectorDlg.cpp	16 Jan 2007 17:52:24 -0000	1.26
--- InspectorDlg.cpp	3 May 2007 18:57:57 -0000	1.27
***************
*** 375,379 ****
  }
  
! 
  
  
--- 375,383 ----
  }
  
! void CInspectorDlg::CyclePanel(bool frwd)
! {
! 	int k = m_inspectorSheet.GetCurSel();
! 	ShowPanel( (frwd?++k:k+2) % 3);
! }