[GME-commit] GMESRC/GME/Gme GMEOLEApp.cpp,1.10,1.11 GMEOLEPanel.cpp,1.4,1.5 GMEOLEPanel.h,1.3,1.4

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

Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv17233

Modified Files:
	GMEOLEApp.cpp GMEOLEPanel.cpp GMEOLEPanel.h 
Log Message:
Correcting the OLEPanel, wrong casting of CReBar and CToolBar to CSizingControlBar


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEOLEPanel.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEOLEPanel.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GMEOLEPanel.h	12 Jan 2005 17:53:16 -0000	1.3
--- GMEOLEPanel.h	5 May 2005 20:17:08 -0000	1.4
***************
*** 8,12 ****
  //
  
- #include "sizecbar.h"
  
  /////////////////////////////////////////////////////////////////////////////
--- 8,11 ----
***************
*** 24,28 ****
  // Operations
  public:
! 	void SetParams(CSizingControlBar *control, CString name) { m_control = control; m_name = name;}
  
  // Overrides
--- 23,27 ----
  // Operations
  public:
! 	void SetParams(CControlBar *control, CString name) { m_control = control; m_name = name;}
  
  // Overrides
***************
*** 32,37 ****
  // Implementation
  protected:
! //	CControlBar	*m_control;
! 	CSizingControlBar *m_control;
  	CString	m_name;
  
--- 31,35 ----
  // Implementation
  protected:
! 	CControlBar	*m_control;
  	CString	m_name;
  

Index: GMEOLEPanel.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEOLEPanel.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GMEOLEPanel.cpp	12 Jan 2005 17:53:16 -0000	1.4
--- GMEOLEPanel.cpp	5 May 2005 20:17:08 -0000	1.5
***************
*** 115,119 ****
  
  	IDispatch* interf = NULL;
! 	interf = m_control->GetInterface();
  	return interf;
  }
--- 115,120 ----
  
  	IDispatch* interf = NULL;
! 	CSizingControlBar * scb = dynamic_cast<CSizingControlBar *>( m_control);
! 	if( scb) interf = scb->GetInterface();
  	return interf;
  }

Index: GMEOLEApp.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEOLEApp.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GMEOLEApp.cpp	15 Apr 2005 18:24:10 -0000	1.10
--- GMEOLEApp.cpp	5 May 2005 20:17:08 -0000	1.11
***************
*** 574,593 ****
  
  	CGMEOLEPanel* panel = new CGMEOLEPanel();
! 	panel->SetParams((CSizingControlBar*)&(CMainFrame::theInstance->m_browser), _T("Browser"));
  	coll->Add(panel->GetIDispatch(FALSE));
  	panel->GetIDispatch(FALSE)->Release();	// We do not hold reference, hopefully the collection will hold one
  
  	panel = new CGMEOLEPanel();
! 	panel->SetParams((CSizingControlBar*)&(CMainFrame::theInstance->m_objectInspector), _T("Attribute Panel"));
  	coll->Add(panel->GetIDispatch(FALSE));
  	panel->GetIDispatch(FALSE)->Release();	// We do not hold reference, hopefully the collection will hold one
  
  	panel = new CGMEOLEPanel();
! 	panel->SetParams((CSizingControlBar*)&(CMainFrame::theInstance->m_console), _T("Console"));
  	coll->Add(panel->GetIDispatch(FALSE));
  	panel->GetIDispatch(FALSE)->Release();	// We do not hold reference, hopefully the collection will hold one
  
  	panel = new CGMEOLEPanel();
! 	panel->SetParams((CSizingControlBar*)&(CMainFrame::theInstance->m_partBrowser), _T("Part Browser"));
  	coll->Add(panel->GetIDispatch(FALSE));
  	panel->GetIDispatch(FALSE)->Release();	// We do not hold reference, hopefully the collection will hold one
--- 574,593 ----
  
  	CGMEOLEPanel* panel = new CGMEOLEPanel();
! 	panel->SetParams( &CMainFrame::theInstance->m_browser, _T("Browser"));
  	coll->Add(panel->GetIDispatch(FALSE));
  	panel->GetIDispatch(FALSE)->Release();	// We do not hold reference, hopefully the collection will hold one
  
  	panel = new CGMEOLEPanel();
! 	panel->SetParams( &CMainFrame::theInstance->m_objectInspector, _T("Attribute Panel"));
  	coll->Add(panel->GetIDispatch(FALSE));
  	panel->GetIDispatch(FALSE)->Release();	// We do not hold reference, hopefully the collection will hold one
  
  	panel = new CGMEOLEPanel();
! 	panel->SetParams( &CMainFrame::theInstance->m_console, _T("Console"));
  	coll->Add(panel->GetIDispatch(FALSE));
  	panel->GetIDispatch(FALSE)->Release();	// We do not hold reference, hopefully the collection will hold one
  
  	panel = new CGMEOLEPanel();
! 	panel->SetParams( &CMainFrame::theInstance->m_partBrowser, _T("Part Browser"));
  	coll->Add(panel->GetIDispatch(FALSE));
  	panel->GetIDispatch(FALSE)->Release();	// We do not hold reference, hopefully the collection will hold one
***************
*** 595,609 ****
  	// terge 
  	panel = new CGMEOLEPanel();
! 	panel->SetParams((CSizingControlBar*)&(CMainFrame::theInstance->m_pannWin), _T("Panning Window"));
  	coll->Add(panel->GetIDispatch(FALSE));
  	panel->GetIDispatch(FALSE)->Release();	// We do not hold reference, hopefully the collection will hold one
  
  	panel = new CGMEOLEPanel();
! 	panel->SetParams((CSizingControlBar*)&(CMainFrame::theInstance->m_wndStatusBar), _T("Status Bar"));
  	coll->Add(panel->GetIDispatch(FALSE));
  	panel->GetIDispatch(FALSE)->Release();	// We do not hold reference, hopefully the collection will hold one
  
  	panel = new CGMEOLEPanel();
! 	panel->SetParams((CSizingControlBar*)&(CMainFrame::theInstance->m_wndReBar), _T("Toolbar"));
  	coll->Add(panel->GetIDispatch(FALSE));	
  	panel->GetIDispatch(FALSE)->Release();	// We do not hold reference, hopefully the collection will hold one
--- 595,609 ----
  	// terge 
  	panel = new CGMEOLEPanel();
! 	panel->SetParams( &CMainFrame::theInstance->m_pannWin, _T("Panning Window"));
  	coll->Add(panel->GetIDispatch(FALSE));
  	panel->GetIDispatch(FALSE)->Release();	// We do not hold reference, hopefully the collection will hold one
  
  	panel = new CGMEOLEPanel();
! 	panel->SetParams( &CMainFrame::theInstance->m_wndStatusBar, _T("Status Bar"));
  	coll->Add(panel->GetIDispatch(FALSE));
  	panel->GetIDispatch(FALSE)->Release();	// We do not hold reference, hopefully the collection will hold one
  
  	panel = new CGMEOLEPanel();
! 	panel->SetParams( &CMainFrame::theInstance->m_wndReBar, _T("Toolbar"));
  	coll->Add(panel->GetIDispatch(FALSE));	
  	panel->GetIDispatch(FALSE)->Release();	// We do not hold reference, hopefully the collection will hold one