[GME-commit] GMESRC/GME/Gme GMEApp.cpp,1.136,1.137 GMEApp.h,1.31,1.32

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

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

Modified Files:
	GMEApp.cpp GMEApp.h 
Log Message:
Fixing an incorrect behaviour of component disabler.
Modified Files:
 	GMEApp.cpp GMEApp.h 


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEApp.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEApp.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** GMEApp.h	30 Jan 2006 20:47:54 -0000	1.31
--- GMEApp.h	1 Feb 2006 19:48:19 -0000	1.32
***************
*** 113,118 ****
  public:
  	// called from CGMEOLEApp:
! 	void SetCompFiltering( bool pOn)     { m_compFilterOn = pOn; }
! 	bool GetCompFiltering()              { return m_compFilterOn; }
  	void DisableComp(const CString& pCompToFind, bool pbHide);
  	void DisableCompForKinds( const CString& pComp, const CString& pKindSeq);
--- 113,118 ----
  public:
  	// called from CGMEOLEApp:
! 	void SetCompFiltering( bool pOn);
! 	bool GetCompFiltering();
  	void DisableComp(const CString& pCompToFind, bool pbHide);
  	void DisableCompForKinds( const CString& pComp, const CString& pKindSeq);

Index: GMEApp.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEApp.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** GMEApp.cpp	30 Jan 2006 20:47:54 -0000	1.136
--- GMEApp.cpp	1 Feb 2006 19:48:18 -0000	1.137
***************
*** 2609,2614 ****
  void CGMEApp::UpdateCompList4CurrentKind( const CString& pKind)
  {
- 	ClearDisabledComps(); // reset all to original state (enabled)
- 
  	// if filter is OFF return
  	if( !m_compFilterOn) 
--- 2609,2612 ----
***************
*** 2620,2623 ****
--- 2618,2623 ----
  	if( pKind.IsEmpty()) { ASSERT(0); return; }
  
+ 	ClearDisabledComps(); // reset all to original state (enabled)
+ 
  	if( m_compsOfKind.find( pKind) != m_compsOfKind.end()) // if it has an entry
  	{
***************
*** 2633,2635 ****
--- 2633,2649 ----
  		}
  	} // if this kind has no assigned [excluded] component set: NOP [every component is enabled]
+ }
+ 
+ void CGMEApp::SetCompFiltering( bool pOn)
+ { 
+ 	m_compFilterOn = pOn;
+ 	if( !m_compFilterOn) // if turned OFF
+ 	{
+ 		ClearDisabledComps(); // reset all to original state (enabled)
+ 	}
+ }
+ 
+ bool CGMEApp::GetCompFiltering()
+ {
+ 	return m_compFilterOn;
  }