anyedit-cvs

[boca4711 <boc...@us...>]

Update of /cvsroot/anyedit/AnyEditToolkit/GuiLib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10791/GuiLib

Modified Files:
	GuiTabWnd.cpp GuiTabWnd.h 
Log Message:
- Addtab extended with tooltip text
- DeleteTab calls DestroyWindow

Index: GuiTabWnd.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiTabWnd.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GuiTabWnd.h	15 Oct 2004 14:01:52 -0000	1.5
--- GuiTabWnd.h	20 Oct 2004 16:27:27 -0000	1.6
***************
*** 63,67 ****
  	void    SetTypeTab(TypeTab Type=TYPE_NORMAL);
  	void	virtual Drawtabs(CDC* dc);
! 	void	Addtab(CWnd* pParent,CString lpMsg,UINT uIcon);
  	void	SetImageList(UINT nBitmapID, int cx, int nGrow, COLORREF crMask);
  	void	RecalLayout();
--- 63,67 ----
  	void    SetTypeTab(TypeTab Type=TYPE_NORMAL);
  	void	virtual Drawtabs(CDC* dc);
! 	void	Addtab(CWnd* pParent, CString lpMsg, UINT uIcon, LPCTSTR lpcsTooltip = NULL);
  	void	SetImageList(UINT nBitmapID, int cx, int nGrow, COLORREF crMask);
  	void	RecalLayout();

Index: GuiTabWnd.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiTabWnd.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GuiTabWnd.cpp	15 Oct 2004 14:01:52 -0000	1.6
--- GuiTabWnd.cpp	20 Oct 2004 16:27:27 -0000	1.7
***************
*** 589,594 ****
  }
  
! 
! void CGuiTabWnd::Addtab(CWnd *pParent, CString lpMsg, UINT uIcon)
  {
  	ASSERT_VALID(pParent);
--- 589,594 ----
  }
  
! /// Add tab to tab control.
! void CGuiTabWnd::Addtab(CWnd *pParent, CString lpMsg, UINT uIcon, LPCTSTR lpcsTooltip)
  {
  	ASSERT_VALID(pParent);
***************
*** 615,620 ****
  	}
  
! 	if (m_style == S3D)
! 		CToolTip.AddTool(this,lpMsg,CRect(0,0,0,0),m_Numtabs);
  	RecalLayout();
  }
--- 615,625 ----
  	}
  
! 	if (m_style == S3D || m_TypeTab == TYPE_MDI)
! 	{
! 		if (lpcsTooltip != NULL)
! 			CToolTip.AddTool(this, lpcsTooltip, CRect(0,0,0,0), m_Numtabs);
! 		else
! 			CToolTip.AddTool(this, lpMsg, CRect(0,0,0,0), m_Numtabs);
! 	}
  	RecalLayout();
  }
***************
*** 625,643 ****
  	if (m_numtab < m_Numtabs)
  	{
! 		CGuiTab* ctn=(CGuiTab*) m_pArray[m_numtab];
! 		if (m_alnTab!=ALN_TOP)
  			ASSERT_VALID(ctn->pParent);
  		if (ctn)
  			delete ctn;
  		m_Numtabs--;
! 		m_pArray.RemoveAt(m_numtab,1);
! 		if (m_Numtabs >0)
  		{
  			if (m_iSelectTab == m_numtab)
  			{
! 				m_iSelectTab=m_iSelectTab-1;
! 				if (m_iSelectTab< 0) m_iSelectTab=0;
  				CGuiTab* ctn =(CGuiTab*) m_pArray[m_iSelectTab];
! 				CWnd* pParentNew=ctn->pParent;
  				ASSERT_VALID(pParentNew);
  				pParentNew->ShowWindow(SW_SHOW);
--- 630,650 ----
  	if (m_numtab < m_Numtabs)
  	{
! 		CGuiTab* ctn = (CGuiTab*) m_pArray[m_numtab];
! 		if (m_alnTab != ALN_TOP)
  			ASSERT_VALID(ctn->pParent);
+ 		if (::IsWindow(HWND(ctn->pParent->GetSafeHwnd())))
+ 			ctn->pParent->DestroyWindow();
  		if (ctn)
  			delete ctn;
  		m_Numtabs--;
! 		m_pArray.RemoveAt(m_numtab, 1);
! 		if (m_Numtabs > 0)
  		{
  			if (m_iSelectTab == m_numtab)
  			{
! 				m_iSelectTab = m_iSelectTab-1;
! 				if (m_iSelectTab< 0) m_iSelectTab = 0;
  				CGuiTab* ctn =(CGuiTab*) m_pArray[m_iSelectTab];
! 				CWnd* pParentNew = ctn->pParent;
  				ASSERT_VALID(pParentNew);
  				pParentNew->ShowWindow(SW_SHOW);