[GME-commit] GMESRC/GME/GMEActiveBrowser TreeCtrlEx.cpp,1.2,1.3 TreeCtrlEx.h,1.1,1.2

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Fri Oct 29 11:58:15 CDT 2004


Update of /var/lib/gme/GMESRC/GME/GMEActiveBrowser
In directory braindrain:/tmp/cvs-serv520

Modified Files:
	TreeCtrlEx.cpp TreeCtrlEx.h 
Log Message:
no message

CVS User: bogyom

Index: TreeCtrlEx.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/TreeCtrlEx.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TreeCtrlEx.cpp	30 May 2002 19:40:00 -0000	1.2
--- TreeCtrlEx.cpp	29 Oct 2004 15:58:13 -0000	1.3
***************
*** 47,52 ****
--- 47,69 ----
  // CTreeCtrlEx
  
+ CTreeCtrlEx::CTreeCtrlEx() : m_bSelectPending(FALSE), m_hClickedItem(NULL), m_hFirstSelectedItem(NULL), m_bSelectionComplete(TRUE), m_bEditLabelPending(FALSE) 
+ {
+     //m_pchTip = NULL;
+ 	//m_pwchTip = NULL;
+ }
+ 
+ CTreeCtrlEx::~CTreeCtrlEx()
+ {
+     /*if(m_pwchTip != NULL)
+ 		delete m_pwchTip;
+ 	
+ 	if(m_pchTip != NULL)
+ 		delete m_pchTip;*/
+ }
+ 
  BEGIN_MESSAGE_MAP(CTreeCtrlEx, CTreeCtrl)
  	//{{AFX_MSG_MAP(CTreeCtrlEx)
+     //ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTW, 0, 0xFFFF, OnToolTipText)
+ 	//ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText)
  	ON_WM_LBUTTONDOWN()
  	ON_WM_LBUTTONUP()
***************
*** 78,82 ****
  BOOL CTreeCtrlEx::Create(DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID)
  {
! 	return CTreeCtrl::Create(dwStyle, rect, pParentWnd, nID);
  }
  
--- 95,99 ----
  BOOL CTreeCtrlEx::Create(DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID)
  {
!     return CTreeCtrl::Create(dwStyle, rect, pParentWnd, nID);
  }
  
***************
*** 85,88 ****
--- 102,208 ----
  // CTreeCtrlEx message handlers
  
+ void CTreeCtrlEx::PreSubclassWindow()
+ {
+ 	CTreeCtrl::PreSubclassWindow();
+ 	//EnableToolTips(TRUE);
+ }
+ 
+ /*int CTreeCtrlEx::OnToolHitTest(CPoint point, TOOLINFO * pTI) const
+ {
+ 	RECT rect;
+ 	
+ 	UINT nFlags;
+ 	HTREEITEM hitem = HitTest( point, &nFlags );
+ 	if( nFlags & TVHT_ONITEM)
+ 	{
+ 		GetItemRect( hitem, &rect, TRUE );
+ 		pTI->hwnd = m_hWnd;
+ 		pTI->uId = (UINT)hitem;
+ 		pTI->lpszText = LPSTR_TEXTCALLBACK;
+ 		pTI->rect = rect;
+ 		return pTI->uId;
+ 	}
+ 	
+ 	return -1;
+ }*/
+ 
+ /*BOOL CTreeCtrlEx::OnToolTipText( UINT id, NMHDR * pNMHDR, LRESULT * pResult )
+ {
+ 	// need to handle both ANSI and UNICODE versions of the message
+ 	TOOLTIPTEXTA* pTTTA = (TOOLTIPTEXTA*)pNMHDR;
+ 	TOOLTIPTEXTW* pTTTW = (TOOLTIPTEXTW*)pNMHDR;
+ 	CString strTipText;
+ 	UINT nID = pNMHDR->idFrom;
+ 	
+ 	// Do not process the message from built in tooltip 
+ 	if( nID == (UINT)m_hWnd &&
+ 		(( pNMHDR->code == TTN_NEEDTEXTA && pTTTA->uFlags & TTF_IDISHWND ) ||
+ 		( pNMHDR->code == TTN_NEEDTEXTW && pTTTW->uFlags & TTF_IDISHWND ) ) )
+ 		return FALSE;
+ 	
+ 	// Get the mouse position
+ 	const MSG* pMessage;
+ 	CPoint pt;
+ 	pMessage = GetCurrentMessage();
+ 	ASSERT ( pMessage );
+ 	pt = pMessage->pt;
+ 	ScreenToClient( &pt );
+ 	
+ 	UINT nFlags;
+ 	HTREEITEM hitem = HitTest( pt, &nFlags );
+ 	if( nFlags & TVHT_ONITEM)
+ 	{
+ 		CString strTxt = GetItemText((HTREEITEM)nID);
+ 		strTipText = strTxt;
+ 	}
+ 	
+ #ifndef _UNICODE
+ 	if(pNMHDR->code == TTN_NEEDTEXTA)
+ 	{
+ 		if(m_pchTip != NULL)
+ 			delete m_pchTip;
+ 		
+ 		m_pchTip = new TCHAR[strTipText.GetLength()+1];
+ 		lstrcpyn(m_pchTip, strTipText, strTipText.GetLength());
+ 		m_pchTip[strTipText.GetLength()] = 0;
+ 		pTTTW->lpszText = (WCHAR*)m_pchTip;
+ 	}
+ 	else
+ 	{
+ 		if(m_pwchTip != NULL)
+ 			delete m_pwchTip;
+ 		
+ 		m_pwchTip = new WCHAR[strTipText.GetLength()+1];
+ 		_mbstowcsz(m_pwchTip, strTipText, strTipText.GetLength());
+ 		m_pwchTip[strTipText.GetLength()] = 0; // end of text
+ 		pTTTW->lpszText = (WCHAR*)m_pwchTip;
+ 	}
+ #else
+ 	if(pNMHDR->code == TTN_NEEDTEXTA)
+ 	{
+ 		if(m_pchTip != NULL)
+ 			delete m_pchTip;
+ 		
+ 		m_pchTip = new TCHAR[strTipText.GetLength()+1];
+ 		_wcstombsz(m_pchTip, strTipText, strTipText.GetLength());
+ 		m_pchTip[strTipText.GetLength()] = 0; // end of text
+ 		pTTTA->lpszText = (LPTSTR)m_pchTip;
+ 	}
+ 	else
+ 	{
+ 		if(m_pwchTip != NULL)
+ 			delete m_pwchTip;
+ 		
+ 		m_pwchTip = new WCHAR[strTipText.GetLength()+1];
+ 		lstrcpyn(m_pwchTip, strTipText, strTipText.GetLength());
+ 		m_pwchTip[strTipText.GetLength()] = 0;
+ 		pTTTA->lpszText = (LPTSTR) m_pwchTip;
+ 	}
+ #endif
+ 	
+ 	*pResult = 0;
+ 	
+ 	return TRUE;    // message was handled
+ }*/
  
  ///////////////////////////////////////////////////////////////////////////////

Index: TreeCtrlEx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/TreeCtrlEx.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TreeCtrlEx.h	1 Mar 2002 21:53:00 -0000	1.1
--- TreeCtrlEx.h	29 Oct 2004 15:58:13 -0000	1.2
***************
*** 26,30 ****
  // Construction
  public:
! 	CTreeCtrlEx() : m_bSelectPending(FALSE), m_hClickedItem(NULL), m_hFirstSelectedItem(NULL), m_bSelectionComplete(TRUE), m_bEditLabelPending(FALSE) {}
  	BOOL Create(DWORD dwStyle, DWORD dwExStyle, const RECT& rect, CWnd* pParentWnd, UINT nID);
  	BOOL Create(DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID);
--- 26,31 ----
  // Construction
  public:
! 	CTreeCtrlEx();
!     virtual ~CTreeCtrlEx();
  	BOOL Create(DWORD dwStyle, DWORD dwExStyle, const RECT& rect, CWnd* pParentWnd, UINT nID);
  	BOOL Create(DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID);
***************
*** 61,64 ****
--- 62,67 ----
  	BOOL		m_bEditLabelPending;
  	UINT		m_idTimer;
+     //TCHAR *     m_pchTip ;
+ 	//WCHAR *     m_pwchTip;
  
  // Operations
***************
*** 75,84 ****
  	void DeleteDragImageEx();
  	CPoint m_ptHotSpot;
! 	CImageList m_CurrentDragImage;
! 	virtual ~CTreeCtrlEx() {}
  
  	// Generated message map functions
  protected:
  	//{{AFX_MSG(CTreeCtrlEx)
  	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
  	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
--- 78,92 ----
  	void DeleteDragImageEx();
  	CPoint m_ptHotSpot;
! 	CImageList m_CurrentDragImage;	
  
  	// Generated message map functions
  protected:
+     //{{AFX_VIRTUAL(CTreeCtrlCh)
+    virtual void PreSubclassWindow();
+    //}}AFX_VIRTUAL
+ 
  	//{{AFX_MSG(CTreeCtrlEx)
+     //virtual int OnToolHitTest(CPoint point, TOOLINFO * pTI) const;
+     //afx_msg BOOL OnToolTipText( UINT id, NMHDR * pNMHDR, LRESULT * pResult );
  	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
  	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
***************
*** 91,95 ****
  	afx_msg BOOL OnSelchanged(NMHDR* pNMHDR, LRESULT* pResult);
  	afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point);
! 	afx_msg void OnTimer(UINT nIDEvent);
  	//}}AFX_MSG
  
--- 99,103 ----
  	afx_msg BOOL OnSelchanged(NMHDR* pNMHDR, LRESULT* pResult);
  	afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point);
! 	afx_msg void OnTimer(UINT nIDEvent);    	
  	//}}AFX_MSG
  



More information about the GME-commit mailing list