anyedit-cvs — Cvs commit info will come in this list

[Anyedit-cvs]AnyEditToolkit/GuiLib CGuiEditView.cpp,1.1,1.2 CGuiEditView.h,1.1,1.2 GuiButton.h,1.4,1.5 GuiButtonTimer.cpp,1.1,1.2 GuiButtonTimer.h,1.1,1.2 GuiCapOutBar.cpp,1.1,1.2 GuiControlBar.cpp,1.2,1.3 GuiControlBar.h,1.2,1.3 GuiDocBarExten.cpp,1.1,1.2 GuiDocBarExten.h,1.1,1.2 GuiDocBarExtenEx.h,1.1,1.2 GuiDocSpecial.cpp,1.1,1.2 GuiDocSpecial.h,1.1,1.2 GuiDockToolBar.cpp,1.2,1.3 GuiDockToolBarEx.cpp,1.2,1.3 GuiDockToolBarEx.h,1.3,1.4 GuiDrawLayer.cpp,1.2,1.3 GuiDrawLayer.h,1.1,1.2 GuiDropDownEdit.cpp,1.1,1.2 GuiDropDownEdit.h,1.1,1.2 GuiEdit.cpp,1.1,1.2 GuiFDir.cpp,1.1,1.2 GuiFDir.h,1.1,1.2 GuiFolder.cpp,1.1,1.2 GuiFolder.h,1.1,1.2 GuiFolderFlat.cpp,1.1,1.2 GuiFolderFlat.h,1.1,1.2 GuiFrameWnd.cpp,1.2,1.3 GuiFrameWnd.h,1.1,1.2 GuiGridLayout.cpp,1.1,1.2 GuiGridLayout.h,1.1,1.2 GuiHeaderCtrl.cpp,1.1,1.2 GuiHeaderCtrl.h,1.1,1.2 GuiImageLinkButton.cpp,1.1,1.2 GuiImageLinkButton.h,1.1,1.2 GuiListCtrl.cpp,1.1,1.2 GuiListCtrl.h,1.1,1.2 GuiMDIFrame.h,1.2,1.3 GuiMDITabbed.cpp,1.2,1.3 GuiMDITabbed.h,1.1,1.2 GuiMDIWindowsDlg.h,1.1,1.2 GuiMiniFrame.cpp,1.1,1.2 GuiMiniFrame.h,1.1,1.2 GuiMiniFrameWnd.cpp,1.1,1.2 GuiMiniFrameWnd.h,1.1,1.2 GuiMiniTool.cpp,1.3,1.4 GuiMiniTool.h,1.3,1.4 GuiOfficeBar.cpp,1.1,1.2 GuiOfficeBar.h,1.1,1.2 GuiOutLook.h,1.1,1.2 GuiOutLookView.cpp,1.1,1.2 GuiPanelAccess.cpp,1.1,1.2 GuiPanelAccess.h,1.1,1.2 GuiPowerPointView.cpp,1.1,1.2 GuiPowerPointView.h,1.1,1.2 GuiRadioButton.cpp,1.1,1.2 GuiSplitter.cpp,1.2,1.3 GuiSplitter.h,1.2,1.3 GuiSplitterWnd.cpp,1.1,1.2 GuiSplitterWnd.h,1.1,1.2 GuiStatusBar.cpp,1.2,1.3 GuiStatusBar.h,1.1,1.2 GuiSysTray.cpp,1.1,1.2 GuiSysTray.h,1.1,1.2 GuiTabPowerPoint.cpp,1.2,1.3 GuiTabPowerPoint.h,1.1,1.2 GuiTabWnd.cpp,1.5,1.6 GuiTabWnd.h,1.4,1.5 GuiTabbed.cpp,1.4,1.5 GuiTabbed.h,1.1,1.2 GuiToolBarWnd.cpp,1.2,1.3 GuiToolBarWnd.h,1.2,1.3 GuiToolButton.cpp,1.1,1.2 GuiToolButton.h,1.1,1.2 GuiViewWorkTab.cpp,1.1,1.2 GuiViewWorkTab.h,1.1,1.2 GuiVisioFolder.cpp,1.1,1.2 GuiVisioFolder.h,1.1,1.2 GuiWorkPanel.cpp,1.1,1.2 GuiWorkPanel.h,1.1,1.2 GuiWorkTab.cpp,1.1,1.2 GuiWorkTab.h,1.1,1.2 MenuBar.cpp,1.3,1.4 MenuBar.h,1.1,1.2

[Leon W. <moo...@us...>]

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

Modified Files:
	CGuiEditView.cpp CGuiEditView.h GuiButton.h GuiButtonTimer.cpp 
	GuiButtonTimer.h GuiCapOutBar.cpp GuiControlBar.cpp 
	GuiControlBar.h GuiDocBarExten.cpp GuiDocBarExten.h 
	GuiDocBarExtenEx.h GuiDocSpecial.cpp GuiDocSpecial.h 
	GuiDockToolBar.cpp GuiDockToolBarEx.cpp GuiDockToolBarEx.h 
	GuiDrawLayer.cpp GuiDrawLayer.h GuiDropDownEdit.cpp 
	GuiDropDownEdit.h GuiEdit.cpp GuiFDir.cpp GuiFDir.h 
	GuiFolder.cpp GuiFolder.h GuiFolderFlat.cpp GuiFolderFlat.h 
	GuiFrameWnd.cpp GuiFrameWnd.h GuiGridLayout.cpp 
	GuiGridLayout.h GuiHeaderCtrl.cpp GuiHeaderCtrl.h 
	GuiImageLinkButton.cpp GuiImageLinkButton.h GuiListCtrl.cpp 
	GuiListCtrl.h GuiMDIFrame.h GuiMDITabbed.cpp GuiMDITabbed.h 
	GuiMDIWindowsDlg.h GuiMiniFrame.cpp GuiMiniFrame.h 
	GuiMiniFrameWnd.cpp GuiMiniFrameWnd.h GuiMiniTool.cpp 
	GuiMiniTool.h GuiOfficeBar.cpp GuiOfficeBar.h GuiOutLook.h 
	GuiOutLookView.cpp GuiPanelAccess.cpp GuiPanelAccess.h 
	GuiPowerPointView.cpp GuiPowerPointView.h GuiRadioButton.cpp 
	GuiSplitter.cpp GuiSplitter.h GuiSplitterWnd.cpp 
	GuiSplitterWnd.h GuiStatusBar.cpp GuiStatusBar.h 
	GuiSysTray.cpp GuiSysTray.h GuiTabPowerPoint.cpp 
	GuiTabPowerPoint.h GuiTabWnd.cpp GuiTabWnd.h GuiTabbed.cpp 
	GuiTabbed.h GuiToolBarWnd.cpp GuiToolBarWnd.h 
	GuiToolButton.cpp GuiToolButton.h GuiViewWorkTab.cpp 
	GuiViewWorkTab.h GuiVisioFolder.cpp GuiVisioFolder.h 
	GuiWorkPanel.cpp GuiWorkPanel.h GuiWorkTab.cpp GuiWorkTab.h 
	MenuBar.cpp MenuBar.h 
Log Message:
Fixed all the message maps, so Class Wizard can generate a correct Database.

Index: GuiGridLayout.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiGridLayout.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiGridLayout.cpp	26 Sep 2004 16:11:51 -0000	1.1
--- GuiGridLayout.cpp	15 Oct 2004 14:01:50 -0000	1.2
***************
*** 47,51 ****
  	m_nInsets=1;
  	m_GridBorder=GRIDNORMAL;
! 	m_pArray.RemoveAll();	
  	m_clr=GuiDrawLayer::GetRGBColorFace();
  	m_NumRowsAc=0;
--- 47,51 ----
  	m_nInsets=1;
  	m_GridBorder=GRIDNORMAL;
! 	m_pArray.RemoveAll();
  	m_clr=GuiDrawLayer::GetRGBColorFace();
  	m_NumRowsAc=0;
***************
*** 60,66 ****
--- 60,68 ----
  
  BEGIN_MESSAGE_MAP(CGuiGridLayout, CWnd)
+ 	//{{AFX_MSG_MAP(CGuiGridLayout)
  	ON_WM_SIZE()
  	ON_WM_PAINT()
  	ON_WM_DESTROY()
+ 	//}}AFX_MSG
  END_MESSAGE_MAP()
  
***************
*** 81,85 ****
  {
  	CWnd::OnSize(nType, cx, cy);
! 		
  	// TODO: Add your message handler code here
  }
--- 83,87 ----
  {
  	CWnd::OnSize(nType, cx, cy);
! 
  	// TODO: Add your message handler code here
  }
***************
*** 112,116 ****
  		}
  
! 	if (m_NumRowsAc < nRow)	
  		if (m_NumColsAc < nCol)
  		{
--- 114,118 ----
  		}
  
! 	if (m_NumRowsAc < nRow)
  		if (m_NumColsAc < nCol)
  		{
***************
*** 120,124 ****
  }
  void CGuiGridLayout::Add(int nRow,int nCol, CWnd* pWnd)
! {	
  	ASSERT_VALID(pWnd);
  	if (nRow> m_NumRows || nCol >m_NumCols)
--- 122,126 ----
  }
  void CGuiGridLayout::Add(int nRow,int nCol, CWnd* pWnd)
! {
  	ASSERT_VALID(pWnd);
  	if (nRow> m_NumRows || nCol >m_NumCols)
***************
*** 131,135 ****
  void CGuiGridLayout::RecalLayout()
  {
! 		
  }
  
--- 133,137 ----
  void CGuiGridLayout::RecalLayout()
  {
! 
  }
  
***************
*** 150,154 ****
          delete pArr;
      }
! 	
  	CWnd::OnDestroy();
  
--- 152,156 ----
          delete pArr;
      }
! 
  	CWnd::OnDestroy();
  

Index: GuiWorkTab.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiWorkTab.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiWorkTab.h	26 Sep 2004 16:11:52 -0000	1.1
--- GuiWorkTab.h	15 Oct 2004 14:01:52 -0000	1.2
***************
*** 1,8 ****
  /****************************************************************************
!  *																			*		 
!  *								GuiToolKit  								*	
!  *							 (MFC extension)								*			 
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*		   
   *																			*
   * This program is free software;so you are free to use it any of your		*
--- 1,8 ----
  /****************************************************************************
!  *																			*
!  *								GuiToolKit  								*
!  *							 (MFC extension)								*
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*
   *																			*
   * This program is free software;so you are free to use it any of your		*
***************
*** 17,22 ****
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements : (Add your name)								*
!  * -Francisco Campos														*				
!  *																			*	
   ****************************************************************************/
  
--- 17,22 ----
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements : (Add your name)								*
!  * -Francisco Campos														*
!  *																			*
   ****************************************************************************/
  
***************
*** 31,42 ****
  #include "GuiDrawlayer.h"
  #include "GuiMiniTool.h"
! #include "GuiDrawLayer.h" 
  
  //****************************************************************
  
! class GUILIBDLLEXPORT  CGuiWorkTab : public CGuiTabWnd  
  {
  public:
! 	
  	//***************************************
  		CGuiWorkTab();
--- 31,42 ----
  #include "GuiDrawlayer.h"
  #include "GuiMiniTool.h"
! #include "GuiDrawLayer.h"
  
  //****************************************************************
  
! class GUILIBDLLEXPORT  CGuiWorkTab : public CGuiTabWnd
  {
  public:
! 
  	//***************************************
  		CGuiWorkTab();
***************
*** 47,54 ****
  
  	void  virtual Drawtabs(CDC* dc);
- 	void  OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); 
  	void  PintaSeparador(CDC* dc);
- 	void  OnSpiNiz();
- 	void  OnSpiNde();	
  	void  SizeScroll();
  	virtual void StyleDispl(DWORD dwDsp=GUISTYLE_XP)
--- 47,51 ----
***************
*** 56,60 ****
  	 SendMessage(WM_NCPAINT);Invalidate(); UpdateWindow();}
  protected:
! 	
  
  	CScrollBar		m_spin;
--- 53,57 ----
  	 SendMessage(WM_NCPAINT);Invalidate(); UpdateWindow();}
  protected:
! 
  
  	CScrollBar		m_spin;
***************
*** 74,89 ****
  
  	//{{AFX_MSG(CGuiWorkTab)
! 		afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
! 		afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
! 		afx_msg void OnMouseMove(UINT nFlags, CPoint point);
! 		afx_msg BOOL OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message);
! 		afx_msg void OnSysColorChange(); 
! 		afx_msg void OnPaint();
  	//}}AFX_MSG
  
  	DECLARE_MESSAGE_MAP()
  public:
- 	afx_msg void OnWindowPosChanging(WINDOWPOS* lpwndpos);
- 	afx_msg void OnSize(UINT nType, int cx, int cy);
  };
  
--- 71,89 ----
  
  	//{{AFX_MSG(CGuiWorkTab)
! 	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
! 	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
! 	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
! 	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
! 	afx_msg BOOL OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message);
! 	afx_msg void OnSysColorChange();
! 	afx_msg void OnPaint();
! 	afx_msg void OnWindowPosChanging(WINDOWPOS* lpwndpos);
! 	afx_msg void OnSize(UINT nType, int cx, int cy);
  	//}}AFX_MSG
+ 	afx_msg void  OnSpiNiz();
+ 	afx_msg void  OnSpiNde();
  
  	DECLARE_MESSAGE_MAP()
  public:
  };
  

Index: GuiSplitterWnd.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiSplitterWnd.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiSplitterWnd.cpp	26 Sep 2004 16:11:51 -0000	1.1
--- GuiSplitterWnd.cpp	15 Oct 2004 14:01:50 -0000	1.2
***************
*** 1,8 ****
  /****************************************************************************
!  *																			*		 
!  *								GuiToolKit  								*	
!  *							 (MFC extension)								*			 
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*		   
   *																			*
   * This program is free software;so you are free to use it any of your		*
--- 1,8 ----
  /****************************************************************************
!  *																			*
!  *								GuiToolKit  								*
!  *							 (MFC extension)								*
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*
   *																			*
   * This program is free software;so you are free to use it any of your		*
***************
*** 17,22 ****
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements : (Add your name)								*
!  * -Francisco Campos														*				
!  *																			*	
   ****************************************************************************/
  
--- 17,22 ----
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements : (Add your name)								*
!  * -Francisco Campos														*
!  *																			*
   ****************************************************************************/
  
***************
*** 54,58 ****
--- 54,60 ----
  
  BEGIN_MESSAGE_MAP(CGuiSplitterWnd, CSplitterWnd)
+ 	//{{AFX_MSG_MAP(CGuiSplitterWnd)
  	ON_WM_PAINT()
+ 	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
  
***************
*** 145,149 ****
  
  	// fill the middle
! 	
  	pDC->FillSolidRect(rc, clr);
  }
--- 147,151 ----
  
  	// fill the middle
! 
  	pDC->FillSolidRect(rc, clr);
  }

Index: GuiDocSpecial.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiDocSpecial.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiDocSpecial.h	26 Sep 2004 16:11:49 -0000	1.1
--- GuiDocSpecial.h	15 Oct 2004 14:01:50 -0000	1.2
***************
*** 1,8 ****
  /****************************************************************************
!  *																			*		 
!  *								GuiToolKit  								*	
!  * (MFC extension)								*			 
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*		   
   *																			*
   * This program is free software; so you are free to use it any of your		*
--- 1,8 ----
  /****************************************************************************
!  *																			*
!  *								GuiToolKit  								*
!  * (MFC extension)								*
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*
   *																			*
   * This program is free software; so you are free to use it any of your		*
***************
*** 17,22 ****
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements :(Add your name)								*
!  * -Francisco Campos														*				
!  *																			*	
   ****************************************************************************/
  
--- 17,22 ----
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements :(Add your name)								*
!  * -Francisco Campos														*
!  *																			*
   ****************************************************************************/
  
***************
*** 30,34 ****
  #include "GuiTabWnd.h"
  
! class GUILIBDLLEXPORT CGuiDocSpecial : public CDockBar  
  {
  public:
--- 30,34 ----
  #include "GuiTabWnd.h"
  
! class GUILIBDLLEXPORT CGuiDocSpecial : public CDockBar
  {
  public:
***************
*** 42,54 ****
  protected:
  	CGuiTabWnd  m_tabwnd;
! 	
! protected:
! 	
! 	//{{AFX_VIRTUAL(CGuiDocSpecial)
! 	afx_msg void OnSize(UINT  nType, int cx, int cy);	
  	afx_msg void OnNcPaint();
  	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
! 	//}}AFX_VIRTUAL
! 	
  	DECLARE_MESSAGE_MAP()
  };
--- 42,53 ----
  protected:
  	CGuiTabWnd  m_tabwnd;
! 
! public:
! 	//{{AFX_MSG(CGuiDocSpecial)
! 	afx_msg void OnSize(UINT  nType, int cx, int cy);
  	afx_msg void OnNcPaint();
  	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
! 	//}}AFX_MSG
! 
  	DECLARE_MESSAGE_MAP()
  };

Index: GuiRadioButton.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiRadioButton.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiRadioButton.cpp	26 Sep 2004 16:11:51 -0000	1.1
--- GuiRadioButton.cpp	15 Oct 2004 14:01:50 -0000	1.2
***************
*** 1,8 ****
  /****************************************************************************
!  *																			*		 
!  *								GuiToolKit  								*	
!  *							 (MFC extension)								*			 
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*		   
   *																			*
   * This program is free software;so you are free to use it any of your		*
--- 1,8 ----
  /****************************************************************************
!  *																			*
!  *								GuiToolKit  								*
!  *							 (MFC extension)								*
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*
   *																			*
   * This program is free software;so you are free to use it any of your		*
***************
*** 17,22 ****
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements : (Add your name)								*
!  * -Francisco Campos														*				
!  *																			*	
   ****************************************************************************/
  
--- 17,22 ----
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements : (Add your name)								*
!  * -Francisco Campos														*
!  *																			*
   ****************************************************************************/
  
***************
*** 55,62 ****
  	ON_WM_TIMER()
  	ON_WM_MOUSEMOVE()
! 	//ON_WM_LBUTTONDOWN()
  	ON_WM_LBUTTONUP()
  	ON_WM_CREATE()
! 	//ON_WM_KILLFOCUS()
  
  	//}}AFX_MSG_MAP
--- 55,62 ----
  	ON_WM_TIMER()
  	ON_WM_MOUSEMOVE()
! 	ON_WM_LBUTTONDOWN()
  	ON_WM_LBUTTONUP()
  	ON_WM_CREATE()
! 	ON_WM_KILLFOCUS()
  
  	//}}AFX_MSG_MAP
***************
*** 68,72 ****
  
  
! void CGuiRadioButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) 
  {
  	// TODO: Add your code to draw the specified item
--- 68,72 ----
  
  
! void CGuiRadioButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)
  {
  	// TODO: Add your code to draw the specified item
***************
*** 88,93 ****
  	CRect m_rcText=m_rcClient;
  	GetWindowText(m_szCaption);
! 	
! 	
  	//-------------------------------------------------------
  	//Ajust text
--- 88,93 ----
  	CRect m_rcText=m_rcClient;
  	GetWindowText(m_szCaption);
! 
! 
  	//-------------------------------------------------------
  	//Ajust text
***************
*** 95,99 ****
  	if(m_szCaption.GetLength() > 1)
  		m_Csize= pDC->GetTextExtent(m_szCaption);
! 	
  	if (m_rcClient.Height() > 13)
  	{
--- 95,99 ----
  	if(m_szCaption.GetLength() > 1)
  		m_Csize= pDC->GetTextExtent(m_szCaption);
! 
  	if (m_rcClient.Height() > 13)
  	{
***************
*** 114,118 ****
  		m_rcText.left=m_rcTemp.right+1;
  	}
! 	
  	m_rc=m_rcTemp;
  	//-------------------------------------------------------------------
--- 114,118 ----
  		m_rcText.left=m_rcTemp.right+1;
  	}
! 
  	m_rc=m_rcTemp;
  	//-------------------------------------------------------------------
***************
*** 124,130 ****
  	if (lpDrawItemStruct->itemState & ODS_DISABLED)
  	   pDC->DrawState(pt, m_Csize, m_szCaption, DSS_DISABLED, TRUE, 0, (HBRUSH)NULL);
! 	else 
! 		pDC->DrawText(m_szCaption,m_rcText,DT_SINGLELINE|DT_LEFT|DT_VCENTER);			   		
! 	
  	if (m_bPressBtn && !m_SelectBtn)
  	{
--- 124,130 ----
  	if (lpDrawItemStruct->itemState & ODS_DISABLED)
  	   pDC->DrawState(pt, m_Csize, m_szCaption, DSS_DISABLED, TRUE, 0, (HBRUSH)NULL);
! 	else
! 		pDC->DrawText(m_szCaption,m_rcText,DT_SINGLELINE|DT_LEFT|DT_VCENTER);
! 
  	if (m_bPressBtn && !m_SelectBtn)
  	{
***************
*** 140,144 ****
  		CheckRadio(pDC,m_rc) ;
  	}
! 	
  }
  
--- 140,144 ----
  		CheckRadio(pDC,m_rc) ;
  	}
! 
  }
  
***************
*** 149,153 ****
  
  
! void CGuiRadioButton::OnTimer(UINT nIDEvent) 
  {
  	// TODO: Add your message handler code here and/or call default
--- 149,153 ----
  
  
! void CGuiRadioButton::OnTimer(UINT nIDEvent)
  {
  	// TODO: Add your message handler code here and/or call default
***************
*** 161,170 ****
  		Invalidate();
  		KillTimer(1);
! 	}	
! 		
  	CButton::OnTimer(nIDEvent);
  }
  
! void CGuiRadioButton::OnMouseMove(UINT nFlags, CPoint point) 
  {
  	// TODO: Add your message handler code here and/or call default
--- 161,170 ----
  		Invalidate();
  		KillTimer(1);
! 	}
! 
  	CButton::OnTimer(nIDEvent);
  }
  
! void CGuiRadioButton::OnMouseMove(UINT nFlags, CPoint point)
  {
  	// TODO: Add your message handler code here and/or call default
***************
*** 182,186 ****
  }
  
! void CGuiRadioButton::OnLButtonDown(UINT nFlags, CPoint point) 
  {
  	// TODO: Add your message handler code here and/or call default
--- 182,186 ----
  }
  
! void CGuiRadioButton::OnLButtonDown(UINT nFlags, CPoint point)
  {
  	// TODO: Add your message handler code here and/or call default
***************
*** 190,197 ****
  	UpdateWindow();
  	CButton::OnLButtonDown(nFlags, point);
! 	
  }
  
! void CGuiRadioButton::OnLButtonUp(UINT nFlags, CPoint point) 
  {
  	// TODO: Add your message handler code here and/or call default
--- 190,197 ----
  	UpdateWindow();
  	CButton::OnLButtonDown(nFlags, point);
! 
  }
  
! void CGuiRadioButton::OnLButtonUp(UINT nFlags, CPoint point)
  {
  	// TODO: Add your message handler code here and/or call default
***************
*** 206,231 ****
  		Invalidate();
  		KillTimer(1);
! 	}	
  }
  
  //*******************************************************************
  
! int CGuiRadioButton::OnCreate(LPCREATESTRUCT lpCreateStruct) 
  {
  	if (CButton::OnCreate(lpCreateStruct) == -1)
  		return -1;
! 	
  	// TODO: Add your specialized creation code here
! 	
  	return 0;
  }
  
  //*******************************************************************
! void CGuiRadioButton::OnKillFocus(CWnd* pNewWnd) 
  {
  	CButton::OnKillFocus(pNewWnd);
! 	
  	// TODO: Add your message handler code here
! 	
  }
  
--- 206,231 ----
  		Invalidate();
  		KillTimer(1);
! 	}
  }
  
  //*******************************************************************
  
! int CGuiRadioButton::OnCreate(LPCREATESTRUCT lpCreateStruct)
  {
  	if (CButton::OnCreate(lpCreateStruct) == -1)
  		return -1;
! 
  	// TODO: Add your specialized creation code here
! 
  	return 0;
  }
  
  //*******************************************************************
! void CGuiRadioButton::OnKillFocus(CWnd* pNewWnd)
  {
  	CButton::OnKillFocus(pNewWnd);
! 
  	// TODO: Add your message handler code here
! 
  }
  
***************
*** 259,264 ****
      pDC->SetPixel(CPoint(10,2),RGB(87,124,156));
  	pDC->SetPixel(CPoint(11,2),RGB(181,196,207));
! 	
! 	
  	//pDC->SetPixel(CPoint(0,3),RGB(223,228,229));
  	pDC->SetPixel(CPoint(1,3),RGB(133,158,175));
--- 259,264 ----
      pDC->SetPixel(CPoint(10,2),RGB(87,124,156));
  	pDC->SetPixel(CPoint(11,2),RGB(181,196,207));
! 
! 
  	//pDC->SetPixel(CPoint(0,3),RGB(223,228,229));
  	pDC->SetPixel(CPoint(1,3),RGB(133,158,175));
***************
*** 267,281 ****
  	pDC->SetPixel(CPoint(11,3),RGB(133,158,175));
  	//pDC->SetPixel(CPoint(12,3),RGB(223,228,229));
! 	
  	pDC->SetPixel(CPoint(0,4),RGB(164,183,198));
  	pDC->SetPixel(CPoint(1,4),RGB(102,135,163));
  	pDC->SetPixel(CPoint(11,4),RGB(102,135,163));
  	pDC->SetPixel(CPoint(12,4),RGB(164,183,198));
! 	
  	pDC->SetPixel(CPoint(0,5),RGB(102,135,163));
  	pDC->SetPixel(CPoint(1,5),RGB(164,183,198));
  	pDC->SetPixel(CPoint(11,5),RGB(164,183,198));
  	pDC->SetPixel(CPoint(12,5),RGB(102,135,163));
! 	
  	pDC->SetPixel(CPoint(0,6),RGB(133,158,175));
  	pDC->SetPixel(CPoint(12,6),RGB(133,158,175));
--- 267,281 ----
  	pDC->SetPixel(CPoint(11,3),RGB(133,158,175));
  	//pDC->SetPixel(CPoint(12,3),RGB(223,228,229));
! 
  	pDC->SetPixel(CPoint(0,4),RGB(164,183,198));
  	pDC->SetPixel(CPoint(1,4),RGB(102,135,163));
  	pDC->SetPixel(CPoint(11,4),RGB(102,135,163));
  	pDC->SetPixel(CPoint(12,4),RGB(164,183,198));
! 
  	pDC->SetPixel(CPoint(0,5),RGB(102,135,163));
  	pDC->SetPixel(CPoint(1,5),RGB(164,183,198));
  	pDC->SetPixel(CPoint(11,5),RGB(164,183,198));
  	pDC->SetPixel(CPoint(12,5),RGB(102,135,163));
! 
  	pDC->SetPixel(CPoint(0,6),RGB(133,158,175));
  	pDC->SetPixel(CPoint(12,6),RGB(133,158,175));
***************
*** 285,294 ****
  	pDC->SetPixel(CPoint(11,7),RGB(164,183,198));
  	pDC->SetPixel(CPoint(12,7),RGB(102,135,163));
! 	
  	pDC->SetPixel(CPoint(0,8),RGB(164,183,198));
  	pDC->SetPixel(CPoint(1,8),RGB(102,135,163));
  	pDC->SetPixel(CPoint(11,8),RGB(102,135,163));
  	pDC->SetPixel(CPoint(12,8),RGB(164,183,198));
! 	
  	//pDC->SetPixel(CPoint(0,9),RGB(223,228,229));
  	pDC->SetPixel(CPoint(1,9),RGB(133,158,175));
--- 285,294 ----
  	pDC->SetPixel(CPoint(11,7),RGB(164,183,198));
  	pDC->SetPixel(CPoint(12,7),RGB(102,135,163));
! 
  	pDC->SetPixel(CPoint(0,8),RGB(164,183,198));
  	pDC->SetPixel(CPoint(1,8),RGB(102,135,163));
  	pDC->SetPixel(CPoint(11,8),RGB(102,135,163));
  	pDC->SetPixel(CPoint(12,8),RGB(164,183,198));
! 
  	//pDC->SetPixel(CPoint(0,9),RGB(223,228,229));
  	pDC->SetPixel(CPoint(1,9),RGB(133,158,175));
***************
*** 297,301 ****
  	pDC->SetPixel(CPoint(11,9),RGB(133,158,175));
  	//pDC->SetPixel(CPoint(12,9),RGB(223,228,229));
! 	
  	pDC->SetPixel(CPoint(1,10),RGB(181,196,207));
  	pDC->SetPixel(CPoint(2,10),RGB(87,124,156));
--- 297,301 ----
  	pDC->SetPixel(CPoint(11,9),RGB(133,158,175));
  	//pDC->SetPixel(CPoint(12,9),RGB(223,228,229));
! 
  	pDC->SetPixel(CPoint(1,10),RGB(181,196,207));
  	pDC->SetPixel(CPoint(2,10),RGB(87,124,156));
***************
*** 304,308 ****
      pDC->SetPixel(CPoint(10,10),RGB(87,124,156));
  	pDC->SetPixel(CPoint(11,10),RGB(181,196,207));
! 	
  	pDC->SetPixel(CPoint(2,11),RGB(180,196,207));
  	pDC->SetPixel(CPoint(3,11),RGB(133,158,175));
--- 304,308 ----
      pDC->SetPixel(CPoint(10,10),RGB(87,124,156));
  	pDC->SetPixel(CPoint(11,10),RGB(181,196,207));
! 
  	pDC->SetPixel(CPoint(2,11),RGB(180,196,207));
  	pDC->SetPixel(CPoint(3,11),RGB(133,158,175));
***************
*** 322,334 ****
  	//pDC->SetPixel(CPoint(9,12),RGB(223,228,229));
  
! 	
! }	
  //*******************************************************************
! void CGuiRadioButton::CheckRadio(CDC* pDC,CRect m_rc) 
  {
  	CRect m_rcTemp=m_rc;
  	m_rcTemp.DeflateRect(6,6);
  	pDC->SetPixel(m_rc.left+6,3,RGB(242,237,215));
! 	
  	pDC->SetPixel(m_rc.left+5,4,RGB(160,209,148));
  	pDC->SetPixel(m_rc.left+6,4,RGB(77,191,72));
--- 322,334 ----
  	//pDC->SetPixel(CPoint(9,12),RGB(223,228,229));
  
! 
! }
  //*******************************************************************
! void CGuiRadioButton::CheckRadio(CDC* pDC,CRect m_rc)
  {
  	CRect m_rcTemp=m_rc;
  	m_rcTemp.DeflateRect(6,6);
  	pDC->SetPixel(m_rc.left+6,3,RGB(242,237,215));
! 
  	pDC->SetPixel(m_rc.left+5,4,RGB(160,209,148));
  	pDC->SetPixel(m_rc.left+6,4,RGB(77,191,72));
***************
*** 357,368 ****
  	pDC->SetPixel(m_rc.left+7,8,RGB(160,209,148));
  
! 	
  }
  
  void CGuiRadioButton::DrawOrange(CDC* pDC,CRect m_rc)
  {
! 	
  	pDC->SetPixel(CPoint(6,1),RGB(244,212,140));
! 	
  	pDC->SetPixel(CPoint(3,2),RGB(181,196,207));
  	pDC->SetPixel(CPoint(4,2),RGB(181,196,207));
--- 357,368 ----
  	pDC->SetPixel(m_rc.left+7,8,RGB(160,209,148));
  
! 
  }
  
  void CGuiRadioButton::DrawOrange(CDC* pDC,CRect m_rc)
  {
! 
  	pDC->SetPixel(CPoint(6,1),RGB(244,212,140));
! 
  	pDC->SetPixel(CPoint(3,2),RGB(181,196,207));
  	pDC->SetPixel(CPoint(4,2),RGB(181,196,207));
***************
*** 372,377 ****
      pDC->SetPixel(CPoint(8,2),RGB(253,214,132));
  	//pDC->SetPixel(CPoint(9,2),RGB(253,214,132));
! 	
! 	
  	pDC->SetPixel(CPoint(3,3),RGB(252,220,152));
  	pDC->SetPixel(CPoint(4,3),RGB(252,220,152));
--- 372,377 ----
      pDC->SetPixel(CPoint(8,2),RGB(253,214,132));
  	//pDC->SetPixel(CPoint(9,2),RGB(253,214,132));
! 
! 
  	pDC->SetPixel(CPoint(3,3),RGB(252,220,152));
  	pDC->SetPixel(CPoint(4,3),RGB(252,220,152));
***************
*** 381,385 ****
  	pDC->SetPixel(CPoint(8,3),RGB(251,200,99));
  	pDC->SetPixel(CPoint(9,3),RGB(251,200,99));
! 	
  	pDC->SetPixel(CPoint(2,4),RGB(254,223,156));
  	pDC->SetPixel(CPoint(3,4),RGB(254,220,152));
--- 381,385 ----
  	pDC->SetPixel(CPoint(8,3),RGB(251,200,99));
  	pDC->SetPixel(CPoint(9,3),RGB(251,200,99));
! 
  	pDC->SetPixel(CPoint(2,4),RGB(254,223,156));
  	pDC->SetPixel(CPoint(3,4),RGB(254,220,152));
***************
*** 388,398 ****
  	pDC->SetPixel(CPoint(9,4),RGB(251,200,99));
  	pDC->SetPixel(CPoint(10,4),RGB(251,200,99));
! 	
! 	
  	pDC->SetPixel(CPoint(2,5),RGB(253,217,140));
  	pDC->SetPixel(CPoint(3,5),RGB(247,227,179));
  	pDC->SetPixel(CPoint(9,5),RGB(247,227,179));
  	pDC->SetPixel(CPoint(10,5),RGB(251,200,99));
! 	
  
  	pDC->SetPixel(CPoint(1,6),RGB(254,223,156));
--- 388,398 ----
  	pDC->SetPixel(CPoint(9,4),RGB(251,200,99));
  	pDC->SetPixel(CPoint(10,4),RGB(251,200,99));
! 
! 
  	pDC->SetPixel(CPoint(2,5),RGB(253,217,140));
  	pDC->SetPixel(CPoint(3,5),RGB(247,227,179));
  	pDC->SetPixel(CPoint(9,5),RGB(247,227,179));
  	pDC->SetPixel(CPoint(10,5),RGB(251,200,99));
! 
  
  	pDC->SetPixel(CPoint(1,6),RGB(254,223,156));
***************
*** 403,412 ****
  	pDC->SetPixel(CPoint(11,6),RGB(251,200,99));
  
! 	
  	pDC->SetPixel(CPoint(2,7),RGB(252,211,124));
  	pDC->SetPixel(CPoint(3,7),RGB(246,224,172));
  	pDC->SetPixel(CPoint(9,7),RGB(251,200,99));
  	pDC->SetPixel(CPoint(10,7),RGB(251,200,99));
! 	
  	pDC->SetPixel(CPoint(2,8),RGB(254,223,156));
  	pDC->SetPixel(CPoint(3,8),RGB(254,220,152));
--- 403,412 ----
  	pDC->SetPixel(CPoint(11,6),RGB(251,200,99));
  
! 
  	pDC->SetPixel(CPoint(2,7),RGB(252,211,124));
  	pDC->SetPixel(CPoint(3,7),RGB(246,224,172));
  	pDC->SetPixel(CPoint(9,7),RGB(251,200,99));
  	pDC->SetPixel(CPoint(10,7),RGB(251,200,99));
! 
  	pDC->SetPixel(CPoint(2,8),RGB(254,223,156));
  	pDC->SetPixel(CPoint(3,8),RGB(254,220,152));
***************
*** 422,426 ****
  	pDC->SetPixel(CPoint(8,9),RGB(251,200,99));
  	pDC->SetPixel(CPoint(9,9),RGB(251,200,99));
! 	
  	pDC->SetPixel(CPoint(4,10),RGB(251,200,99));
  	pDC->SetPixel(CPoint(5,10),RGB(251,200,99));
--- 422,426 ----
  	pDC->SetPixel(CPoint(8,9),RGB(251,200,99));
  	pDC->SetPixel(CPoint(9,9),RGB(251,200,99));
! 
  	pDC->SetPixel(CPoint(4,10),RGB(251,200,99));
  	pDC->SetPixel(CPoint(5,10),RGB(251,200,99));
***************
*** 430,434 ****
  
  	pDC->SetPixel(CPoint(6,11),RGB(251,200,99));
! 	
  
  }
--- 430,434 ----
  
  	pDC->SetPixel(CPoint(6,11),RGB(251,200,99));
! 
  
  }
***************
*** 440,450 ****
  	ASSERT(pParent);
  
! 	
  	CWnd *pWnd = pParent->GetNextDlgGroupItem((CWnd *)this);
  	while (pWnd && (pWnd != this))
  	{
! 		
! 		
! 		if ((((CButton*)pWnd)->GetButtonStyle() & BS_AUTORADIOBUTTON) && 
  			pWnd->IsKindOf( RUNTIME_CLASS( CGuiRadioButton ) ))
  		{
--- 440,450 ----
  	ASSERT(pParent);
  
! 
  	CWnd *pWnd = pParent->GetNextDlgGroupItem((CWnd *)this);
  	while (pWnd && (pWnd != this))
  	{
! 
! 
! 		if ((((CButton*)pWnd)->GetButtonStyle() & BS_AUTORADIOBUTTON) &&
  			pWnd->IsKindOf( RUNTIME_CLASS( CGuiRadioButton ) ))
  		{
***************
*** 454,463 ****
  		pWnd = pParent->GetNextDlgGroupItem(pWnd);
  	}
! 	
! 	
! }	
  
  //*******************************************************************
! BOOL CGuiRadioButton::PreTranslateMessage(MSG* pMsg) 
  {
  	// TODO: Add your specialized code here and/or call the base class
--- 454,463 ----
  		pWnd = pParent->GetNextDlgGroupItem(pWnd);
  	}
! 
! 
! }
  
  //*******************************************************************
! BOOL CGuiRadioButton::PreTranslateMessage(MSG* pMsg)
  {
  	// TODO: Add your specialized code here and/or call the base class
***************
*** 465,469 ****
  }
  //*******************************************************************
! void CGuiRadioButton::PreSubclassWindow() 
  {
  	// TODO: Add your specialized code here and/or call the base class
--- 465,469 ----
  }
  //*******************************************************************
! void CGuiRadioButton::PreSubclassWindow()
  {
  	// TODO: Add your specialized code here and/or call the base class
***************
*** 475,479 ****
  
  
! BOOL CGuiRadioButton::OnEraseBkgnd(CDC* pDC) 
  {
  	// TODO: Add your message handler code here and/or call default
--- 475,479 ----
  
  
! BOOL CGuiRadioButton::OnEraseBkgnd(CDC* pDC)
  {
  	// TODO: Add your message handler code here and/or call default

Index: GuiDocSpecial.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiDocSpecial.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiDocSpecial.cpp	26 Sep 2004 16:11:49 -0000	1.1
--- GuiDocSpecial.cpp	15 Oct 2004 14:01:50 -0000	1.2
***************
*** 1,8 ****
  /****************************************************************************
!  *																			*		 
!  *								GuiToolKit  								*	
!  *							 (MFC extension)								*			 
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*		   
   *																			*
   * This program is free software;so you are free to use it any of your		*
--- 1,8 ----
  /****************************************************************************
!  *																			*
!  *								GuiToolKit  								*
!  *							 (MFC extension)								*
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*
   *																			*
   * This program is free software;so you are free to use it any of your		*
***************
*** 17,22 ****
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements : (Add your name)								*
!  * -Francisco Campos														*				
!  *																			*	
   ****************************************************************************/
  
--- 17,22 ----
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements : (Add your name)								*
!  * -Francisco Campos														*
!  *																			*
   ****************************************************************************/
  
***************
*** 38,45 ****
  
  BEGIN_MESSAGE_MAP(CGuiDocSpecial,CDockBar)
!  //{{AFX_MSG_MAP(CGuiDocSpecial)
!  ON_WM_SIZE()
!  ON_WM_CREATE()
!  //}}AFX_MSG_MAP
  END_MESSAGE_MAP()
  
--- 38,46 ----
  
  BEGIN_MESSAGE_MAP(CGuiDocSpecial,CDockBar)
!     //{{AFX_MSG_MAP(CGuiDocSpecial)
!     ON_WM_SIZE()
!     ON_WM_NCPAINT()
!     ON_WM_CREATE()
!     //}}AFX_MSG_MAP
  END_MESSAGE_MAP()
  
***************
*** 72,76 ****
  	CRect rcWindow;
  	CRect rcClient;
! 	int m_iBorder=2; 
  	CWindowDC	dc(this);
  	GetWindowRect(&rcWindow);
--- 73,77 ----
  	CRect rcWindow;
  	CRect rcClient;
! 	int m_iBorder=2;
  	CWindowDC	dc(this);
  	GetWindowRect(&rcWindow);
***************
*** 82,96 ****
      ScreenToClient(rcWindow);
  	rcClient.OffsetRect(-rcWindow.left,-rcWindow.top);
! 	dc.ExcludeClipRect(rcClient);   
  	rcWindow.OffsetRect(-rcWindow.left, -rcWindow.top);
  	int ibotton=rcWindow.bottom;
  	rcWindow.top=rcWindow.bottom-m_iBorder;
! 	dc.FillRect(rcWindow,&cbr); 
  	rcWindow.top=0;
  	rcWindow.bottom+=3;
! 	dc.FillRect(rcWindow,&cbr); 
  	//un truco primitivo que evita el efecto estar a un nivel encima de la otra barra
! 	dc.FillSolidRect(0,rcWindow.top,rcWindow.right+1,1,::GetSysColor(COLOR_BTNSHADOW)); 
! 	dc.FillSolidRect(0,rcWindow.top+1,rcWindow.right+1,1,::GetSysColor(COLOR_BTNHIGHLIGHT)); 
  
  }
--- 83,97 ----
      ScreenToClient(rcWindow);
  	rcClient.OffsetRect(-rcWindow.left,-rcWindow.top);
! 	dc.ExcludeClipRect(rcClient);
  	rcWindow.OffsetRect(-rcWindow.left, -rcWindow.top);
  	int ibotton=rcWindow.bottom;
  	rcWindow.top=rcWindow.bottom-m_iBorder;
! 	dc.FillRect(rcWindow,&cbr);
  	rcWindow.top=0;
  	rcWindow.bottom+=3;
! 	dc.FillRect(rcWindow,&cbr);
  	//un truco primitivo que evita el efecto estar a un nivel encima de la otra barra
! 	dc.FillSolidRect(0,rcWindow.top,rcWindow.right+1,1,::GetSysColor(COLOR_BTNSHADOW));
! 	dc.FillSolidRect(0,rcWindow.top+1,rcWindow.right+1,1,::GetSysColor(COLOR_BTNHIGHLIGHT));
  
  }
***************
*** 131,135 ****
  			{
  				pParent->GetWindowText(m_caption);
! 				m_tabwnd.Addtab(pParent,m_caption,i);		
  			}
  		}
--- 132,136 ----
  			{
  				pParent->GetWindowText(m_caption);
! 				m_tabwnd.Addtab(pParent,m_caption,i);
  			}
  		}

Index: GuiControlBar.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiControlBar.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GuiControlBar.cpp	11 Oct 2004 18:01:23 -0000	1.2
--- GuiControlBar.cpp	15 Oct 2004 14:01:50 -0000	1.3
***************
*** 85,88 ****
--- 85,89 ----
  
  BEGIN_MESSAGE_MAP(CGuiControlBar, CControlBar)
+ 	//{{AFX_MSG_MAP(CGuiControlBar)
  	ON_WM_CREATE()
  	ON_WM_LBUTTONDOWN()
***************
*** 106,110 ****
  	ON_COMMAND(ID_GUI_SHOWTITLE, OnShowTitle)
  	ON_WM_SYSCOLORCHANGE()
[...1006 lines suppressed...]
  	if (!m_bSupportMultiView)
--- 2682,2686 ----
  {
  //	CControlBar::OnSize(nType, cx, cy);
! 
  	CWnd* pWnd = GetWindow(GW_CHILD);
  	if (!m_bSupportMultiView)
***************
*** 2732,2736 ****
  		m_nLastAlignDocking=0;
  
! 	
  }
  
--- 2733,2737 ----
  		m_nLastAlignDocking=0;
  
! 
  }
  

Index: GuiFolder.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiFolder.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiFolder.cpp	26 Sep 2004 16:11:51 -0000	1.1
--- GuiFolder.cpp	15 Oct 2004 14:01:50 -0000	1.2
***************
*** 1,8 ****
  /****************************************************************************
!  *																			*		 
!  *								GuiToolKit  								*	
!  *							 (MFC extension)								*			 
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*		   
   *																			*
   * This program is free software;so you are free to use it any of your		*
--- 1,8 ----
  /****************************************************************************
!  *																			*
!  *								GuiToolKit  								*
!  *							 (MFC extension)								*
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*
   *																			*
   * This program is free software;so you are free to use it any of your		*
***************
*** 21,25 ****
   * -Serge Koroleuve															*
   * -MarkDoubson																*
!  *																			*	
   ****************************************************************************/
  
--- 21,25 ----
   * -Serge Koroleuve															*
   * -MarkDoubson																*
!  *																			*
   ****************************************************************************/
  
***************
*** 47,51 ****
  	m_rect=CRect(0,0,0,0);
  	m_posUp=TRUE;
! 	
  }
  
--- 47,51 ----
  	m_rect=CRect(0,0,0,0);
  	m_posUp=TRUE;
! 
  }
  
***************
*** 57,61 ****
  	m_numFolderDown=0;
  	m_numFolderUp=0;
! 	m_iSelected=0;	
  	m_ultimoFolderResal =-1;
  	m_itemp=0;
--- 57,61 ----
  	m_numFolderDown=0;
  	m_numFolderUp=0;
! 	m_iSelected=0;
  	m_ultimoFolderResal =-1;
  	m_itemp=0;
***************
*** 79,84 ****
  	ON_WM_LBUTTONDOWN()
  	ON_WM_LBUTTONUP()
- 	//}}AFX_MSG_MAP
  	ON_WM_DESTROY()
  END_MESSAGE_MAP()
  
--- 79,84 ----
  	ON_WM_LBUTTONDOWN()
  	ON_WM_LBUTTONUP()
  	ON_WM_DESTROY()
+ 	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
  
***************
*** 87,91 ****
  // CGuiFolder message handlers
  
! BOOL CGuiFolder::Create(DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID) 
  {
  	// TODO: Add your specialized code here and/or call the base class
--- 87,91 ----
  // CGuiFolder message handlers
  
! BOOL CGuiFolder::Create(DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID)
  {
  	// TODO: Add your specialized code here and/or call the base class
***************
*** 93,97 ****
  }
  
! void CGuiFolder::OnLButtonDown(UINT nFlags, CPoint point) 
  {
  	// TODO: Add your message handler code here and/or call default
--- 93,97 ----
  }
  
! void CGuiFolder::OnLButtonDown(UINT nFlags, CPoint point)
  {
  	// TODO: Add your message handler code here and/or call default
***************
*** 104,113 ****
  			DrawFolder(cit,mPush);
  		}
! 	}		
  
  	CWnd::OnLButtonDown(nFlags, point);
  }
  
! void CGuiFolder::PreSubclassWindow() 
  {
  	ModifyStyle(0,BS_OWNERDRAW);
--- 104,113 ----
  			DrawFolder(cit,mPush);
  		}
! 	}
  
  	CWnd::OnLButtonDown(nFlags, point);
  }
  
! void CGuiFolder::PreSubclassWindow()
  {
  	ModifyStyle(0,BS_OWNERDRAW);
***************
*** 115,119 ****
  }
  
! void CGuiFolder::OnLButtonUp(UINT nFlags, CPoint point) 
  {
  	// TODO: Add your message handler code here and/or call default
--- 115,119 ----
  }
  
! void CGuiFolder::OnLButtonUp(UINT nFlags, CPoint point)
  {
  	// TODO: Add your message handler code here and/or call default
***************
*** 129,133 ****
  			EfectoScroll();
  		}
! 	}		
  
  	CWnd::OnLButtonUp(nFlags, point);
--- 129,133 ----
  			EfectoScroll();
  		}
! 	}
  
  	CWnd::OnLButtonUp(nFlags, point);
***************
*** 147,151 ****
  		// si es el ultimo folder y no esta abajo no haga nada
  		if (m_iSelected == m_NumFolders-1 &&
! 			((CFolderBar*)m_ArrayFolder[m_iSelected])->m_posUp ==TRUE)	
  		{
  			m_iSelected=m_itemp;
--- 147,151 ----
  		// si es el ultimo folder y no esta abajo no haga nada
  		if (m_iSelected == m_NumFolders-1 &&
! 			((CFolderBar*)m_ArrayFolder[m_iSelected])->m_posUp ==TRUE)
  		{
  			m_iSelected=m_itemp;
***************
*** 157,164 ****
  				return;
  			m_iSentidoScroll =1;
! 				//de esta posición todos los folders hacia abajo 
  			for (int iCont=m_iSelected+1;iCont < m_iNumBotton; iCont++)
  				((CFolderBar*)m_ArrayFolder[iCont])->m_posUp =FALSE;
! 				
  		}
  		else if (((CFolderBar*)m_ArrayFolder[m_iSelected])->m_posUp ==FALSE)
--- 157,164 ----
  				return;
  			m_iSentidoScroll =1;
! 				//de esta posición todos los folders hacia abajo
  			for (int iCont=m_iSelected+1;iCont < m_iNumBotton; iCont++)
  				((CFolderBar*)m_ArrayFolder[iCont])->m_posUp =FALSE;
! 
  		}
  		else if (((CFolderBar*)m_ArrayFolder[m_iSelected])->m_posUp ==FALSE)
***************
*** 169,173 ****
  					((CFolderBar*)m_ArrayFolder[iCont])->m_posUp =TRUE;
  		}
! 		
  	}
  
--- 169,173 ----
  					((CFolderBar*)m_ArrayFolder[iCont])->m_posUp =TRUE;
  		}
! 
  	}
  
***************
*** 184,188 ****
  		m_AntFolder=m_iSelected;
  	}
! 	
  	if (m_iSentidoScroll ==1)
  	{
--- 184,188 ----
  		m_AntFolder=m_iSelected;
  	}
! 
  	if (m_iSentidoScroll ==1)
  	{
***************
*** 198,206 ****
  			//m_cwnd->Invalidate();
  			//m_cwnd->SendMessage(WM_PAINT,0,0);
! 			
! 			
! 			
  		}*/
! 		RecalLayout();	
  	}
  	else if (m_iSentidoScroll ==2)
--- 198,206 ----
  			//m_cwnd->Invalidate();
  			//m_cwnd->SendMessage(WM_PAINT,0,0);
! 
! 
! 
  		}*/
! 		RecalLayout();
  	}
  	else if (m_iSentidoScroll ==2)
***************
*** 216,228 ****
  			Sleep(50);
  			DrawFolder(cb,mFlat);
! 			
! 			
  		}
  		*/
! 		RecalLayout();	
  	}
  	else
  		m_iSelected=m_itemp;
! 		
  
  
--- 216,228 ----
  			Sleep(50);
  			DrawFolder(cb,mFlat);
! 
! 
  		}
  		*/
! 		RecalLayout();
  	}
  	else
  		m_iSelected=m_itemp;
! 
  
  
***************
*** 230,234 ****
  }
  
! void CGuiFolder::OnMouseMove(UINT nFlags, CPoint point) 
  {
  	int m_iNumBotton= m_ArrayFolder.GetSize();
--- 230,234 ----
  }
  
! void CGuiFolder::OnMouseMove(UINT nFlags, CPoint point)
  {
  	int m_iNumBotton= m_ArrayFolder.GetSize();
***************
*** 246,250 ****
  			  if (m_ultimoFolderResal != -1)
  			  {
! 				CFolderBar* cit1=(CFolderBar*)m_ArrayFolder[m_ultimoFolderResal];	
  				DrawFolder(cit1,mFlat);
  			  }
--- 246,250 ----
  			  if (m_ultimoFolderResal != -1)
  			  {
! 				CFolderBar* cit1=(CFolderBar*)m_ArrayFolder[m_ultimoFolderResal];
  				DrawFolder(cit1,mFlat);
  			  }
***************
*** 254,264 ****
  			m_ultimoFolderResal=iCont;
  			SetTimer(1,100,NULL);
! 			return;			
  		}
! 	}	
  
  	if (m_ultimoFolderResal != -1)
  	 {
! 		CFolderBar* cit1=(CFolderBar*)m_ArrayFolder[m_ultimoFolderResal];	
  		DrawFolder(cit1,mFlat);
  		m_ultimoFolderResal=-1;
--- 254,264 ----
  			m_ultimoFolderResal=iCont;
  			SetTimer(1,100,NULL);
! 			return;
  		}
! 	}
  
  	if (m_ultimoFolderResal != -1)
  	 {
! 		CFolderBar* cit1=(CFolderBar*)m_ArrayFolder[m_ultimoFolderResal];
  		DrawFolder(cit1,mFlat);
  		m_ultimoFolderResal=-1;
***************
*** 279,288 ****
  	rc.top+=1;
  	rc.right-=1;
! 	
! 	
  	if (m_StyleDisplay == GUISTYLE_2003)
  	{
! 		
! 		CGradient M(CSize(rc.Width(),rc.Height()));	
  		if(m_Style != mOutlook)
  		{
--- 279,288 ----
  	rc.top+=1;
  	rc.right-=1;
! 
! 
  	if (m_StyleDisplay == GUISTYLE_2003)
  	{
! 
! 		CGradient M(CSize(rc.Width(),rc.Height()));
  		if(m_Style != mOutlook)
  		{
***************
*** 297,301 ****
  		}
  		M.Draw(&pDC,rc.left-1,rc.top-1,0,0,rc.Width(),rc.Height(),SRCCOPY);
! 		
  		CRect rcWin=rc;
  		//rcWin.left= gripper.left;
--- 297,301 ----
  		}
  		M.Draw(&pDC,rc.left-1,rc.top-1,0,0,rc.Width(),rc.Height(),SRCCOPY);
! 
  		CRect rcWin=rc;
  		//rcWin.left= gripper.left;
***************
*** 323,331 ****
  			cb.CreateSolidBrush(::GetSysColor(COLOR_BTNSHADOW));
  			pDC.FillRect(rcBlack,&cb);
! 	
  		}
! 		
  			pDC.Draw3dRect(rc, m_Style != mOutlook? GuiDrawLayer::GetRGBColorBTNHigh():GuiDrawLayer::GetRGBPressBXP(),GuiDrawLayer::GetRGBColorShadow(GuiDrawLayer::m_Style));
! 			
  	}
  
--- 323,331 ----
  			cb.CreateSolidBrush(::GetSysColor(COLOR_BTNSHADOW));
  			pDC.FillRect(rcBlack,&cb);
! 
  		}
! 
  			pDC.Draw3dRect(rc, m_Style != mOutlook? GuiDrawLayer::GetRGBColorBTNHigh():GuiDrawLayer::GetRGBPressBXP(),GuiDrawLayer::GetRGBColorShadow(GuiDrawLayer::m_Style));
! 
  	}
  
***************
*** 337,344 ****
  			rc.right-=30;
  		}
! 			
  		if (m_Style == mNormal)
  		{
! 					
  			pDC.Draw3dRect(rc, GuiDrawLayer::GetRGBColorBTNHigh(),GuiDrawLayer::GetRGBColorShadow(m_StyleDisplay));
  			rc.DeflateRect(1,1);
--- 337,344 ----
  			rc.right-=30;
  		}
! 
  		if (m_Style == mNormal)
  		{
! 
  			pDC.Draw3dRect(rc, GuiDrawLayer::GetRGBColorBTNHigh(),GuiDrawLayer::GetRGBColorShadow(m_StyleDisplay));
  			rc.DeflateRect(1,1);
***************
*** 371,375 ****
  		m_cadBreak+=_T("...");
  		rc.right+=3;
! 		
  			pDC.DrawText(m_cadBreak,rc,DT_SINGLELINE|DT_LEFT|DT_VCENTER);
  	}
--- 371,375 ----
  		m_cadBreak+=_T("...");
  		rc.right+=3;
! 
  			pDC.DrawText(m_cadBreak,rc,DT_SINGLELINE|DT_LEFT|DT_VCENTER);
  	}
***************
*** 378,382 ****
  	  if (m_typel!=mOutlook)
  			pDC.DrawText(cfb->m_lpMsg,rc,DT_SINGLELINE|DT_LEFT|DT_VCENTER);
! 	  else	
  			pDC.DrawText(cfb->m_lpMsg,rc,DT_WORDBREAK|DT_SINGLELINE|DT_CENTER|DT_VCENTER);
  	}
--- 378,382 ----
  	  if (m_typel!=mOutlook)
  			pDC.DrawText(cfb->m_lpMsg,rc,DT_SINGLELINE|DT_LEFT|DT_VCENTER);
! 	  else
  			pDC.DrawText(cfb->m_lpMsg,rc,DT_WORDBREAK|DT_SINGLELINE|DT_CENTER|DT_VCENTER);
  	}
***************
*** 387,391 ****
  
  
! void CGuiFolder::OnPaint() 
  {
  	CPaintDC dc(this); // device context for painting
--- 387,391 ----
  
  
! void CGuiFolder::OnPaint()
  {
  	CPaintDC dc(this); // device context for painting
***************
*** 401,410 ****
  			DrawFolder((CFolderBar*) m_ArrayFolder[iCont],mFlat);
  		else
! 			DrawFolder((CFolderBar*) m_ArrayFolder[iCont],mFlat);		
  
! 	}		
  }
  
! void CGuiFolder::OnSize(UINT nType, int cx, int cy) 
  {
  	CWnd::OnSize(nType, cx, cy);
--- 401,410 ----
  			DrawFolder((CFolderBar*) m_ArrayFolder[iCont],mFlat);
  		else
! 			DrawFolder((CFolderBar*) m_ArrayFolder[iCont],mFlat);
  
! 	}
  }
  
! void CGuiFolder::OnSize(UINT nType, int cx, int cy)
  {
  	CWnd::OnSize(nType, cx, cy);
***************
*** 412,419 ****
  		RecalLayout();
  	// TODO: Add your message handler code here
! 	
  }
  
! void CGuiFolder::OnTimer(UINT nIDEvent) 
  {
  	// TODO: Add your message handler code here and/or call default
--- 412,419 ----
  		RecalLayout();
  	// TODO: Add your message handler code here
! 
  }
  
! void CGuiFolder::OnTimer(UINT nIDEvent)
  {
  	// TODO: Add your message handler code here and/or call default
***************
*** 429,433 ****
  			rc=cfd->m_rect;
  		}
! 		
  		if (!rc.PtInRect(pt))
  		{
--- 429,433 ----
  			rc=cfd->m_rect;
  		}
! 
  		if (!rc.PtInRect(pt))
  		{
***************
*** 441,445 ****
  			KillTimer(1);
  		}
! 		
  	}
  	CWnd::OnTimer(nIDEvent);
--- 441,445 ----
  			KillTimer(1);
  		}
! 
  	}
  	CWnd::OnTimer(nIDEvent);
***************
*** 456,463 ****
  }
  
! BOOL CGuiFolder::PreTranslateMessage(MSG* pMsg) 
  {
  	// TODO: Add your specialized code here and/or call the base class
! 	
  	return CWnd::PreTranslateMessage(pMsg);
  }
--- 456,463 ----
  }
  
! BOOL CGuiFolder::PreTranslateMessage(MSG* pMsg)
  {
  	// TODO: Add your specialized code here and/or call the base class
! 
  	return CWnd::PreTranslateMessage(pMsg);
  }
***************
*** 493,497 ****
  			else
  			{
! 				
  				for(int iRev=m_iNumFolder-1; iRev>=iCont; iRev--)
  				{
--- 493,497 ----
  			else
  			{
! 
  				for(int iRev=m_iNumFolder-1; iRev>=iCont; iRev--)
  				{
***************
*** 505,509 ****
  			}
  		}
! 		
  	}
  	CFolderBar* cfd=(CFolderBar*) m_ArrayFolder[m_iSelected];
--- 505,509 ----
  			}
  		}
! 
  	}
  	CFolderBar* cfd=(CFolderBar*) m_ArrayFolder[m_iSelected];
***************
*** 532,536 ****
  			CFolderBar* cit=(CFolderBar*)m_ArrayFolder[iCont];
  			cit->m_Cwnd->ShowWindow(SW_HIDE);
! 		}		
  	}
  	pParent->ShowWindow(SW_SHOW);
--- 532,536 ----
  			CFolderBar* cit=(CFolderBar*)m_ArrayFolder[iCont];
  			cit->m_Cwnd->ShowWindow(SW_HIDE);
! 		}
  	}
  	pParent->ShowWindow(SW_SHOW);
***************
*** 542,546 ****
  
  
! BOOL CGuiFolder::OnEraseBkgnd(CDC* pDC) 
  {
  	CBrush cbr;
--- 542,546 ----
  
  
! BOOL CGuiFolder::OnEraseBkgnd(CDC* pDC)
  {
  	CBrush cbr;
***************
*** 572,576 ****
  			m_iSelected = 1;
  		}
! 		CFolderBar* pBar = (CFolderBar*)m_ArrayFolder.GetAt(m_iNumFolder); 
  		m_ArrayFolder.RemoveAt(m_iNumFolder,1);
  		delete pBar;
--- 572,576 ----
  			m_iSelected = 1;
  		}
! 		CFolderBar* pBar = (CFolderBar*)m_ArrayFolder.GetAt(m_iNumFolder);
  		m_ArrayFolder.RemoveAt(m_iNumFolder,1);
  		delete pBar;
***************
*** 582,586 ****
  		else if(m_iNumFolder > 0)
  			m_iSelected = m_iNumFolder - 1;
! 		if (bUpdate) 
  		{
  			int OldSel = m_iSelected;
--- 582,586 ----
  		else if(m_iNumFolder > 0)
  			m_iSelected = m_iNumFolder - 1;
! 		if (bUpdate)
  		{
  			int OldSel = m_iSelected;
***************
*** 616,620 ****
  }
  
! 	//thanks to  Ernesto Garcia	
  void CGuiFolder::OnDestroy()
  {
--- 616,620 ----
  }
  
! 	//thanks to  Ernesto Garcia
  void CGuiFolder::OnDestroy()
  {
***************
*** 625,629 ****
          delete pArr;
      }
! 	
  	CWnd::OnDestroy();
  	// TODO: Add your message handler code here
--- 625,629 ----
          delete pArr;
      }
! 
  	CWnd::OnDestroy();
  	// TODO: Add your message handler code here

Index: GuiSplitterWnd.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiSplitterWnd.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiSplitterWnd.h	26 Sep 2004 16:11:51 -0000	1.1
--- GuiSplitterWnd.h	15 Oct 2004 14:01:50 -0000	1.2
***************
*** 1,8 ****
  /****************************************************************************
!  *																			*		 
!  *								GuiToolKit  								*	
!  *							 (MFC extension)								*			 
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*		   
   *																			*
   * This program is free software;so you are free to use it any of your		*
--- 1,8 ----
  /****************************************************************************
!  *																			*
!  *								GuiToolKit  								*
!  *							 (MFC extension)								*
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*
   *																			*
   * This program is free software;so you are free to use it any of your		*
***************
*** 17,22 ****
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements : (Add your name)								*
!  * -Francisco Campos														*				
!  *																			*	
   ****************************************************************************/
  
--- 17,22 ----
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements : (Add your name)								*
!  * -Francisco Campos														*
!  *																			*
   ****************************************************************************/
  
***************
*** 39,43 ****
  	void SetBorderFlat(BOOL bBorder=TRUE);
  		virtual void StyleDispl(DWORD dwDsp=GUISTYLE_XP)
! 	{	
  		m_StyleDisplay=dwDsp;
  		if (m_StyleDisplay==GUISTYLE_XP)
--- 39,43 ----
  	void SetBorderFlat(BOOL bBorder=TRUE);
  		virtual void StyleDispl(DWORD dwDsp=GUISTYLE_XP)
! 	{
  		m_StyleDisplay=dwDsp;
  		if (m_StyleDisplay==GUISTYLE_XP)
***************
*** 51,55 ****
--- 51,57 ----
  	BOOL m_bBorder;
  protected:
+ 	//{{AFX_MSG(CGuiSplitterWnd)
  	afx_msg void OnPaint();
+ 	//}}AFX_MSG
  	DECLARE_MESSAGE_MAP()
  

Index: GuiListCtrl.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiListCtrl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiListCtrl.cpp	26 Sep 2004 16:11:51 -0000	1.1
--- GuiListCtrl.cpp	15 Oct 2004 14:01:50 -0000	1.2
***************
*** 20,24 ****
--- 20,26 ----
  
  BEGIN_MESSAGE_MAP(CGuiListCtrl, CListCtrl)
+ 	//{{AFX_MSG_MAP(CGuiListCtrl)
  	ON_WM_DRAWITEM()
+ 	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
  

Index: GuiVisioFolder.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiVisioFolder.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiVisioFolder.cpp	26 Sep 2004 16:11:52 -0000	1.1
--- GuiVisioFolder.cpp	15 Oct 2004 14:01:52 -0000	1.2
***************
*** 1,8 ****
  /****************************************************************************
!  *																			*		 
!  *								GuiToolKit  								*	
!  *							 (MFC extension)								*			 
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*		   
   *																			*
   * This program is free software;so you are free to use it any of your		*
--- 1,8 ----
  /****************************************************************************
!  *																			*
!  *								GuiToolKit  								*
!  *							 (MFC extension)								*
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*
   *																			*
   * This program is free software;so you are free to use it any of your		*
***************
*** 17,22 ****
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements : (Add your name)								*
!  * -Francisco Campos														*				
!  *																			*	
   ****************************************************************************/
  
--- 17,22 ----
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements : (Add your name)								*
!  * -Francisco Campos														*
!  *																			*
   ****************************************************************************/
  
***************
*** 35,38 ****
--- 35,46 ----
  IMPLEMENT_DYNAMIC(CGuiVisioFolder, CGuiFolder)
  
+ BEGIN_MESSAGE_MAP(CGuiVisioFolder, CGuiFolder)
+ 	//{{AFX_MSG_MAP(CGuiVisioFolder)
+ 	ON_WM_MOUSEMOVE()
+ 	ON_WM_LBUTTONDOWN()
+ 	//}}AFX_MSG_MAP
+ END_MESSAGE_MAP()
+ 
+ 
  void  CGuiVisioFolder::SetImageList(UINT nBitmapID, int cx, int nGrow, COLORREF crMask)
  {
***************
*** 59,68 ****
  	rc.top+=1;
  	pDC.FillRect(&rc,&cb);
! 	
  	//se pintan  bordes que simulen un boton
  
! 	if (m_Style == mNormal)  //el folder no tiene el mouse 
  	{
! 				
  		pDC.Draw3dRect(rc, GuiDrawLayer::GetRGBColorBTNHigh(),GuiDrawLayer::GetRGBColorShadow());
  		rc.DeflateRect(1,1);
--- 67,76 ----
  	rc.top+=1;
  	pDC.FillRect(&rc,&cb);
! 
  	//se pintan  bordes que simulen un boton
  
! 	if (m_Style == mNormal)  //el folder no tiene el mouse
  	{
! 
  		pDC.Draw3dRect(rc, GuiDrawLayer::GetRGBColorBTNHigh(),GuiDrawLayer::GetRGBColorShadow());
  		rc.DeflateRect(1,1);
***************
*** 81,85 ****
  
  	//se dibuja la imagen
! 	if(nNuImage != -1) 
  	{
  		IMAGEINFO pImageInfo;
--- 89,93 ----
  
  	//se dibuja la imagen
! 	if(nNuImage != -1)
  	{
  		IMAGEINFO pImageInfo;
***************
*** 90,94 ****
  		m_Img.Draw(&pDC, nNuImage, pti, ILD_TRANSPARENT);
  	}
! 	
  	//guardar espacio para la imagen
  	rc.left+=szImage.cx+4;
--- 98,102 ----
  		m_Img.Draw(&pDC, nNuImage, pti, ILD_TRANSPARENT);
  	}
! 
  	//guardar espacio para la imagen
  	rc.left+=szImage.cx+4;
***************
*** 109,118 ****
  		m_cadBreak+=szStringPoints;
  		rc.right+=3;
! 		
  			pDC.DrawText(m_cadBreak,rc,DT_SINGLELINE|DT_LEFT|DT_VCENTER);
  	}
  	else
  		pDC.DrawText(cfb->m_lpMsg,rc,DT_WORDBREAK|DT_SINGLELINE|DT_CENTER|DT_VCENTER);
! 	
  	//----se dibuja el gripper----------
  
--- 117,126 ----
  		m_cadBreak+=szStringPoints;
  		rc.right+=3;
! 
  			pDC.DrawText(m_cadBreak,rc,DT_SINGLELINE|DT_LEFT|DT_VCENTER);
  	}
  	else
  		pDC.DrawText(cfb->m_lpMsg,rc,DT_WORDBREAK|DT_SINGLELINE|DT_CENTER|DT_VCENTER);
! 
  	//----se dibuja el gripper----------
  
***************
*** 131,145 ****
  		rcWindow.bottom=rcWindow.top+1;
  		pDC.FillRect(rcWindow,&cb);
! 		cb.DeleteObject();			
  	}
  	//-------------------------
  	cb.DeleteObject();
     	pDC.SetBkColor(OldMode);
! 	
  }
  
  CGuiVisioFolder::CGuiVisioFolder(void)
  {
! 	
  }
  
--- 139,153 ----
  		rcWindow.bottom=rcWindow.top+1;
  		pDC.FillRect(rcWindow,&cb);
! 		cb.DeleteObject();
  	}
  	//-------------------------
  	cb.DeleteObject();
     	pDC.SetBkColor(OldMode);
! 
  }
  
  CGuiVisioFolder::CGuiVisioFolder(void)
  {
! 
  }
  
***************
*** 148,157 ****
  }
  
- BEGIN_MESSAGE_MAP(CGuiVisioFolder, CGuiFolder)
- 	ON_WM_MOUSEMOVE()
- 	ON_WM_LBUTTONDOWN()
- 	
- END_MESSAGE_MAP()
- 
  void CGuiVisioFolder::OnMouseMove(UINT nFlags, CPoint point)
  {
--- 156,159 ----
***************
*** 159,163 ****
  	CGuiFolder::OnMouseMove(nFlags, point);
  	::SetCursor(::LoadCursor(NULL,MAKEINTRESOURCE(32649)));//IDC_HAND));
! 	
  }
  
--- 161,165 ----
  	CGuiFolder::OnMouseMove(nFlags, point);
  	::SetCursor(::LoadCursor(NULL,MAKEINTRESOURCE(32649)));//IDC_HAND));
! 
  }
  

Index: GuiMiniFrame.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiMiniFrame.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiMiniFrame.h	26 Sep 2004 16:11:51 -0000	1.1
--- GuiMiniFrame.h	15 Oct 2004 14:01:50 -0000	1.2
***************
*** 1,8 ****
  /****************************************************************************
!  *																			*		 
!  *								GuiToolKit  								*	
!  *							 (MFC extension)								*			 
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*		   
   *																			*
   * This program is free software;so you are free to use it any of your		*
--- 1,8 ----
  /****************************************************************************
!  *																			*
!  *								GuiToolKit  								*
!  *							 (MFC extension)								*
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*
   *																			*
   * This program is free software;so you are free to use it any of your		*
***************
*** 17,22 ****
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements : (Add your name)								*
!  * -Francisco Campos														*				
!  *																			*	
   ****************************************************************************/
  
--- 17,22 ----
   * Created by: Francisco Campos G.											*
   * Bug Fixes and improvements : (Add your name)								*
!  * -Francisco Campos														*
!  *																			*
   ****************************************************************************/
  
***************
*** 26,31 ****
  
  // CGuiMiniFrame frame
! #include "GuiMiniFrame.h" 
! #include "GuiDrawLayer.h" 
  
  class GUILIBDLLEXPORT CGuiMiniFrame : public CMiniDockFrameWnd
--- 26,31 ----
  
  // CGuiMiniFrame frame
! #include "GuiMiniFrame.h"
! #include "GuiDrawLayer.h"
  
  class GUILIBDLLEXPORT CGuiMiniFrame : public CMiniDockFrameWnd
***************
*** 53,64 ****
  // Implementation
  public:
! 	//{{AFX_MSG(CMiniFrameWnd)
  	afx_msg void OnClose();
  	afx_msg void OnNcLButtonDown(UINT nHitTest, CPoint point);
- 	afx_msg void OnNcRButtonDown(UINT nHitTest, CPoint point);
  	afx_msg void OnNcLButtonDblClk(UINT nHitTest, CPoint point);
  	afx_msg void OnNcLButtonUp(UINT nHitTest, CPoint point);
  	afx_msg void OnLButtonUp(UINT nHitTest, CPoint point);
- 	//}}AFX_MSG
  	afx_msg int OnMouseActivate(CWnd* pDesktopWnd, UINT nHitTest, UINT message);
  	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
--- 53,62 ----
  // Implementation
  public:
! 	//{{AFX_MSG(CGuiMiniFrame)
  	afx_msg void OnClose();
  	afx_msg void OnNcLButtonDown(UINT nHitTest, CPoint point);
  	afx_msg void OnNcLButtonDblClk(UINT nHitTest, CPoint point);
  	afx_msg void OnNcLButtonUp(UINT nHitTest, CPoint point);
  	afx_msg void OnLButtonUp(UINT nHitTest, CPoint point);
  	afx_msg int OnMouseActivate(CWnd* pDesktopWnd, UINT nHitTest, UINT message);
  	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
***************
*** 66,70 ****
  	afx_msg void OnNcPaint();
  	afx_msg BOOL OnNcActivate(BOOL bActive);
- 
  	afx_msg void OnTimer(UINT nIDEvent);
  	afx_msg void OnPaint();
--- 64,67 ----
***************
*** 72,75 ****
--- 69,73 ----
  	afx_msg void OnSetFocus(CWnd* pOldWnd);
  	afx_msg void OnNcMouseMove(UINT nHitTest, CPoint point);
+ 	//}}AFX_MSG
  
  	DECLARE_MESSAGE_MAP()

Index: GuiFrameWnd.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiFrameWnd.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiFrameWnd.h	26 Sep 2004 16:11:51 -0000	1.1
--- GuiFrameWnd.h	15 Oct 2004 14:01:50 -0000	1.2
***************
*** 1,8 ****
  /****************************************************************************
!  *																			*		 
!  *								GuiToolKit  								*	
!  *							 (MFC extension)								*			 
   * Created by Francisco Campos G. www.beyondata.com fc...@be...	*
!  *--------------------------------------------------------------------------*		   
   *																			*
   * This program is free software;so you are free to use it any of your		*
--- 1,8 ----
  /****************************************************************************
!  *																			*
!  *								GuiToolKit  								*
!  *							 (MFC extension)								*
   * Created by Francisco Campos G. www.beyondat...
 
[truncated message content]

[Anyedit-cvs]AnyEditToolkit/GuiLib Doxyfile.cfg,1.1,NONE

[Leon W. <moo...@us...>]

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

Removed Files:
	Doxyfile.cfg 
Log Message:
Removed second doxygen documentation file.

--- Doxyfile.cfg DELETED ---

[Anyedit-cvs]AnyEditToolkit GuiToolkit.dsw,1.2,1.3

[Leon W. <moo...@us...>]

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

Modified Files:
	GuiToolkit.dsw 
Log Message:
- Removed Access.dsp from workspace
- Added GuiLib dependency to some projects

Index: GuiToolkit.dsw
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiToolkit.dsw,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GuiToolkit.dsw	11 Oct 2004 20:33:03 -0000	1.2
--- GuiToolkit.dsw	14 Oct 2004 07:07:11 -0000	1.3
***************
*** 4,20 ****
  ###############################################################################
  
! Project: "Audit"=.\SAMPLES\Audit\Audit.dsp - Package Owner=<4>
! 
! Package=<5>
! {{{
! }}}
! 
! Package=<4>
! {{{
! }}}
! 
! ###############################################################################
! 
! Project: "ButtonsDlg"=.\ButtonsDlg\ButtonsDlg.dsp - Package Owner=<4>
  
  Package=<5>
--- 4,8 ----
  ###############################################################################
  
! Project: "ButtonsDlg"=".\Samples\ButtonsDlg\ButtonsDlg.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 24,32 ****
  Package=<4>
  {{{
  }}}
  
  ###############################################################################
  
! Project: "CGuiAccess"=.\Samples\CGuiAccess\CGuiAccess.dsp - Package Owner=<4>
  
  Package=<5>
--- 12,23 ----
  Package=<4>
  {{{
+     Begin Project Dependency
+     Project_Dep_Name GuiLib
+     End Project Dependency
  }}}
  
  ###############################################################################
  
! Project: "CGuiAccess"=".\Samples\CGuiAccess\CGuiAccess.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 43,47 ****
  ###############################################################################
  
! Project: "CGuiFlatTabbedView"=.\Samples\CGuiFlatTabbedView\CGuiFlatTabbedView.dsp - Package Owner=<4>
  
  Package=<5>
--- 34,38 ----
  ###############################################################################
  
! Project: "CGuiFlatTabbedView"=".\Samples\CGuiFlatTabbedView\CGuiFlatTabbedView.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 58,62 ****
  ###############################################################################
  
! Project: "CGuiOfficeDemo"=.\Samples\CGuiOfficeDemo\CGuiOfficeDemo.dsp - Package Owner=<4>
  
  Package=<5>
--- 49,53 ----
  ###############################################################################
  
! Project: "CGuiOfficeDemo"=".\Samples\CGuiOfficeDemo\CGuiOfficeDemo.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 73,77 ****
  ###############################################################################
  
! Project: "CGuiPowerPoint"=.\Samples\CGuiPowerPoint\CGuiPowerPoint.dsp - Package Owner=<4>
  
  Package=<5>
--- 64,68 ----
  ###############################################################################
  
! Project: "CGuiPowerPoint"=".\Samples\CGuiPowerPoint\CGuiPowerPoint.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 88,92 ****
  ###############################################################################
  
! Project: "CGuiTabbedDemo"=.\Samples\CGuiTabbedDemo\CGuiTabbedDemo.dsp - Package Owner=<4>
  
  Package=<5>
--- 79,83 ----
  ###############################################################################
  
! Project: "CGuiTabbedDemo"=".\Samples\CGuiTabbedDemo\CGuiTabbedDemo.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 103,107 ****
  ###############################################################################
  
! Project: "DialogExcelTabs"=.\Samples\DialogExcelTabs\DialogExcelTabs.dsp - Package Owner=<4>
  
  Package=<5>
--- 94,98 ----
  ###############################################################################
  
! Project: "DialogExcelTabs"=".\Samples\DialogExcelTabs\DialogExcelTabs.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 118,122 ****
  ###############################################################################
  
! Project: "EditListBox"=.\Samples\EditListBox\EditListBox.dsp - Package Owner=<4>
  
  Package=<5>
--- 109,113 ----
  ###############################################################################
  
! Project: "EditListBox"=".\Samples\EditListBox\EditListBox.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 133,137 ****
  ###############################################################################
  
! Project: "GuiAdoTest"=.\Samples\GuiAdoTest\GuiAdoTest.dsp - Package Owner=<4>
  
  Package=<5>
--- 124,128 ----
  ###############################################################################
  
! Project: "GuiAdoTest"=".\Samples\GuiAdoTest\GuiAdoTest.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 141,149 ****
  Package=<4>
  {{{
  }}}
  
  ###############################################################################
  
! Project: "GuiHeaderControl"=.\Samples\GuiHeaderControl\GuiHeaderControl.dsp - Package Owner=<4>
  
  Package=<5>
--- 132,143 ----
  Package=<4>
  {{{
+     Begin Project Dependency
+     Project_Dep_Name GuiLib
+     End Project Dependency
  }}}
  
  ###############################################################################
  
! Project: "GuiHeaderControl"=".\Samples\GuiHeaderControl\GuiHeaderControl.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 160,164 ****
  ###############################################################################
  
! Project: "GuiLib"=.\GuiLib\GuiLib.dsp - Package Owner=<4>
  
  Package=<5>
--- 154,158 ----
  ###############################################################################
  
! Project: "GuiLib"=".\GuiLib\GuiLib.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 172,176 ****
  ###############################################################################
  
! Project: "GuiLibStatic"=.\GuiLib\GuiLibStatic.dsp - Package Owner=<4>
  
  Package=<5>
--- 166,170 ----
  ###############################################################################
  
! Project: "GuiLibStatic"=".\GuiLib\GuiLibStatic.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 184,188 ****
  ###############################################################################
  
! Project: "GuiPanelAccessDemo"=.\Samples\GuiPanelAccessDemo\GuiPanelAccessDemo.dsp - Package Owner=<4>
  
  Package=<5>
--- 178,182 ----
  ###############################################################################
  
! Project: "GuiPanelAccessDemo"=".\Samples\GuiPanelAccessDemo\GuiPanelAccessDemo.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 199,203 ****
  ###############################################################################
  
! Project: "GuiVisioDemo"=.\Samples\GuiVisioDemo\GuiVisioDemo.dsp - Package Owner=<4>
  
  Package=<5>
--- 193,197 ----
  ###############################################################################
  
! Project: "GuiVisioDemo"=".\Samples\GuiVisioDemo\GuiVisioDemo.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 214,218 ****
  ###############################################################################
  
! Project: "Gui_DevStudio"=.\Samples\Gui_DevStudio\Gui_DevStudio.dsp - Package Owner=<4>
  
  Package=<5>
--- 208,212 ----
  ###############################################################################
  
! Project: "Gui_DevStudio"=".\Samples\Gui_DevStudio\Gui_DevStudio.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 222,230 ****
  Package=<4>
  {{{
  }}}
  
  ###############################################################################
  
! Project: "OutlookDemo"=.\Samples\OutlookDemo\OutlookDemo.dsp - Package Owner=<4>
  
  Package=<5>
--- 216,227 ----
  Package=<4>
  {{{
+     Begin Project Dependency
+     Project_Dep_Name GuiLib
+     End Project Dependency
  }}}
  
  ###############################################################################
  
! Project: "OutlookDemo"=".\Samples\OutlookDemo\OutlookDemo.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 241,245 ****
  ###############################################################################
  
! Project: "SDIDemo"=.\Samples\SDIDemo\SDIDemo.dsp - Package Owner=<4>
  
  Package=<5>
--- 238,242 ----
  ###############################################################################
  
! Project: "SDIDemo"=".\Samples\SDIDemo\SDIDemo.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 256,260 ****
  ###############################################################################
  
! Project: "TestDlg"=.\Samples\TestDlg\TestDlg.dsp - Package Owner=<4>
  
  Package=<5>
--- 253,257 ----
  ###############################################################################
  
! Project: "TestDlg"=".\Samples\TestDlg\TestDlg.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 271,275 ****
  ###############################################################################
  
! Project: "ToolBarsDemo"=.\Samples\ToolBarsDemo\ToolBarsDemo.dsp - Package Owner=<4>
  
  Package=<5>
--- 268,272 ----
  ###############################################################################
  
! Project: "ToolBarsDemo"=".\Samples\ToolBarsDemo\ToolBarsDemo.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 286,290 ****
  ###############################################################################
  
! Project: "dialogcontrols"=.\Samples\dialogcontrols\dialogcontrols.dsp - Package Owner=<4>
  
  Package=<5>
--- 283,287 ----
  ###############################################################################
  
! Project: "dialogcontrols"=".\Samples\dialogcontrols\dialogcontrols.dsp" - Package Owner=<4>
  
  Package=<5>

[Anyedit-cvs]AnyEditToolkit/GuiLib GuiLib.dsp,1.1,1.2

[Guy H <da...@us...>]

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

Modified Files:
	GuiLib.dsp 
Log Message:


Index: GuiLib.dsp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiLib.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiLib.dsp	26 Sep 2004 16:11:51 -0000	1.1
--- GuiLib.dsp	13 Oct 2004 23:30:00 -0000	1.2
***************
*** 724,727 ****
--- 724,731 ----
  # Begin Source File
  
+ SOURCE=.\msado15.h
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\NewMenu.h
  # End Source File

[Anyedit-cvs]AnyEditToolkit/GuiLib GuiComboBoxExt.cpp,1.2,1.3 GuiContainer.cpp,1.1,1.2 GuiDrawLayer.cpp,1.1,1.2 GuiTabWnd.cpp,1.4,1.5 GuiTabWnd.h,1.3,1.4 GuiTabbed.cpp,1.3,1.4 MenuBar.cpp,1.2,1.3

[Guy H <da...@us...>]

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

Modified Files:
	GuiComboBoxExt.cpp GuiContainer.cpp GuiDrawLayer.cpp 
	GuiTabWnd.cpp GuiTabWnd.h GuiTabbed.cpp MenuBar.cpp 
Log Message:
Removed (unnecessary) include of resource.h (deprecated)

Index: MenuBar.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/MenuBar.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MenuBar.cpp	2 Oct 2004 13:27:41 -0000	1.2
--- MenuBar.cpp	13 Oct 2004 23:28:10 -0000	1.3
***************
*** 55,59 ****
  #include "stdafx.h"
  #include "MenuBar.h"
- #include "resource.h"
  #include "GuiDockContext.h"
  #include <afxole.h>
--- 55,58 ----

Index: GuiContainer.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiContainer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiContainer.cpp	26 Sep 2004 16:11:49 -0000	1.1
--- GuiContainer.cpp	13 Oct 2004 23:28:10 -0000	1.2
***************
*** 282,357 ****
  }
  //********************************************************************************
! CWnd*  CGuiContainer::AddComponen(CRuntimeClass* m_rtcwnd,UINT nID,DWORD dwStyle)
  {
  	
! 	CWnd* m_cwnd=NULL;
! 	BOOL btype=FALSE; //only object small
! 	if (m_rtcwnd->IsDerivedFrom(RUNTIME_CLASS(CComboBox)))
  	{
! 		 m_cwnd = new CGuiComboBoxExt();
! 		 if (!((CGuiComboBoxExt*)m_cwnd)->Create(dwStyle|WS_CHILD|WS_VISIBLE, CRect(1,1,100,100), this, nID))
! 		 {
! 			m_cwnd=NULL;
! 			return NULL;
! 		 }
! 		 btype=TRUE;
! 		 goto crear;
  	}
! 
! 	else if ( m_rtcwnd->IsDerivedFrom(RUNTIME_CLASS(CListBox)))
  	{
! 		 m_cwnd = new CListBox();
! 		 if (!((CListBox*)m_cwnd)->Create(dwStyle|WS_CHILD|WS_VISIBLE, CRect(0,0,0,0), this, nID))
! 		 {
! 			m_cwnd=NULL;
! 			return NULL;
! 		 }
! 		 goto crear;
  	}
! 	else if ( m_rtcwnd->IsDerivedFrom(RUNTIME_CLASS(CEdit)))
  	{
! 		 m_cwnd = new CEdit();
! 		 if (!((CEdit*)m_cwnd)->Create(dwStyle|WS_CHILD|WS_VISIBLE, CRect(0,0,0,0), this, nID))
! 		 { 
! 			m_cwnd=NULL;
! 			return NULL;
! 		 }
! 		 
! 		 btype=TRUE;
! 		 goto crear;
  	}
! 	
! 	else if ( m_rtcwnd->IsDerivedFrom(RUNTIME_CLASS(CListCtrl)))
  	{
! 		 m_cwnd = new CListCtrl();
! 		 if (!((CListCtrl*)m_cwnd)->Create(dwStyle|WS_CHILD|WS_VISIBLE, CRect(0,0,0,0), this, nID))
! 		 {
! 			m_cwnd=NULL;
! 			return NULL;
! 		 }
! 		 
! 		 btype=FALSE;
! 		 goto crear;
  	}
! 	else if ( m_rtcwnd->IsDerivedFrom(RUNTIME_CLASS(CGuiVisioFolder)))
  	{
! 		 m_cwnd = new CGuiVisioFolder();
! 		 if (!((CGuiVisioFolder*)m_cwnd)->Create(dwStyle|WS_CHILD|WS_VISIBLE, CRect(0,0,0,0), this, nID))
! 		 {
! 			m_cwnd=NULL;
! 			return NULL;
! 		 }
! 		 goto crear;
  	}
- 	else
- 		return NULL;
- 	
- crear:
- 	if (m_nItems==-1) m_nItems=0;
- 	m_arrContainer.SetAtGrow(m_nItems, new CComponents(m_cwnd,btype));
- 	m_nItems++;
- 	RecalLayout();
- 	return m_cwnd;
  
  }
  
--- 282,335 ----
  }
  //********************************************************************************
! CWnd*  CGuiContainer::AddComponen(CRuntimeClass* pRuntimeClass, UINT nID, DWORD dwStyle)
  {
  	
! 	CWnd* pWnd = NULL;
! 	BOOL bType = FALSE; //only object small
! 	BOOL bSuccess = FALSE;
! 	if (pRuntimeClass->IsDerivedFrom(RUNTIME_CLASS(CComboBox)))
  	{
! 		pWnd = new CGuiComboBoxExt();
! 		bSuccess = ((CGuiComboBoxExt*)pWnd)->Create(dwStyle|WS_CHILD|WS_VISIBLE, CRect(1,1,100,100), this, nID);
! 		bType = TRUE;
  	}
! 	else if (pRuntimeClass->IsDerivedFrom(RUNTIME_CLASS(CListBox)))
  	{
! 		pWnd = new CListBox();
! 		bSuccess = ((CListBox*)pWnd)->Create(dwStyle|WS_CHILD|WS_VISIBLE, CRect(0,0,0,0), this, nID);
  	}
! 	else if (pRuntimeClass->IsDerivedFrom(RUNTIME_CLASS(CEdit)))
  	{
! 		pWnd = new CEdit();
! 		bSuccess = ((CEdit*)pWnd)->Create(dwStyle|WS_CHILD|WS_VISIBLE, CRect(0,0,0,0), this, nID);
! 		bType=TRUE;
  	}
! 	else if (pRuntimeClass->IsDerivedFrom(RUNTIME_CLASS(CListCtrl)))
  	{
! 		pWnd = new CListCtrl();
! 		bSuccess = ((CListCtrl*)pWnd)->Create(dwStyle|WS_CHILD|WS_VISIBLE, CRect(0,0,0,0), this, nID);
  	}
! 	else if (pRuntimeClass->IsDerivedFrom(RUNTIME_CLASS(CGuiVisioFolder)))
  	{
! 		pWnd = new CGuiVisioFolder();
! 		bSuccess = ((CGuiVisioFolder*)pWnd)->Create(dwStyle|WS_CHILD|WS_VISIBLE, CRect(0,0,0,0), this, nID);
  	}
  
+ 	if (bSuccess)
+ 	{
+ 		ASSERT(pWnd != NULL);
+ 		if (m_nItems == -1)
+ 			m_nItems = 0;
+ 		m_arrContainer.SetAtGrow(m_nItems, new CComponents(pWnd, bType));
+ 		m_nItems++;
+ 		RecalLayout();
+ 	}
+ 	else if (pWnd != NULL)
+ 	{
+ 		delete pWnd;
+ 		pWnd = NULL;
+ 	}
+ 	
+ 	return pWnd;
  }
  

Index: GuiTabWnd.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiTabWnd.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GuiTabWnd.h	11 Oct 2004 20:27:10 -0000	1.3
--- GuiTabWnd.h	13 Oct 2004 23:28:10 -0000	1.4
***************
*** 35,38 ****
--- 35,40 ----
  #include "GuiDrawlayer.h"
  
+ #define WM_SHOWTITLE			2022
+ 
  //*********************************************************
  class GUILIBDLLEXPORT  CGuiTabWnd : public CWnd

Index: GuiTabWnd.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiTabWnd.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GuiTabWnd.cpp	11 Oct 2004 20:27:10 -0000	1.4
--- GuiTabWnd.cpp	13 Oct 2004 23:28:10 -0000	1.5
***************
*** 31,35 ****
  #include "GuiTabWnd.h"
  #include "GuiBasetab.h"
- #include "resource.h"
  
  
--- 31,34 ----
***************
*** 585,589 ****
  		CWnd* pParent=GetParent();
  		pParent->SetWindowText(m_Caption);
! 		pParent->SendMessage(WM_COMMAND,WM_SHOWTITLE);
  	}
  	
--- 584,588 ----
  		CWnd* pParent=GetParent();
  		pParent->SetWindowText(m_Caption);
! 		pParent->SendMessage(WM_COMMAND, WM_SHOWTITLE);
  	}
  	

Index: GuiTabbed.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiTabbed.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GuiTabbed.cpp	11 Oct 2004 18:01:23 -0000	1.3
--- GuiTabbed.cpp	13 Oct 2004 23:28:10 -0000	1.4
***************
*** 24,28 ****
  
  #include "stdafx.h"
- #include "resource.h"
  #include "guitabbed.h"
  #include "GuiBaseTab.h"
--- 24,27 ----

Index: GuiComboBoxExt.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiComboBoxExt.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GuiComboBoxExt.cpp	2 Oct 2004 13:27:41 -0000	1.2
--- GuiComboBoxExt.cpp	13 Oct 2004 23:28:10 -0000	1.3
***************
*** 26,30 ****
  #include "stdafx.h"
  #include "GuiComboBoxExt.h"
- #include "resource.h"
  #include <atlbase.h>  
  #include "Guicomboboxext.h"
--- 26,29 ----

Index: GuiDrawLayer.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiDrawLayer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiDrawLayer.cpp	26 Sep 2004 16:11:49 -0000	1.1
--- GuiDrawLayer.cpp	13 Oct 2004 23:28:10 -0000	1.2
***************
*** 24,28 ****
  #include "stdafx.h"
  #include "GuiDrawLayer.h"
- #include "resource.h"
  
  #ifdef _DEBUG
--- 24,27 ----
***************
*** 132,136 ****
  GuiDrawLayer::GuiDrawLayer()
  {
! 	if (!m_img.Create(IDB_DOCKBAR,9,10,RGB(255,0,255)))
  	{
  		TRACE0("error");
--- 131,135 ----
  GuiDrawLayer::GuiDrawLayer()
  {
! 	if (!m_img.Create(IDB_GUI_DOCKBAR, 9, 10,RGB(255,0,255)))
  	{
  		TRACE0("error");

[Anyedit-cvs]AnyEditToolkit/GuiLib GuiListEdit.cpp,1.4,1.5 GuiListEdit.h,1.3,1.4

[Guy H <da...@us...>]

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

Modified Files:
	GuiListEdit.cpp GuiListEdit.h 
Log Message:
1. Removed some unnecessary code
2. Code cleaned
3. Added option to set which buttons are displayed

Index: GuiListEdit.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiListEdit.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GuiListEdit.h	10 Oct 2004 18:50:09 -0000	1.3
--- GuiListEdit.h	13 Oct 2004 23:26:46 -0000	1.4
***************
*** 27,38 ****
  #include "GuiContainer.h"
  #include "GuiMiniTool.h"
- #include "GuiNormalButton.h"
  
  class GUILIBDLLEXPORT CGuiListEdit : public CStatic
  {
- 	DECLARE_DYNAMIC(CGuiListEdit)
  public:
! 	enum Border{STYLE3D = 0, STYLEPRESS = 1, STYLEFRAME = 2};
! private:
  	CGuiContainer	m_wndContainer;
  	CGuiMiniTool	m_wndMiniTool;
--- 27,44 ----
  #include "GuiContainer.h"
  #include "GuiMiniTool.h"
  
  class GUILIBDLLEXPORT CGuiListEdit : public CStatic
  {
  public:
! 	// Ctor/Dtor
! 	CGuiListEdit();
! 	virtual ~CGuiListEdit();
! 
! 	// Public Declarations
! 	enum Border		{STYLE3D = 0, STYLEPRESS = 1, STYLEFRAME = 2};
! 	enum Buttons	{BtnInsert = 0x0001, BtnDelete = 0x0002, BtnUp = 0x0004, BtnDown = 0x0008};
! 
! protected:
! 	// Members
  	CGuiContainer	m_wndContainer;
  	CGuiMiniTool	m_wndMiniTool;
***************
*** 40,68 ****
  	COLORREF		m_clrface;
  	Border			m_border;
  public:
! 	virtual void OnSelectionChanged () {}
! 	void Delete();
! 	void Insert();
! 	void Up();
! 	void Down();
! 	void SetStyle(Border border);
! 	CString GetText(int nItem);
! 	void AddItem(CString m_szCad);
! 	int GetNumItem();
! 	CGuiNormalButton m_toolBtn;
  	CListCtrl* GetListCtrl();
  public:
! 	CGuiListEdit();
! 	virtual ~CGuiListEdit();
  
  protected:
! 	bool m_bNewItem;
! 	DECLARE_MESSAGE_MAP()
  	virtual void PreSubclassWindow();
! public:
! 	BOOL EditItem (int iIndex);
! 	void RemoveItem(int nItem);
! 	BOOL SelectItem(int nItem);
! 	int GetSelItem(void);
  
  	//{{AFX_MSG(CGuiListEdit)
--- 46,91 ----
  	COLORREF		m_clrface;
  	Border			m_border;
+ 	bool			m_bNewItem;
+ 	UINT			m_uButtons;
+ 
+ 	DECLARE_DYNAMIC(CGuiListEdit)
+ 
  public:
! 	// Data Access
! 	CString GetText(int nItem) const;
! 	int		GetNumItem();
! 	int		GetSelItem();
  	CListCtrl* GetListCtrl();
+ 
  public:
! 	// Operations - items
! 	void	AddItem(const CString& sText);
! 	BOOL	EditItem (int iIndex);
! 	void	RemoveItem(int nItem);
! 	BOOL	SelectItem(int nItem);
! 
! 	// Operations - buttons
! 	void	Delete();
! 	void	Insert();
! 	void	Up();
! 	void	Down();
! 
! 	// Operations - style
! 	void	SetBorderStyle(Border border);
! 	void	SetVisibleButtons(UINT uButtons);
! 
! public:
! 	// Overridables
! 	virtual void OnSelectionChanged () {}
  
  protected:
! 	// Overrides
  	virtual void PreSubclassWindow();
! 
! 	// Helpers
! 	bool	ToggleButton(bool bShow, int nIndex, int nImage, UINT uCmd, const CString& sToolTip);
! 
! protected:
! 	DECLARE_MESSAGE_MAP()
  
  	//{{AFX_MSG(CGuiListEdit)

Index: GuiListEdit.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiListEdit.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GuiListEdit.cpp	11 Oct 2004 18:01:23 -0000	1.4
--- GuiListEdit.cpp	13 Oct 2004 23:26:46 -0000	1.5
***************
*** 35,39 ****
  #define  LST_DOWN   558
  #define  LST_LIST	559
! #define  DROPBUTTON 560
  // CGuiListEdit
  
--- 35,44 ----
  #define  LST_DOWN   558
  #define  LST_LIST	559
! 
! #define DOCKBAROFFICE_ARROW_DOWN		9
! #define DOCKBAROFFICE_ARROW_UP			11
! #define DOCKBAROFFICE_DELETE			8
! #define DOCKBAROFFICE_INSERT			10
! 
  // CGuiListEdit
  
***************
*** 45,52 ****
--- 50,61 ----
  	m_clrface = GuiDrawLayer::GetRGBColorFace();
  	m_bNewItem = false;
+ 	m_pWndList = NULL;
+ 	m_uButtons = BtnInsert | BtnDelete | BtnUp | BtnDown;
  }
  
  CGuiListEdit::~CGuiListEdit()
  {
+ 	if (m_pWndList != NULL)
+ 		delete m_pWndList;
  }
  
***************
*** 84,88 ****
  }
  
! CString CGuiListEdit::GetText(int nItem)
  {
  	if (nItem < 0) return _T("");
--- 93,97 ----
  }
  
! CString CGuiListEdit::GetText(int nItem) const
  {
  	if (nItem < 0) return _T("");
***************
*** 97,104 ****
  }
  
! void CGuiListEdit::AddItem(CString m_szCad)
  {
! 	int nItem=m_pWndList->GetItemCount();
! 	nItem=m_pWndList->InsertItem(nItem, m_szCad);
  	m_pWndList->SetItemData (nItem, 0);
  }
--- 106,114 ----
  }
  
! void CGuiListEdit::AddItem(const CString& sText)
  {
! 	ASSERT(m_pWndList != NULL);
! 	int nItem = m_pWndList->GetItemCount();
! 	nItem = m_pWndList->InsertItem(nItem, sText);
  	m_pWndList->SetItemData (nItem, 0);
  }
***************
*** 131,135 ****
      m_pWndList->GetItemRect(0, &rc, LVIS_SELECTED | LVIS_FOCUSED);
  	CEdit* mEdit = m_pWndList->EditLabel(nItem);
- 	CSize szBtn = m_toolBtn.GetSizeButton();
  	mEdit->SetWindowPos (NULL, -1, -1,
  		rc.Width () - 10, rc.Height (),
--- 141,144 ----
***************
*** 203,217 ****
  	
  	m_wndContainer.AddComponen(&m_wndMiniTool);
- 	/*m_toolBtn.Create(_T(""),WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON | BS_OWNERDRAW,CRect(0,0,0,0),this,DROPBUTTON);
- 	m_toolBtn.SetCaption(_T(" ... "));
- 	m_toolBtn.SetStyleButton(CGuiNormalButton::STL_SEMIFLAT);
- 	*/
  	
  	m_pWndList = (CListCtrl*) m_wndContainer.AddComponen(RUNTIME_CLASS(CListCtrl), LST_LIST, WS_VISIBLE | WS_CHILD);
  	m_wndMiniTool.SetImageList(IDB_GUI_DOCKBAROFFICE, 14, 12, RGB(255, 0, 255));
! 	m_wndMiniTool.AddButton(9, LST_DOWN, NULL, _T(""), _T("Item Down"));
! 	m_wndMiniTool.AddButton(11, LST_UP, NULL, _T(""), _T("Item Up"));
! 	m_wndMiniTool.AddButton(8, LST_DELETE, NULL, _T(""), _T("Delete"));
! 	m_wndMiniTool.AddButton(10, LST_INSERT, NULL, _T(""), _T("Insert"));
  	m_wndMiniTool.AutoSize(TRUE);
  	m_wndMiniTool.SetBorder(CGuiMiniTool::STYLEPRESS);
--- 212,219 ----
  	
  	m_wndContainer.AddComponen(&m_wndMiniTool);
  	
  	m_pWndList = (CListCtrl*) m_wndContainer.AddComponen(RUNTIME_CLASS(CListCtrl), LST_LIST, WS_VISIBLE | WS_CHILD);
  	m_wndMiniTool.SetImageList(IDB_GUI_DOCKBAROFFICE, 14, 12, RGB(255, 0, 255));
! 	SetVisibleButtons(m_uButtons);
  	m_wndMiniTool.AutoSize(TRUE);
  	m_wndMiniTool.SetBorder(CGuiMiniTool::STYLEPRESS);
***************
*** 235,241 ****
  }
  
! void CGuiListEdit::SetStyle(Border border)
  {
  	m_border = border;
  }
  
--- 237,245 ----
  }
  
! void CGuiListEdit::SetBorderStyle(Border border)
  {
  	m_border = border;
+ 	if (GetSafeHwnd() != NULL)
+ 		Invalidate();
  }
  
***************
*** 402,403 ****
--- 406,440 ----
  	return TRUE;
  }
+ 
+ void CGuiListEdit::SetVisibleButtons(UINT uButtons)
+ {
+ 	m_uButtons = uButtons;
+ 	if (GetSafeHwnd() == NULL)
+ 		return;
+ 
+ 	// Add and remove buttons:
+ 	int nIndex = 0;
+ 	if (ToggleButton(m_uButtons & BtnDown ? true : false, nIndex, DOCKBAROFFICE_ARROW_DOWN, LST_DOWN, _T("Item Down")))
+ 		nIndex++;
+ 	if (ToggleButton(m_uButtons & BtnUp ? true : false, nIndex, DOCKBAROFFICE_ARROW_UP, LST_UP, _T("Item Up")))
+ 		nIndex++;
+ 	if (ToggleButton(m_uButtons & BtnDelete ? true : false, nIndex, DOCKBAROFFICE_DELETE, LST_DELETE, _T("Delete")))
+ 		nIndex++;
+ 	if (ToggleButton(m_uButtons & BtnInsert ? true : false, nIndex, DOCKBAROFFICE_INSERT, LST_INSERT, _T("Insert")))
+ 		nIndex++;
+ }
+ 
+ bool CGuiListEdit::ToggleButton(bool bShow, int nIndex, int nImage, UINT uCmd, const CString& sToolTip)
+ {
+ 	int nCurrentIndex = m_wndMiniTool.GetButtonIndex(uCmd);
+ 	bool bVisible = false;
+ 	if (bShow)
+ 	{
+ 		if (nCurrentIndex == -1)
+ 			m_wndMiniTool.InsertButton(nIndex, nImage, uCmd, NULL, _T(""), sToolTip);
+ 		bVisible = true;
+ 	}
+ 	else if (nCurrentIndex != -1)
+ 		m_wndMiniTool.DelButton(nCurrentIndex);
+ 	return bVisible;
+ }

[Anyedit-cvs]AnyEditToolkit/GuiLib GuiMiniTool.cpp,1.2,1.3 GuiMiniTool.h,1.2,1.3

[Guy H <da...@us...>]

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

Modified Files:
	GuiMiniTool.cpp GuiMiniTool.h 
Log Message:
1. Fixed DelButton
2. Added InsertButton to allow inserting buttons before the last one
3. Some code cleaning

Index: GuiMiniTool.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiMiniTool.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GuiMiniTool.cpp	11 Oct 2004 18:01:23 -0000	1.2
--- GuiMiniTool.cpp	13 Oct 2004 23:25:36 -0000	1.3
***************
*** 38,52 ****
  {
  	m_arrButtons.RemoveAll();
! 	nNumItems=0;
! 	m_AlignButton=ALIGN_LEFT;
! 	m_AlinTexto=ALIGN_LEFT;
! 	m_clrface=GuiDrawLayer::GetRGBColorXP();
! 	m_bAutoSize=FALSE;
! 	m_bExisteCombo=FALSE;
  	m_cfont.CreateFont(-11,0,0,0,400,0,0,0,0,1,2,1,34,_T("MS Sans Serif"));
! 	m_clrCaption=GuiDrawLayer::GetRGBColorShadow(GuiDrawLayer::m_Style);
! 	m_Caption=_T("");
! 	msz=CSize(0,0);
! 	m_StyleDisplay=GUISTYLE_XP;
  	
  }
--- 38,50 ----
  {
  	m_arrButtons.RemoveAll();
! 	m_AlignButton = ALIGN_LEFT;
! 	m_AlinTexto = ALIGN_LEFT;
! 	m_clrface = GuiDrawLayer::GetRGBColorXP();
! 	m_bAutoSize = FALSE;
! 	m_bExisteCombo = FALSE;
  	m_cfont.CreateFont(-11,0,0,0,400,0,0,0,0,1,2,1,34,_T("MS Sans Serif"));
! 	m_clrCaption = GuiDrawLayer::GetRGBColorShadow(GuiDrawLayer::m_Style);
! 	m_szCaption = CSize(0,0);
! 	m_StyleDisplay = GUISTYLE_XP;
  	
  }
***************
*** 97,113 ****
  
  //********************************************************************************
! void  CGuiMiniTool::AddButton(int nIndex,UINT Cmd,CMenu* pMenu,CString m_szCaption,CString m_ToolTip)
  {
! 	
! 	m_arrButtons.SetAtGrow(nNumItems, new CArrButton
! 			(this,m_imgList.ExtractIcon(nIndex),Cmd,&m_cfont,m_szCaption,pMenu,m_ToolTip));
! 	
! 	nNumItems++;
  	RecalLayout();
  
  }
  
  //**************************************************************************
! HICON CGuiMiniTool::GetImagIcon(int nNum)
  {
  	return m_imgList.ExtractIcon(nNum);
--- 95,111 ----
  
  //********************************************************************************
! void  CGuiMiniTool::InsertButton(int nIndex, int nImage, UINT uCmd, CMenu* pMenu /* = NULL */, const CString& sCaption /* = _T("") */, const CString& sToolTip /* =_T("") */)
  {
! 	m_arrButtons.InsertAt(nIndex, new CArrButton(this, m_imgList.ExtractIcon(nImage), uCmd, &m_cfont, sCaption, pMenu, sToolTip));
  	RecalLayout();
+ }
  
+ void  CGuiMiniTool::AddButton(int nImage, UINT uCmd, CMenu* pMenu /* = NULL */, const CString& sCaption /* = _T("") */, const CString& sToolTip /* =_T("") */)
+ {
+ 	InsertButton(GetCountButton(), nImage, uCmd, pMenu, sCaption, sToolTip);
  }
  
  //**************************************************************************
! HICON CGuiMiniTool::GetImageIcon(int nNum)
  {
  	return m_imgList.ExtractIcon(nNum);
***************
*** 122,127 ****
  	   return FALSE;
  	pControl->m_IsCallMiniTool=TRUE;
! 	m_arrButtons.SetAtGrow(nNumItems, new CArrButton(pControl));
! 	nNumItems++;
  	RecalLayout();
  	return TRUE;
--- 120,124 ----
  	   return FALSE;
  	pControl->m_IsCallMiniTool=TRUE;
! 	m_arrButtons.SetAtGrow(GetCountButton(), new CArrButton(pControl));
  	RecalLayout();
  	return TRUE;
***************
*** 151,156 ****
  void  CGuiMiniTool::DelButton(int nIndex)
  {
! 	nNumItems--;
! 	m_arrButtons.RemoveAt(nIndex,nNumItems);
  	RecalLayout();
  }
--- 148,154 ----
  void  CGuiMiniTool::DelButton(int nIndex)
  {
! 	ASSERT(nIndex < GetCountButton());
! 	delete (CArrButton*) m_arrButtons[nIndex];
! 	m_arrButtons.RemoveAt(nIndex);
  	RecalLayout();
  }
***************
*** 173,185 ****
  	if (m_bAutoSize)
  		CalcAutoSize(rcClient);
! 	if (msz.cx > 0)
  	{
  		if (m_AlinTexto==ALIGN_LEFT)
! 			rctemp.left+=msz.cx;
  		else
! 			rctemp.right-=msz.cx;
  	}
  
! 	for (int i=0; i < nNumItems;i++)
  	{
  		
--- 171,183 ----
  	if (m_bAutoSize)
  		CalcAutoSize(rcClient);
! 	if (m_szCaption.cx > 0)
  	{
  		if (m_AlinTexto==ALIGN_LEFT)
! 			rctemp.left += m_szCaption.cx;
  		else
! 			rctemp.right -= m_szCaption.cx;
  	}
  
! 	for (int i=0; i < GetCountButton(); i++)
  	{
  		
***************
*** 227,236 ****
  }
  
! void CGuiMiniTool::SetCaption(CString mSzCaption,Align AlinText)
  {
  	CClientDC dc(this);
! 	m_Caption=mSzCaption;
! 	msz=dc.GetTextExtent(m_Caption,m_Caption.GetLength());
! 	m_AlinTexto=AlinText;
  }
  
--- 225,234 ----
  }
  
! void CGuiMiniTool::SetCaption(const CString& sCaption, Align AlinText)
  {
  	CClientDC dc(this);
! 	m_sCaption = sCaption;
! 	m_szCaption = dc.GetTextExtent(m_sCaption);
! 	m_AlinTexto = AlinText;
  }
  
***************
*** 246,250 ****
      m_nResultButtons=0; 	
  	int m_numCombo=0;
! 	for (int i=0; i < nNumItems;i++)
  	{
  		if (((CArrButton*) m_arrButtons [i])->m_btipo ==TRUE)
--- 244,248 ----
      m_nResultButtons=0; 	
  	int m_numCombo=0;
! 	for (int i=0; i < GetCountButton();i++)
  	{
  		if (((CArrButton*) m_arrButtons [i])->m_btipo ==TRUE)
***************
*** 265,278 ****
  	if (m_bExisteCombo)
  	{
! 		if (m_nResultButtons+msz.cx > m_rc.Width())  //el espacio no alcanza para los botones
  			m_nResultCombo=0;
  		else
  		{
! 			if ((GetSystemMetrics(SM_CXHTHUMB)+msz.cx) > m_rc.Width()-50)
  				m_nResultCombo=0;
  			else
  				{
! 					m_nResultCombo=m_rc.Width()-(m_nResultButtons+msz.cx);
! 					m_nResultCombo/=m_numCombo;
  				}
  				
--- 263,276 ----
  	if (m_bExisteCombo)
  	{
! 		if (m_nResultButtons + m_szCaption.cx > m_rc.Width())  //el espacio no alcanza para los botones
  			m_nResultCombo=0;
  		else
  		{
! 			if ((GetSystemMetrics(SM_CXHTHUMB) + m_szCaption.cx) > m_rc.Width()-50)
  				m_nResultCombo=0;
  			else
  				{
! 					m_nResultCombo = m_rc.Width() - (m_nResultButtons + m_szCaption.cx);
! 					m_nResultCombo /= m_numCombo;
  				}
  				
***************
*** 360,364 ****
  {
  	m_clrface=m_clrFace;
! 	for (int i=0; i < nNumItems;i++)
      	if (((CArrButton*) m_arrButtons [i])->m_btipo ==TRUE)
  			((CArrButton*) m_arrButtons [i])->m_bt.SetColor(m_clrface);
--- 358,362 ----
  {
  	m_clrface=m_clrFace;
! 	for (int i=0; i < GetCountButton();i++)
      	if (((CArrButton*) m_arrButtons [i])->m_btipo ==TRUE)
  			((CArrButton*) m_arrButtons [i])->m_bt.SetColor(m_clrface);
***************
*** 417,421 ****
  {
  	HWND hwnd = (HWND) lParam;	
! 	for (int i=0; i < nNumItems;i++)
  	{
  		if (((CArrButton*) m_arrButtons [i])->m_btipo ==TRUE)
--- 415,419 ----
  {
  	HWND hwnd = (HWND) lParam;	
! 	for (int i=0; i < GetCountButton();i++)
  	{
  		if (((CArrButton*) m_arrButtons [i])->m_btipo ==TRUE)
***************
*** 435,454 ****
  }
  
! CGuiToolButton*  CGuiMiniTool::GetButton(UINT uID_Object)//,CGuiToolButton* m_btn)
  {
! 	
! 	for (int i=0; i < nNumItems;i++)
  	{
! 		if (((CArrButton*) m_arrButtons [i])->m_btipo ==TRUE)
! 			if (((CArrButton*) m_arrButtons [i])->m_bt.GetDlgCtrlID()==(int signed )uID_Object)
! 			{
! 				
! 				CGuiToolButton* m_btn=&((CArrButton*) m_arrButtons [i])->m_bt;
! 				return m_btn;
! 				
! 			}
! 	
  	}
! 	return NULL;//m_btn=NULL;
  }
  
--- 433,452 ----
  }
  
! int CGuiMiniTool::GetButtonIndex(UINT uID_Object)
  {
! 	for (int i=0; i < GetCountButton();i++)
  	{
! 		if ((((CArrButton*) m_arrButtons[i])->m_btipo) && (((CArrButton*) m_arrButtons [i])->m_bt.GetDlgCtrlID()==(int signed )uID_Object))
! 			return i;
  	}
! 	return -1;
! }
! 
! CGuiToolButton* CGuiMiniTool::GetButton(UINT uID_Object)
! {
! 	int nIndex = GetButtonIndex(uID_Object);
! 	if (nIndex == -1)
! 		return NULL;
! 	return &((CArrButton*)m_arrButtons[nIndex])->m_bt;
  }
  
***************
*** 462,475 ****
  	int nMode = dc.SetBkMode(TRANSPARENT);
  	dc.SetTextColor(m_clrCaption);
! 	if(m_AlinTexto==ALIGN_LEFT)
  	{
  		rc.left+=5;
! 		dc.DrawText(m_Caption,rc,DT_SINGLELINE|DT_LEFT|DT_VCENTER) ;
  	}
  	else
  	{
! 			m_rcDrawTexto.left=(long)(rc.right-msz.cx*1.1);
! 			m_rcDrawTexto.right=m_rcDrawTexto.left+msz.cx;
! 			dc.DrawText(m_Caption,m_rcDrawTexto,DT_SINGLELINE|DT_RIGHT|DT_VCENTER) ;
  	}
  	dc.SetBkMode(nMode);
--- 460,473 ----
  	int nMode = dc.SetBkMode(TRANSPARENT);
  	dc.SetTextColor(m_clrCaption);
! 	if (m_AlinTexto == ALIGN_LEFT)
  	{
  		rc.left+=5;
! 		dc.DrawText(m_sCaption,rc,DT_SINGLELINE|DT_LEFT|DT_VCENTER);
  	}
  	else
  	{
! 		m_rcDrawTexto.left = (long)(rc.right - m_szCaption.cx * 1.1);
! 		m_rcDrawTexto.right = m_rcDrawTexto.left + m_szCaption.cx;
! 		dc.DrawText(m_sCaption, m_rcDrawTexto, DT_SINGLELINE|DT_RIGHT|DT_VCENTER) ;
  	}
  	dc.SetBkMode(nMode);
***************
*** 483,487 ****
  {
  	
! 	for( int i=0; i<nNumItems; i++ )
      {
      CArrButton *pArr = (CArrButton*)m_arrButtons.GetAt(i);
--- 481,485 ----
  {
  	
! 	for( int i=0; i<GetCountButton(); i++ )
      {
      CArrButton *pArr = (CArrButton*)m_arrButtons.GetAt(i);

Index: GuiMiniTool.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiMiniTool.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GuiMiniTool.h	11 Oct 2004 18:01:23 -0000	1.2
--- GuiMiniTool.h	13 Oct 2004 23:25:36 -0000	1.3
***************
*** 64,68 ****
  public:
  	//*********************************************************************
! 	void  AddButton(int nIndex,UINT Cmd,CMenu* pMenu=NULL,CString m_szCaption=_T(""),CString m_ToolTip=_T(""));
  	BOOL  CreateCombo(CGuiComboBoxExt* pControl,UINT nID,int iSize,
  				DWORD dwStyle=WS_CHILD|WS_VISIBLE|CBS_AUTOHSCROLL|
--- 64,69 ----
  public:
  	//*********************************************************************
! 	void  AddButton(int nImage, UINT uCmd, CMenu* pMenu = NULL,const CString& sCaption = _T(""), const CString& sToolTip = _T(""));
! 	void  InsertButton(int nIndex, int nImage, UINT uCmd, CMenu* pMenu = NULL,const CString& sCaption = _T(""), const CString& sToolTip = _T(""));
  	BOOL  CreateCombo(CGuiComboBoxExt* pControl,UINT nID,int iSize,
  				DWORD dwStyle=WS_CHILD|WS_VISIBLE|CBS_AUTOHSCROLL|
***************
*** 72,76 ****
  	int   GetCountButton();
  	void  RecalLayout();
! 	void  SetCaption(CString mSzCaption,Align AlinText);
  	//*********************************************************************
  	void  SetBorder(Borders Style);
--- 73,77 ----
  	int   GetCountButton();
  	void  RecalLayout();
! 	void  SetCaption(const CString& sCaption, Align AlinText);
  	//*********************************************************************
  	void  SetBorder(Borders Style);
***************
*** 81,91 ****
  	void  SetColorCaption(COLORREF	clrCaption);
  	void  Drawtext();
! 	HICON GetImagIcon(int nNum);
! 	CGuiToolButton* GetButton(UINT uID_Object);//,CGuiToolButton* m_btn);
  	
  	virtual void StyleDispl(DWORD dwDsp=GUISTYLE_XP)
  	{
  		m_StyleDisplay=dwDsp;
! 		for (int i=0; i < nNumItems;i++)
      		if (((CArrButton*) m_arrButtons [i])->m_btipo ==TRUE)
  			{
--- 82,93 ----
  	void  SetColorCaption(COLORREF	clrCaption);
  	void  Drawtext();
! 	HICON GetImageIcon(int nNum);
! 	CGuiToolButton* GetButton(UINT uID_Object);
! 	int	  GetButtonIndex(UINT uID_Object);
  	
  	virtual void StyleDispl(DWORD dwDsp=GUISTYLE_XP)
  	{
  		m_StyleDisplay=dwDsp;
! 		for (int i=0; i < GetCountButton();i++)
      		if (((CArrButton*) m_arrButtons [i])->m_btipo ==TRUE)
  			{
***************
*** 102,106 ****
     CImageList	m_imgList;
     COLORREF		m_clrface;
-    int			nNumItems;
     Borders		m_border;
     Align		m_AlignButton;		
--- 104,107 ----
***************
*** 110,116 ****
     BOOL			m_bExisteCombo;
     CFont		m_cfont;	   
!    CString		m_Caption;		
     COLORREF		m_clrCaption;
!    CSize		msz;
     Align		m_AlinTexto;
     CRect	    m_rcDrawTexto;
--- 111,117 ----
     BOOL			m_bExisteCombo;
     CFont		m_cfont;	   
!    CString		m_sCaption;
     COLORREF		m_clrCaption;
!    CSize		m_szCaption;
     Align		m_AlinTexto;
     CRect	    m_rcDrawTexto;

[Anyedit-cvs]AnyEditToolkit/GuiLib msado15.h,NONE,1.1 GuiADODB.h,1.1,1.2

[Guy H <da...@us...>]

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

Modified Files:
	GuiADODB.h 
Added Files:
	msado15.h 
Log Message:
Fixed to remove #import using full path

Index: GuiADODB.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiADODB.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiADODB.h	26 Sep 2004 16:11:49 -0000	1.1
--- GuiADODB.h	13 Oct 2004 23:21:48 -0000	1.2
***************
*** 22,30 ****
   ****************************************************************************/
  
! 
! 
! 
! #import "\Program Files\Common Files\System\ADO\msado15.dll" rename_namespace("ADOCG") rename("EOF", "EndOfFile")
! 
  using namespace ADOCG;
  
--- 22,26 ----
   ****************************************************************************/
  
! #include "msado15.h"
  using namespace ADOCG;
  

--- NEW FILE: msado15.h ---
// Created by Microsoft (R) C/C++ Compiler Version 12.00.9782.0 (2a95c354).
//
// e:\guy\projects\anyedit\anyedittoolkit\guilib\debug\msado15.tlh
//
// C++ source equivalent of Win32 type library C:\Program Files\Common Files\System\ADO\msado15.dll
// compiler-generated file created 10/12/04 at 02:35:30 - DO NOT EDIT!

#pragma once
#pragma pack(push, 8)

#include <comdef.h>

namespace ADOCG {

//
// Forward references and typedefs
//

typedef enum SearchDirectionEnum SearchDirection;
[...5043 lines suppressed...]

inline _variant_t Field15::GetOriginalValue ( ) {
    VARIANT _result;
    VariantInit(&_result);
    HRESULT _hr = get_OriginalValue(&_result);
    if (FAILED(_hr)) _com_issue_errorex(_hr, this, __uuidof(this));
    return _variant_t(_result, false);
}

inline _variant_t Field15::GetUnderlyingValue ( ) {
    VARIANT _result;
    VariantInit(&_result);
    HRESULT _hr = get_UnderlyingValue(&_result);
    if (FAILED(_hr)) _com_issue_errorex(_hr, this, __uuidof(this));
    return _variant_t(_result, false);
}

} // namespace ADOCG

#pragma pack(pop)

[Anyedit-cvs]AnyEditv2 TagManager.cpp,1.12,1.13

[Guy H <da...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6206/AnyEditv2

Modified Files:
	TagManager.cpp 
Log Message:
Fixed problem when updating a tag

Index: TagManager.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/TagManager.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TagManager.cpp	11 Oct 2004 23:27:43 -0000	1.12
--- TagManager.cpp	13 Oct 2004 23:17:41 -0000	1.13
***************
*** 404,410 ****
  bool AETag::AddData(AETag* pTag)
  {
- 	if ((m_eType != Undefined) && (pTag->m_eType != Undefined) && (pTag->m_eType != m_eType))
- 		return false;
- 
  	if (pTag->m_nLine != -1)
  	{
--- 404,407 ----

[Anyedit-cvs]AnyEditv2 ClassTree.cpp,1.12,1.13

[Guy H <da...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5532/AnyEditv2

Modified Files:
	ClassTree.cpp 
Log Message:
Updated to display specific image for structure (instead of one common to class and structure)

Index: ClassTree.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ClassTree.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ClassTree.cpp	11 Oct 2004 23:26:48 -0000	1.12
--- ClassTree.cpp	13 Oct 2004 23:15:45 -0000	1.13
***************
*** 567,571 ****
  #define PART_IMAGE_WIDTH		8
  #define IMAGE_ACCESS_COUNT		5
! #define IMAGE_ACCESSIBLE_ITEM_COUNT	5
  #define IMAGE_ACCESS_OFFSET		(IMAGE_WIDTH - PART_IMAGE_WIDTH)
  #define IMAGE_IMPL_COUNT		2
--- 567,571 ----
  #define PART_IMAGE_WIDTH		8
  #define IMAGE_ACCESS_COUNT		5
! #define IMAGE_ACCESSIBLE_ITEM_COUNT	6
  #define IMAGE_ACCESS_OFFSET		(IMAGE_WIDTH - PART_IMAGE_WIDTH)
  #define IMAGE_IMPL_COUNT		2
***************
*** 576,585 ****
  {
  	IMG_NONE = -1,
! 	IMG_FUNC = 0, IMG_VAR, IMG_CLASS, IMG_UNKNOWN, IMG_DEFAULT, IMG_PROJECT, IMG_FOLDER, IMG_FOLDER_OPEN,
! 	IMG_FUNC_PUB, IMG_VAR_PUB, IMG_CLASS_PUB, IMG_UNKNOWN_PUB, IMG_DEFAULT_PUB,
! 	IMG_FUNC_PRO, IMG_VAR_PRO, IMG_CLASS_PRO, IMG_UNKNOWN_PRO, IMG_DEFAULT_PRO,
! 	IMG_FUNC_PRIV, IMG_VAR_PRIV, IMG_CLASS_PRIV, IMG_UNKNOWN_PRIV, IMG_DEFAULT_PRIV,
! 	IMG_FUNC_FRIEND, IMG_VAR_FRIEND, IMG_CLASS_FRIEND, IMG_UNKNOWN_FRIEND, IMG_DEFAULT_FRIEND,
! 	IMG_FUNC_LOCAL, IMG_VAR_LOCAL, IMG_CLASS_LOCAL, IMG_UNKNOWN_LOCAL, IMG_DEFAULT_LOCAL,
  	IMG_FUNC_PUB_VIRT, IMG_FUNC_PUB_ABSTRUCT,
  	IMG_FUNC_PRO_VIRT, IMG_FUNC_PRO_ABSTRUCT,
--- 576,585 ----
  {
  	IMG_NONE = -1,
! 	IMG_FUNC = 0, IMG_VAR, IMG_CLASS, IMG_STRUCT, IMG_UNKNOWN, IMG_DEFAULT, IMG_PROJECT, IMG_FOLDER, IMG_FOLDER_OPEN,
! 	IMG_FUNC_PUB, IMG_VAR_PUB, IMG_CLASS_PUB, IMG_STRUCT_PUB, IMG_UNKNOWN_PUB, IMG_DEFAULT_PUB,
! 	IMG_FUNC_PRO, IMG_VAR_PRO, IMG_CLASS_PRO, IMG_STRUCT_PRO, IMG_UNKNOWN_PRO, IMG_DEFAULT_PRO,
! 	IMG_FUNC_PRIV, IMG_VAR_PRIV, IMG_CLASS_PRIV, IMG_STRUCT_PRIV, IMG_UNKNOWN_PRIV, IMG_DEFAULT_PRIV,
! 	IMG_FUNC_FRIEND, IMG_VAR_FRIEND, IMG_CLASS_FRIEND, IMG_STRUCT_FRIEND, IMG_UNKNOWN_FRIEND, IMG_DEFAULT_FRIEND,
! 	IMG_FUNC_LOCAL, IMG_VAR_LOCAL, IMG_CLASS_LOCAL, IMG_STRUCT_LOCAL, IMG_UNKNOWN_LOCAL, IMG_DEFAULT_LOCAL,
  	IMG_FUNC_PUB_VIRT, IMG_FUNC_PUB_ABSTRUCT,
  	IMG_FUNC_PRO_VIRT, IMG_FUNC_PRO_ABSTRUCT,
***************
*** 623,627 ****
  		return FALSE;
  
! 	// Create the list of 5 items we add accessibility to:
  	CBitmap* pBmp = dcMem.SelectObject(&bmpAccessible);
  	CBitmap* pBmp2 = dcMem2.SelectObject(&bmpBasic);
--- 623,627 ----
  		return FALSE;
  
! 	// Create the list of 6 items we add accessibility to:
  	CBitmap* pBmp = dcMem.SelectObject(&bmpAccessible);
  	CBitmap* pBmp2 = dcMem2.SelectObject(&bmpBasic);
***************
*** 768,773 ****
  				nBase = IMG_FUNC_PUB;
  			break;
- 		case Class:
  		case Structure:
  		case Union:
  		case Type:
--- 768,775 ----
  				nBase = IMG_FUNC_PUB;
  			break;
  		case Structure:
+ 			nBase = IMG_STRUCT_PUB;
+ 			break;
+ 		case Class:
  		case Union:
  		case Type:

[Anyedit-cvs]AnyEditv2/res itemtype.bmp,1.2,1.3

[Guy H <da...@us...>]

Update of /cvsroot/anyedit/AnyEditv2/res
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4973/AnyEditv2/res

Modified Files:
	itemtype.bmp 
Log Message:
Added structure image

Index: itemtype.bmp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/res/itemtype.bmp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsPvbr3y and /tmp/cvsd5VjbO differ

[Anyedit-cvs]AnyEditToolkit AnyEditToolkit.xml,1.3,1.4

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

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

Modified Files:
	AnyEditToolkit.xml 
Log Message:
Added last changes.

Index: AnyEditToolkit.xml
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/AnyEditToolkit.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AnyEditToolkit.xml	11 Oct 2004 20:44:14 -0000	1.3
--- AnyEditToolkit.xml	12 Oct 2004 20:21:35 -0000	1.4
***************
*** 1,4 ****
  <?xml version="1.0" encoding="windows-1252"?>
! <TODOLIST FILEFORMAT="6" PROJECTNAME="AnyEditToolkit" NEXTUNIQUEID="42" LASTSORTBY="0" FILEVERSION="25" LASTSORTDIR="-1" LASTMODIFIED="2004-10-11">
      <TASK STARTDATESTRING="2004-09-27" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38257.91064815" TITLE="bugs" TIMEESTUNITS="H" ID="1" STARTDATE="38257.00000000" POS="1">
          <TASK STARTDATESTRING="2004-09-27" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38262.71917824" TITLE="CGuiButton" TIMEESTUNITS="H" COMMENTS="return result of selected item in context menu
--- 1,4 ----
  <?xml version="1.0" encoding="windows-1252"?>
! <TODOLIST FILEFORMAT="6" PROJECTNAME="AnyEditToolkit" NEXTUNIQUEID="46" LASTSORTBY="0" FILEVERSION="29" LASTSORTDIR="-1" LASTMODIFIED="2004-10-12">
      <TASK STARTDATESTRING="2004-09-27" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38257.91064815" TITLE="bugs" TIMEESTUNITS="H" ID="1" STARTDATE="38257.00000000" POS="1">
          <TASK STARTDATESTRING="2004-09-27" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38262.71917824" TITLE="CGuiButton" TIMEESTUNITS="H" COMMENTS="return result of selected item in context menu
***************
*** 12,16 ****
  " ID="16" PERCENTDONE="100" STARTDATE="38257.00000000" DONEDATESTRING="2004-10-03" POS="4" DONEDATE="38263.00000000"/>
          <TASK STARTDATESTRING="2004-09-27" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38271.94543981" TITLE="CGuiMDIFrame" TIMEESTUNITS="H" COMMENTS="add DockControlBarLeftOf
! " ID="17" PERCENTDONE="100" STARTDATE="38257.00000000" DONEDATESTRING="2004-10-11" POS="5" DONEDATE="38271.94543981"/>
          <TASK STARTDATESTRING="2004-10-02" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38262.64634259" TITLE="path problem with msado15.dll" TIMEESTUNITS="H" COMMENTS="There is an import of msado15.dll with full path spec.
  " ID="28" STARTDATE="38262.00000000" POS="6"/>
--- 12,16 ----
  " ID="16" PERCENTDONE="100" STARTDATE="38257.00000000" DONEDATESTRING="2004-10-03" POS="4" DONEDATE="38263.00000000"/>
          <TASK STARTDATESTRING="2004-09-27" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38271.94543981" TITLE="CGuiMDIFrame" TIMEESTUNITS="H" COMMENTS="add DockControlBarLeftOf
! " ID="17" PERCENTDONE="100" STARTDATE="38257.00000000" DONEDATESTRING="2004-10-11" POS="5" DONEDATE="38271.00000000"/>
          <TASK STARTDATESTRING="2004-10-02" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38262.64634259" TITLE="path problem with msado15.dll" TIMEESTUNITS="H" COMMENTS="There is an import of msado15.dll with full path spec.
  " ID="28" STARTDATE="38262.00000000" POS="6"/>
***************
*** 22,25 ****
--- 22,29 ----
          <TASK STARTDATESTRING="2004-10-10" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38270.73629630" TITLE="CGuiEditList only shows standard buttons" TIMEESTUNITS="H" COMMENTS="In BCG it is possible to set which buttons are shown. Here is no way to hide buttons.
  " ID="41" STARTDATE="38270.00000000" POS="11"/>
+         <TASK STARTDATESTRING="2004-10-12" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38272.92827546" TITLE="Docking of control bars on left or right side of window does not work every time" TIMEESTUNITS="H" ID="42" STARTDATE="38272.00000000" POS="12"/>
+         <TASK STARTDATESTRING="2004-10-12" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38272.92831019" TITLE="tabbed workspace bar has wrong design" TIMEESTUNITS="H" ID="43" STARTDATE="38272.00000000" POS="13"/>
+         <TASK STARTDATESTRING="2004-10-12" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38272.92834491" TITLE="CGuiMDITabbed shows full path name" TIMEESTUNITS="H" COMMENTS="show file name only and path name as tooltip
+ " ID="44" STARTDATE="38272.00000000" POS="14"/>
      </TASK>
      <TASK STARTDATESTRING="2004-09-27" PRIORITY="5" TIMEESPENTUNITS="H" LASTMOD="38257.86849537" TITLE="parts from AnyEdit" TIMEESTUNITS="H" ID="2" STARTDATE="38257.00000000" POS="2">
***************
*** 59,72 ****
      </TASK>
      <TASK STARTDATESTRING="2004-09-27" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38257.91156250" TITLE="documentation" TIMEESTUNITS="H" COMMENTS="there is no documentation for this libray. Add doxygen comments.
! " ID="27" STARTDATE="38257.00000000" POS="4"/>
      <TASK STARTDATESTRING="2004-09-27" PRIORITY="3" TIMEESPENTUNITS="H" LASTMOD="38257.89656250" TITLE="nice to have" TIMEESTUNITS="H" ID="11" STARTDATE="38257.00000000" POS="5">
          <TASK STARTDATESTRING="2004-09-27" PRIORITY="3" TIMEESPENTUNITS="H" LASTMOD="38257.89659722" TITLE="config classes" TIMEESTUNITS="H" COMMENTS="create classes for saving configurations as Ini, XML or to registry. The type is set at start of program.
  
  use CWinApp::GetProfile... / WriteProfile... interface" ID="12" STARTDATE="38257.00000000" POS="1"/>
!         <TASK STARTDATESTRING="2004-09-27" PRIORITY="3" TIMEESPENTUNITS="H" LASTMOD="38257.89663194" TITLE="resizeable dialogs" TIMEESTUNITS="H" ID="19" STARTDATE="38257.00000000" POS="2"/>
          <TASK STARTDATESTRING="2004-04-05" PRIORITY="3" TIMEESPENTUNITS="H" LASTMOD="38257.89666667" TITLE="Detachable Tabs" TIMEESTUNITS="H" PERSON="CS" COMMENTS="Tabs can become dialogs with dragging. (Docking feature)
  see CodeGuru: Visual Studio.NET Style Tear Off Panes - Part II
  http://www.codeguru.com/Cpp/frameworks/advancedui/openfaq/article.php/c7271/" ID="23" STARTDATE="38082.00000000" POS="3"/>
!         <TASK STARTDATESTRING="2004-09-27" PRIORITY="3" TIMEESPENTUNITS="H" LASTMOD="38262.64641204" TITLE="skin manager" TIMEESTUNITS="H" ID="22" STARTDATE="38257.00000000" POS="4"/>
          <TASK STARTDATESTRING="2004-09-27" PRIORITY="3" TIMEESPENTUNITS="H" LASTMOD="38262.64644676" TITLE="extended tree property sheet control" TIMEESTUNITS="H" COMMENTS="like CSAPrefsDialog, but resizeable and with different looks (XP, Office 2003)
  see http://www.codeproject.com/property/TreePropSheetEx.asp
--- 63,80 ----
      </TASK>
      <TASK STARTDATESTRING="2004-09-27" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38257.91156250" TITLE="documentation" TIMEESTUNITS="H" COMMENTS="there is no documentation for this libray. Add doxygen comments.
! " ID="27" STARTDATE="38257.00000000" POS="4">
!         <TASK STARTDATESTRING="2004-10-12" PRIORITY="5" TIMEESPENTUNITS="H" LASTMOD="38272.92791667" TITLE="idea: class of the week" TIMEESTUNITS="H" COMMENTS="Take one class and rename complete interface if needed. Add comments, replace variable names.
! " ID="45" STARTDATE="38272.00000000" POS="1"/>
!     </TASK>
      <TASK STARTDATESTRING="2004-09-27" PRIORITY="3" TIMEESPENTUNITS="H" LASTMOD="38257.89656250" TITLE="nice to have" TIMEESTUNITS="H" ID="11" STARTDATE="38257.00000000" POS="5">
          <TASK STARTDATESTRING="2004-09-27" PRIORITY="3" TIMEESPENTUNITS="H" LASTMOD="38257.89659722" TITLE="config classes" TIMEESTUNITS="H" COMMENTS="create classes for saving configurations as Ini, XML or to registry. The type is set at start of program.
  
  use CWinApp::GetProfile... / WriteProfile... interface" ID="12" STARTDATE="38257.00000000" POS="1"/>
!         <TASK STARTDATESTRING="2004-09-27" PRIORITY="3" TIMEESPENTUNITS="H" LASTMOD="38272.92665509" TITLE="resizeable dialogs" TIMEESTUNITS="H" COMMENTS="see ResizeableLib http://www.codeproject.com/dialog/ResizableLib.asp" ID="19" STARTDATE="38257.00000000" POS="2"/>
          <TASK STARTDATESTRING="2004-04-05" PRIORITY="3" TIMEESPENTUNITS="H" LASTMOD="38257.89666667" TITLE="Detachable Tabs" TIMEESTUNITS="H" PERSON="CS" COMMENTS="Tabs can become dialogs with dragging. (Docking feature)
  see CodeGuru: Visual Studio.NET Style Tear Off Panes - Part II
  http://www.codeguru.com/Cpp/frameworks/advancedui/openfaq/article.php/c7271/" ID="23" STARTDATE="38082.00000000" POS="3"/>
!         <TASK STARTDATESTRING="2004-09-27" PRIORITY="3" TIMEESPENTUNITS="H" LASTMOD="38272.92042824" TITLE="skin manager" TIMEESTUNITS="H" COMMENTS="use a bridge pattern to do this. The skin manager has methods like DrawButton. This call was delegated to XP.DrawButton or Win2003.DrawButton or OfficeXp.DrawButton... Then it is very easy to change the skin. After a change to another skin all windows are redrawn.
! " ID="22" STARTDATE="38257.00000000" POS="4"/>
          <TASK STARTDATESTRING="2004-09-27" PRIORITY="3" TIMEESPENTUNITS="H" LASTMOD="38262.64644676" TITLE="extended tree property sheet control" TIMEESTUNITS="H" COMMENTS="like CSAPrefsDialog, but resizeable and with different looks (XP, Office 2003)
  see http://www.codeproject.com/property/TreePropSheetEx.asp

[Anyedit-cvs]AnyEditv2 OutputBar.cpp,1.23,1.24

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5582

Modified Files:
	OutputBar.cpp 
Log Message:
File Access Time (and file attributes) are checked for the active document after running a tool. The tool could change a file or it's attributes externally.

Index: OutputBar.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/OutputBar.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** OutputBar.cpp	30 Sep 2004 13:12:40 -0000	1.23
--- OutputBar.cpp	12 Oct 2004 08:47:55 -0000	1.24
***************
*** 314,317 ****
--- 314,326 ----
      }
  
+ 	// Check the access settings of the active document. A tool could change it.
+ 	if( NULL != theApp.GetMainFrameWnd() )
+ 	{
+ 		CDocument* pDocument = theApp.GetMainFrameWnd()->GetActiveDocument();
+ 		if( NULL == pDocument || !pDocument->IsKindOf( RUNTIME_CLASS( CAnyEditDoc ) ) ) return 0;
+ 		((CAnyEditDoc*)pDocument)->CheckLastAccessTime();
+ 	}
+ 
+ 
  	return 0;
  }

[Anyedit-cvs]AnyEditv2 ArrayParser.cpp,1.3,1.4

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5092

Modified Files:
	ArrayParser.cpp 
Log Message:
Fix: All the instances of a tag on a line are replaced instead of only the first.

Index: ArrayParser.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ArrayParser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ArrayParser.cpp	8 May 2003 12:00:56 -0000	1.3
--- ArrayParser.cpp	12 Oct 2004 08:45:35 -0000	1.4
***************
*** 153,167 ****
  CString CArrayParser::HelpMeParse(LPCSTR shortStr,LPCSTR fullStr)
  {
      CString parseStr = shortStr;
      CString full = fullStr;
  
!     int pos = full.Find(parseStr,0);
!     if(pos == -1)
!         return full;
  
-     CString repStr = GetValueForShort(parseStr);
-     CString leftStr = full.Left(pos);
-     CString rightStr = full.Right(full.GetLength()-pos-parseStr.GetLength());
-     full =  leftStr + repStr + rightStr;
      return full;
  }
--- 153,168 ----
  CString CArrayParser::HelpMeParse(LPCSTR shortStr,LPCSTR fullStr)
  {
+ 	int pos;
      CString parseStr = shortStr;
      CString full = fullStr;
  
!     while( -1 != ( pos = full.Find(parseStr,0) ) )
! 	{
! 	    CString repStr = GetValueForShort(parseStr);
! 	    CString leftStr = full.Left(pos);
! 	    CString rightStr = full.Right(full.GetLength()-pos-parseStr.GetLength());
! 	    full = leftStr + repStr + rightStr;
! 	}
  
      return full;
  }

[Anyedit-cvs]AnyEditv2 TagManager.cpp,1.11,1.12

[Guy H <da...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31542/AnyEditv2

Modified Files:
	TagManager.cpp 
Log Message:
Fixed small bug that added a space in the wrong place in the function tag signature

Index: TagManager.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/TagManager.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TagManager.cpp	28 Sep 2004 16:48:46 -0000	1.11
--- TagManager.cpp	11 Oct 2004 23:27:43 -0000	1.12
***************
*** 615,618 ****
--- 615,619 ----
  					// A character was added, spaces are valid now
  					bInitial = false;
+ 				bSpaced = false;
  			}
  		}

[Anyedit-cvs]AnyEditv2 ClassTree.cpp,1.11,1.12

[Guy H <da...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31188/AnyEditv2

Modified Files:
	ClassTree.cpp 
Log Message:
Fixed to use smaller images (16 pixels instead of 24)

Index: ClassTree.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ClassTree.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ClassTree.cpp	21 Sep 2004 07:40:28 -0000	1.11
--- ClassTree.cpp	11 Oct 2004 23:26:48 -0000	1.12
***************
*** 562,566 ****
  }
  
! #define IMAGE_WIDTH				24
  #define IMAGE_HEIGHT			16
  #define IMAGE_BACKGROUND		RGB(255,0,255)
--- 562,566 ----
  }
  
! #define IMAGE_WIDTH				16
  #define IMAGE_HEIGHT			16
  #define IMAGE_BACKGROUND		RGB(255,0,255)

[Anyedit-cvs]AnyEditv2/res itemacce.bmp,1.1,1.2 itemimpl.bmp,1.1,1.2 itemtype.bmp,1.1,1.2

[Guy H <da...@us...>]

Update of /cvsroot/anyedit/AnyEditv2/res
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30957/AnyEditv2/res

Modified Files:
	itemacce.bmp itemimpl.bmp itemtype.bmp 
Log Message:
Now uses the Leon(tm) icons for the class tree images

Index: itemimpl.bmp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/res/itemimpl.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsn7LNdl and /tmp/cvspU9V69 differ

Index: itemacce.bmp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/res/itemacce.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsaDTMes and /tmp/cvsWGizch differ

Index: itemtype.bmp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/res/itemtype.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs551NPE and /tmp/cvs9j2hUt differ

[Anyedit-cvs]AnyEditToolkit AnyEditToolkit.xml,1.2,1.3

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

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

Modified Files:
	AnyEditToolkit.xml 
Log Message:
Added last changes.

Index: AnyEditToolkit.xml
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/AnyEditToolkit.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AnyEditToolkit.xml	10 Oct 2004 18:52:24 -0000	1.2
--- AnyEditToolkit.xml	11 Oct 2004 20:44:14 -0000	1.3
***************
*** 1,4 ****
  <?xml version="1.0" encoding="windows-1252"?>
! <TODOLIST FILEFORMAT="6" PROJECTNAME="AnyEditToolkit" NEXTUNIQUEID="42" LASTSORTBY="0" FILEVERSION="24" LASTSORTDIR="-1" LASTMODIFIED="2004-10-10">
      <TASK STARTDATESTRING="2004-09-27" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38257.91064815" TITLE="bugs" TIMEESTUNITS="H" ID="1" STARTDATE="38257.00000000" POS="1">
          <TASK STARTDATESTRING="2004-09-27" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38262.71917824" TITLE="CGuiButton" TIMEESTUNITS="H" COMMENTS="return result of selected item in context menu
--- 1,4 ----
  <?xml version="1.0" encoding="windows-1252"?>
! <TODOLIST FILEFORMAT="6" PROJECTNAME="AnyEditToolkit" NEXTUNIQUEID="42" LASTSORTBY="0" FILEVERSION="25" LASTSORTDIR="-1" LASTMODIFIED="2004-10-11">
      <TASK STARTDATESTRING="2004-09-27" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38257.91064815" TITLE="bugs" TIMEESTUNITS="H" ID="1" STARTDATE="38257.00000000" POS="1">
          <TASK STARTDATESTRING="2004-09-27" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38262.71917824" TITLE="CGuiButton" TIMEESTUNITS="H" COMMENTS="return result of selected item in context menu
***************
*** 11,21 ****
  see A VisualStudio-like ListBox class http://www.codeguru.com/Cpp/controls/listbox/article.php/c1613/
  " ID="16" PERCENTDONE="100" STARTDATE="38257.00000000" DONEDATESTRING="2004-10-03" POS="4" DONEDATE="38263.00000000"/>
!         <TASK STARTDATESTRING="2004-09-27" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38257.89702546" TITLE="CGuiMDIFrame" TIMEESTUNITS="H" COMMENTS="add DockControlBarLeftOf
! " ID="17" STARTDATE="38257.00000000" POS="5"/>
          <TASK STARTDATESTRING="2004-10-02" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38262.64634259" TITLE="path problem with msado15.dll" TIMEESTUNITS="H" COMMENTS="There is an import of msado15.dll with full path spec.
  " ID="28" STARTDATE="38262.00000000" POS="6"/>
          <TASK STARTDATESTRING="2004-10-03" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38263.77458333" TITLE="add missing hints for class wizard" TIMEESTUNITS="H" ID="29" STARTDATE="38263.00000000" POS="7"/>
!         <TASK STARTDATESTRING="2004-10-04" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38270.73370370" TITLE="CGuiButton SEMIFLAT doesn't show a border" TIMEESTUNITS="H" ID="38" PERCENTDONE="100" STARTDATE="38264.00000000" DONEDATESTRING="2004-10-10" POS="8" DONEDATE="38270.73370370"/>
!         <TASK STARTDATESTRING="2004-10-04" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38270.73379630" TITLE="CGuiButton add bitmap handling" TIMEESTUNITS="H" ID="39" PERCENTDONE="100" STARTDATE="38264.00000000" DONEDATESTRING="2004-10-10" POS="9" DONEDATE="38270.73379630"/>
          <TASK STARTDATESTRING="2004-10-10" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38270.73618056" TITLE="CGuiButton with bitmaps and XP style has wrong background" TIMEESTUNITS="H" COMMENTS="In other styles background is grey. In XP style background is grey too, but it should be white.
  " ID="40" STARTDATE="38270.00000000" POS="10"/>
--- 11,21 ----
  see A VisualStudio-like ListBox class http://www.codeguru.com/Cpp/controls/listbox/article.php/c1613/
  " ID="16" PERCENTDONE="100" STARTDATE="38257.00000000" DONEDATESTRING="2004-10-03" POS="4" DONEDATE="38263.00000000"/>
!         <TASK STARTDATESTRING="2004-09-27" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38271.94543981" TITLE="CGuiMDIFrame" TIMEESTUNITS="H" COMMENTS="add DockControlBarLeftOf
! " ID="17" PERCENTDONE="100" STARTDATE="38257.00000000" DONEDATESTRING="2004-10-11" POS="5" DONEDATE="38271.94543981"/>
          <TASK STARTDATESTRING="2004-10-02" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38262.64634259" TITLE="path problem with msado15.dll" TIMEESTUNITS="H" COMMENTS="There is an import of msado15.dll with full path spec.
  " ID="28" STARTDATE="38262.00000000" POS="6"/>
          <TASK STARTDATESTRING="2004-10-03" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38263.77458333" TITLE="add missing hints for class wizard" TIMEESTUNITS="H" ID="29" STARTDATE="38263.00000000" POS="7"/>
!         <TASK STARTDATESTRING="2004-10-04" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38270.73370370" TITLE="CGuiButton SEMIFLAT doesn't show a border" TIMEESTUNITS="H" ID="38" PERCENTDONE="100" STARTDATE="38264.00000000" DONEDATESTRING="2004-10-10" POS="8" DONEDATE="38270.00000000"/>
!         <TASK STARTDATESTRING="2004-10-04" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38270.73379630" TITLE="CGuiButton add bitmap handling" TIMEESTUNITS="H" ID="39" PERCENTDONE="100" STARTDATE="38264.00000000" DONEDATESTRING="2004-10-10" POS="9" DONEDATE="38270.00000000"/>
          <TASK STARTDATESTRING="2004-10-10" PRIORITY="7" TIMEESPENTUNITS="H" LASTMOD="38270.73618056" TITLE="CGuiButton with bitmaps and XP style has wrong background" TIMEESTUNITS="H" COMMENTS="In other styles background is grey. In XP style background is grey too, but it should be white.
  " ID="40" STARTDATE="38270.00000000" POS="10"/>

[Anyedit-cvs]AnyEditToolkit GuiToolkit.dsw,1.1,1.2

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

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

Modified Files:
	GuiToolkit.dsw 
Log Message:
Added new sample with styles of CGuiButtons.

Index: GuiToolkit.dsw
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiToolkit.dsw,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiToolkit.dsw	26 Sep 2004 16:09:29 -0000	1.1
--- GuiToolkit.dsw	11 Oct 2004 20:33:03 -0000	1.2
***************
*** 16,19 ****
--- 16,31 ----
  ###############################################################################
  
+ Project: "ButtonsDlg"=.\ButtonsDlg\ButtonsDlg.dsp - Package Owner=<4>
+ 
+ Package=<5>
+ {{{
+ }}}
+ 
+ Package=<4>
+ {{{
+ }}}
+ 
+ ###############################################################################
+ 
  Project: "CGuiAccess"=.\Samples\CGuiAccess\CGuiAccess.dsp - Package Owner=<4>
  

[Anyedit-cvs]AnyEditToolkit/Samples/ButtonsDlg ButtonsDlg.cpp,NONE,1.1 ButtonsDlg.dsp,NONE,1.1 ButtonsDlg.h,NONE,1.1 ButtonsDlg.rc,NONE,1.1 ButtonsDlgDlg.cpp,NONE,1.1 ButtonsDlgDlg.h,NONE,1.1 StdAfx.cpp,NONE,1.1 StdAfx.h,NONE,1.1 resource.h,NONE,1.1

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

Update of /cvsroot/anyedit/AnyEditToolkit/Samples/ButtonsDlg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23803/Samples/ButtonsDlg

Added Files:
	ButtonsDlg.cpp ButtonsDlg.dsp ButtonsDlg.h ButtonsDlg.rc 
	ButtonsDlgDlg.cpp ButtonsDlgDlg.h StdAfx.cpp StdAfx.h 
	resource.h 
Log Message:
New sample with styles of CGuiButtons.

--- NEW FILE: ButtonsDlgDlg.h ---
// ButtonsDlgDlg.h : Header-Datei
//

#if !defined(AFX_BUTTONSDLGDLG_H__8C25CF66_EBED_49F2_BE93_B20B4790FF45__INCLUDED_)
#define AFX_BUTTONSDLGDLG_H__8C25CF66_EBED_49F2_BE93_B20B4790FF45__INCLUDED_

#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000

/////////////////////////////////////////////////////////////////////////////
// CButtonsDlgDlg Dialogfeld

class CButtonsDlgDlg : public CDialog
{
// Konstruktion
public:
	CButtonsDlgDlg(CWnd* pParent = NULL);	// Standard-Konstruktor

// Dialogfelddaten
	//{{AFX_DATA(CButtonsDlgDlg)
	enum { IDD = IDD_BUTTONSDLG_DIALOG };
	CGuiButton	m_btXPInactive;
	CGuiButton	m_btXPImageTextInactive;
	CGuiButton	m_btXPImageText;
	CGuiButton	m_btXPImageInactive;
	CGuiButton	m_btXPImage;
	CGuiButton	m_btXP;
	CButton	m_btStandardInactive;
	CButton	m_btStandard;
	CGuiButton	m_btSemiflatInactive;
	CGuiButton	m_btSemiflatImageTextInactive;
	CGuiButton	m_btSemiflatImageText;
	CGuiButton	m_btSemiflatImageInactive;
	CGuiButton	m_btSemiflatImage;
	CGuiButton	m_btSemiflat;
	CGuiButton	m_btFlatInactive;
	CGuiButton	m_btFlatImageTextInactive;
	CGuiButton	m_btFlatImageText;
	CGuiButton	m_btFlatImageInactive;
	CGuiButton	m_btFlatImage;
	CGuiButton	m_btFlat;
	//}}AFX_DATA

	// Vom Klassenassistenten generierte Überladungen virtueller Funktionen
	//{{AFX_VIRTUAL(CButtonsDlgDlg)
	protected:
	virtual void DoDataExchange(CDataExchange* pDX);	// DDX/DDV-Unterstützung
	//}}AFX_VIRTUAL

// Implementierung
protected:
	HICON m_hIcon;

	// Generierte Message-Map-Funktionen
	//{{AFX_MSG(CButtonsDlgDlg)
	virtual BOOL OnInitDialog();
	afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
	afx_msg void OnPaint();
	afx_msg HCURSOR OnQueryDragIcon();
	//}}AFX_MSG
	DECLARE_MESSAGE_MAP()
};

//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ fügt unmittelbar vor der vorhergehenden Zeile zusätzliche Deklarationen ein.

#endif // !defined(AFX_BUTTONSDLGDLG_H__8C25CF66_EBED_49F2_BE93_B20B4790FF45__INCLUDED_)

--- NEW FILE: ButtonsDlg.rc ---
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

/////////////////////////////////////////////////////////////////////////////
// Deutsch (Deutschland) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
#ifdef _WIN32
LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
#pragma code_page(1252)
#endif //_WIN32

#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//

1 TEXTINCLUDE DISCARDABLE 
BEGIN
    "resource.h\0"
END

2 TEXTINCLUDE DISCARDABLE 
BEGIN
    "#include ""afxres.h""\r\n"
    "\0"
END

3 TEXTINCLUDE DISCARDABLE 
BEGIN
    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
    "#define _AFX_NO_OLE_RESOURCES\r\n"
    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
    "\r\n"
    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
    "#ifdef _WIN32\r\n"
    "LANGUAGE 9, 1\r\n"
    "#pragma code_page(1252)\r\n"
    "#endif //_WIN32\r\n"
    "#include ""res\\ButtonsDlg.rc2""  // Nicht mit Microsoft Visual C++ bearbeitete Ressourcen\r\n"
    "#include ""afxres.rc""         // Standardkomponenten\r\n"
    "#endif\r\n"
    "\0"
END

#endif    // APSTUDIO_INVOKED


/////////////////////////////////////////////////////////////////////////////
//
// Icon
//

// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDR_MAINFRAME           ICON    DISCARDABLE     "res\\ButtonsDlg.ico"
#endif    // Deutsch (Deutschland) resources
/////////////////////////////////////////////////////////////////////////////


/////////////////////////////////////////////////////////////////////////////
// Englisch (USA) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32

/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//

IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 235, 55
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "About ButtonsDlg"
FONT 8, "MS Sans Serif"
BEGIN
    ICON            IDR_MAINFRAME,IDC_STATIC,11,17,20,20
    LTEXT           "ButtonsDlg Version 1.0",IDC_STATIC,40,10,119,8,
                    SS_NOPREFIX
    LTEXT           "Copyright (C) 2004",IDC_STATIC,40,25,119,8
    DEFPUSHBUTTON   "OK",IDOK,178,7,50,14,WS_GROUP
END

IDD_BUTTONSDLG_DIALOG DIALOGEX 0, 0, 320, 200
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW
CAPTION "ButtonsDlg"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
    DEFPUSHBUTTON   "OK",IDOK,260,7,50,14
    PUSHBUTTON      "Cancel",IDCANCEL,260,23,50,14
    GROUPBOX        "Standard",IDC_STATIC,15,36,67,60
    PUSHBUTTON      "Button1",IDC_STANDARD,23,55,50,14
    PUSHBUTTON      "Button2",IDC_STANDARD_INACTIVE,23,76,50,14,WS_DISABLED
    GROUPBOX        "Flat",IDC_STATIC,162,36,65,140
    PUSHBUTTON      "Button3",IDC_SEMIFLAT,99,55,50,14
    PUSHBUTTON      "Button4",IDC_SEMIFLAT_INACTIVE,99,76,50,14,WS_DISABLED
    PUSHBUTTON      "Button5",IDC_SEMIFLAT_IMAGE,99,95,50,14
    PUSHBUTTON      "Button6",IDC_FLAT_IMAGE_INACTIVE,171,118,50,14,
                    WS_DISABLED
    PUSHBUTTON      "Button7",IDC_SEMIFLAT_IMAGE_TEXT,99,138,50,14
    PUSHBUTTON      "Button8",IDC_SEMIFLAT_IMAGE_TEXT_INACTIVE,99,156,50,14,
                    WS_DISABLED
    GROUPBOX        "SemiFlat",IDC_STATIC,91,36,65,140
    PUSHBUTTON      "Button3",IDC_FLAT,171,55,50,14
    PUSHBUTTON      "Button4",IDC_FLAT_INACTIVE,171,76,50,14,WS_DISABLED
    PUSHBUTTON      "Button5",IDC_FLAT_IMAGE,171,95,50,14
    PUSHBUTTON      "Button6",IDC_SEMIFLAT_IMAGE_INACTIVE,99,118,50,14,
                    WS_DISABLED
    PUSHBUTTON      "Button7",IDC_FLAT_IMAGE_TEXT,171,138,50,14
    PUSHBUTTON      "Button8",IDC_FLAT_IMAGE_TEXT_INACTIVE,171,156,50,14,
                    WS_DISABLED
    GROUPBOX        "XP",IDC_STATIC,239,36,65,140
    PUSHBUTTON      "Button6",IDC_XP_IMAGE_INACTIVE,248,118,50,14,
                    WS_DISABLED
    PUSHBUTTON      "Button3",IDC_XP,248,55,50,14
    PUSHBUTTON      "Button4",IDC_XP_INACTIVE,248,76,50,14,WS_DISABLED
    PUSHBUTTON      "Button5",IDC_XP_IMAGE,248,95,50,14
    PUSHBUTTON      "Button7",IDC_XP_IMAGE_TEXT,248,138,50,14
    PUSHBUTTON      "Button8",IDC_XP_IMAGE_TEXT_INACTIVE,248,156,50,14,
                    WS_DISABLED
END


#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//

VS_VERSION_INFO VERSIONINFO
 FILEVERSION 1,0,0,1
 PRODUCTVERSION 1,0,0,1
 FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
 FILEFLAGS 0x1L
#else
 FILEFLAGS 0x0L
#endif
 FILEOS 0x4L
 FILETYPE 0x1L
 FILESUBTYPE 0x0L
BEGIN
    BLOCK "StringFileInfo"
    BEGIN
        BLOCK "040904B0"
        BEGIN
            VALUE "CompanyName", "\0"
            VALUE "FileDescription", "ButtonsDlg MFC Application\0"
            VALUE "FileVersion", "1, 0, 0, 1\0"
            VALUE "InternalName", "ButtonsDlg\0"
            VALUE "LegalCopyright", "Copyright (C) 2004\0"
            VALUE "LegalTrademarks", "\0"
            VALUE "OriginalFilename", "ButtonsDlg.EXE\0"
            VALUE "ProductName", "ButtonsDlg Application\0"
            VALUE "ProductVersion", "1, 0, 0, 1\0"
        END
    END
    BLOCK "VarFileInfo"
    BEGIN
        VALUE "Translation", 0x409, 1200
    END
END

#endif    // !_MAC


/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//

#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE 
BEGIN
    IDD_ABOUTBOX, DIALOG
    BEGIN
        LEFTMARGIN, 7
        RIGHTMARGIN, 228
        TOPMARGIN, 7
        BOTTOMMARGIN, 48
    END

    IDD_BUTTONSDLG_DIALOG, DIALOG
    BEGIN
        LEFTMARGIN, 7
        RIGHTMARGIN, 313
        TOPMARGIN, 7
        BOTTOMMARGIN, 193
    END
END
#endif    // APSTUDIO_INVOKED


/////////////////////////////////////////////////////////////////////////////
//
// String Table
//

STRINGTABLE DISCARDABLE 
BEGIN
    IDS_ABOUTBOX            "&About ButtonsDlg..."
END

#endif    // Englisch (USA) resources
/////////////////////////////////////////////////////////////////////////////


/////////////////////////////////////////////////////////////////////////////
// Spanisch (Kastilisch) (unknown sub-lang: 0x9) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESO)
#ifdef _WIN32
LANGUAGE LANG_SPANISH, 0x9
#pragma code_page(1252)
#endif //_WIN32

/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//

IDB_BOTON               BITMAP  MOVEABLE PURE   "res\\bmp00001.bmp"
#endif    // Spanisch (Kastilisch) (unknown sub-lang: 0x9) resources
/////////////////////////////////////////////////////////////////////////////



#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
#define _AFX_NO_SPLITTER_RESOURCES
#define _AFX_NO_OLE_RESOURCES
#define _AFX_NO_TRACKER_RESOURCES
#define _AFX_NO_PROPERTY_RESOURCES

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE 9, 1
#pragma code_page(1252)
#endif //_WIN32
#include "res\ButtonsDlg.rc2"  // Nicht mit Microsoft Visual C++ bearbeitete Ressourcen
#include "afxres.rc"         // Standardkomponenten
#endif

/////////////////////////////////////////////////////////////////////////////
#endif    // not APSTUDIO_INVOKED


--- NEW FILE: ButtonsDlg.dsp ---
# Microsoft Developer Studio Project File - Name="ButtonsDlg" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** NICHT BEARBEITEN **

# TARGTYPE "Win32 (x86) Application" 0x0101

CFG=ButtonsDlg - Win32 Debug
!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE 
!MESSAGE NMAKE /f "ButtonsDlg.mak".
!MESSAGE 
!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE 
!MESSAGE NMAKE /f "ButtonsDlg.mak" CFG="ButtonsDlg - Win32 Debug"
!MESSAGE 
!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE 
!MESSAGE "ButtonsDlg - Win32 Release" (basierend auf  "Win32 (x86) Application")
!MESSAGE "ButtonsDlg - Win32 Debug" (basierend auf  "Win32 (x86) Application")
!MESSAGE 

# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe

!IF  "$(CFG)" == "ButtonsDlg - Win32 Release"

# PROP BASE Use_MFC 6
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 6
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "NDEBUG" /d "_AFXDLL"
# ADD RSC /l 0x407 /d "NDEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
# ADD LINK32 /nologo /subsystem:windows /machine:I386 /out:"..\..\bin/ButtonsDlg.exe"

!ELSEIF  "$(CFG)" == "ButtonsDlg - Win32 Debug"

# PROP BASE Use_MFC 6
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 6
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "_DEBUG" /d "_AFXDLL"
# ADD RSC /l 0x407 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /out:"..\..\bin/ButtonsDlgD.exe" /pdbtype:sept

!ENDIF 

# Begin Target

# Name "ButtonsDlg - Win32 Release"
# Name "ButtonsDlg - Win32 Debug"
# Begin Group "Quellcodedateien"

# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File

SOURCE=.\ButtonsDlg.cpp
# End Source File
# Begin Source File

SOURCE=.\ButtonsDlg.rc
# End Source File
# Begin Source File

SOURCE=.\ButtonsDlgDlg.cpp
# End Source File
# Begin Source File

SOURCE=.\StdAfx.cpp
# ADD CPP /Yc"stdafx.h"
# End Source File
# End Group
# Begin Group "Header-Dateien"

# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File

SOURCE=.\ButtonsDlg.h
# End Source File
# Begin Source File

SOURCE=.\ButtonsDlgDlg.h
# End Source File
# Begin Source File

SOURCE=.\Resource.h
# End Source File
# Begin Source File

SOURCE=.\StdAfx.h
# End Source File
# End Group
# Begin Group "Ressourcendateien"

# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# Begin Source File

SOURCE=.\res\bmp00001.bmp
# End Source File
# Begin Source File

SOURCE=.\res\ButtonsDlg.ico
# End Source File
# Begin Source File

SOURCE=.\res\ButtonsDlg.rc2
# End Source File
# End Group
# Begin Source File

SOURCE=.\ReadMe.txt
# End Source File
# End Target
# End Project

--- NEW FILE: ButtonsDlg.h ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ButtonsDlgDlg.cpp ---
// ButtonsDlgDlg.cpp : Implementierungsdatei
//

#include "stdafx.h"
#include "ButtonsDlg.h"
#include "ButtonsDlgDlg.h"

#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;
#endif

/////////////////////////////////////////////////////////////////////////////
// CAboutDlg-Dialogfeld für Anwendungsbefehl "Info"

class CAboutDlg : public CDialog
{
public:
	CAboutDlg();

// Dialogfelddaten
	//{{AFX_DATA(CAboutDlg)
	enum { IDD = IDD_ABOUTBOX };
	//}}AFX_DATA

	// Vom Klassenassistenten generierte Überladungen virtueller Funktionen
	//{{AFX_VIRTUAL(CAboutDlg)
	protected:
	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV-Unterstützung
	//}}AFX_VIRTUAL

// Implementierung
protected:
	//{{AFX_MSG(CAboutDlg)
	//}}AFX_MSG
	DECLARE_MESSAGE_MAP()
};

CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
{
	//{{AFX_DATA_INIT(CAboutDlg)
	//}}AFX_DATA_INIT
}

void CAboutDlg::DoDataExchange(CDataExchange* pDX)
{
	CDialog::DoDataExchange(pDX);
	//{{AFX_DATA_MAP(CAboutDlg)
	//}}AFX_DATA_MAP
}

BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
	//{{AFX_MSG_MAP(CAboutDlg)
		// Keine Nachrichten-Handler
	//}}AFX_MSG_MAP
END_MESSAGE_MAP()

/////////////////////////////////////////////////////////////////////////////
// CButtonsDlgDlg Dialogfeld

CButtonsDlgDlg::CButtonsDlgDlg(CWnd* pParent /*=NULL*/)
	: CDialog(CButtonsDlgDlg::IDD, pParent)
{
	//{{AFX_DATA_INIT(CButtonsDlgDlg)
		// HINWEIS: Der Klassenassistent fügt hier Member-Initialisierung ein
	//}}AFX_DATA_INIT
	// Beachten Sie, dass LoadIcon unter Win32 keinen nachfolgenden DestroyIcon-Aufruf benötigt
	m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
}

void CButtonsDlgDlg::DoDataExchange(CDataExchange* pDX)
{
	CDialog::DoDataExchange(pDX);
	//{{AFX_DATA_MAP(CButtonsDlgDlg)
	DDX_Control(pDX, IDC_XP_INACTIVE, m_btXPInactive);
	DDX_Control(pDX, IDC_XP_IMAGE_TEXT_INACTIVE, m_btXPImageTextInactive);
	DDX_Control(pDX, IDC_XP_IMAGE_TEXT, m_btXPImageText);
	DDX_Control(pDX, IDC_XP_IMAGE_INACTIVE, m_btXPImageInactive);
	DDX_Control(pDX, IDC_XP_IMAGE, m_btXPImage);
	DDX_Control(pDX, IDC_XP, m_btXP);
	DDX_Control(pDX, IDC_STANDARD_INACTIVE, m_btStandardInactive);
	DDX_Control(pDX, IDC_STANDARD, m_btStandard);
	DDX_Control(pDX, IDC_SEMIFLAT_INACTIVE, m_btSemiflatInactive);
	DDX_Control(pDX, IDC_SEMIFLAT_IMAGE_TEXT_INACTIVE, m_btSemiflatImageTextInactive);
	DDX_Control(pDX, IDC_SEMIFLAT_IMAGE_TEXT, m_btSemiflatImageText);
	DDX_Control(pDX, IDC_SEMIFLAT_IMAGE_INACTIVE, m_btSemiflatImageInactive);
	DDX_Control(pDX, IDC_SEMIFLAT_IMAGE, m_btSemiflatImage);
	DDX_Control(pDX, IDC_SEMIFLAT, m_btSemiflat);
	DDX_Control(pDX, IDC_FLAT_INACTIVE, m_btFlatInactive);
	DDX_Control(pDX, IDC_FLAT_IMAGE_TEXT_INACTIVE, m_btFlatImageTextInactive);
	DDX_Control(pDX, IDC_FLAT_IMAGE_TEXT, m_btFlatImageText);
	DDX_Control(pDX, IDC_FLAT_IMAGE_INACTIVE, m_btFlatImageInactive);
	DDX_Control(pDX, IDC_FLAT_IMAGE, m_btFlatImage);
	DDX_Control(pDX, IDC_FLAT, m_btFlat);
	//}}AFX_DATA_MAP
}

BEGIN_MESSAGE_MAP(CButtonsDlgDlg, CDialog)
	//{{AFX_MSG_MAP(CButtonsDlgDlg)
	ON_WM_SYSCOMMAND()
	ON_WM_PAINT()
	ON_WM_QUERYDRAGICON()
	//}}AFX_MSG_MAP
END_MESSAGE_MAP()

/////////////////////////////////////////////////////////////////////////////
// CButtonsDlgDlg Nachrichten-Handler

BOOL CButtonsDlgDlg::OnInitDialog()
{
	CDialog::OnInitDialog();

	// Hinzufügen des Menübefehls "Info..." zum Systemmenü.

	// IDM_ABOUTBOX muss sich im Bereich der Systembefehle befinden.
	ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);
	ASSERT(IDM_ABOUTBOX < 0xF000);

	CMenu* pSysMenu = GetSystemMenu(FALSE);
	if (pSysMenu != NULL)
	{
		CString strAboutMenu;
		strAboutMenu.LoadString(IDS_ABOUTBOX);
		if (!strAboutMenu.IsEmpty())
		{	
			pSysMenu->AppendMenu(MF_SEPARATOR);
			pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu);
		}
	}

	// Symbol für dieses Dialogfeld festlegen. Wird automatisch erledigt
	//  wenn das Hauptfenster der Anwendung kein Dialogfeld ist
	SetIcon(m_hIcon, TRUE);			// Großes Symbol verwenden
	SetIcon(m_hIcon, FALSE);		// Kleines Symbol verwenden
	
	m_btFlat.SetStyleBorder(CGuiButton::STYLE_FLAT);
	m_btFlatImage.SetStyleBorder(CGuiButton::STYLE_FLAT);
	m_btFlatImageInactive.SetStyleBorder(CGuiButton::STYLE_FLAT);
	m_btFlatImageText.SetStyleBorder(CGuiButton::STYLE_FLAT);
	m_btFlatImageTextInactive.SetStyleBorder(CGuiButton::STYLE_FLAT);
	m_btFlatInactive.SetStyleBorder(CGuiButton::STYLE_FLAT);

	m_btSemiflat.SetStyleBorder(CGuiButton::STYLE_SEMIFLAT);
	m_btSemiflatImage.SetStyleBorder(CGuiButton::STYLE_SEMIFLAT);
	m_btSemiflatImageInactive.SetStyleBorder(CGuiButton::STYLE_SEMIFLAT);
	m_btSemiflatImageText.SetStyleBorder(CGuiButton::STYLE_SEMIFLAT);
	m_btSemiflatImageTextInactive.SetStyleBorder(CGuiButton::STYLE_SEMIFLAT);
	m_btSemiflatInactive.SetStyleBorder(CGuiButton::STYLE_SEMIFLAT);

	m_btXP.SetStyleBorder(CGuiButton::STYLEXP);
	m_btXPImage.SetStyleBorder(CGuiButton::STYLEXP);
	m_btXPImageInactive.SetStyleBorder(CGuiButton::STYLEXP);
	m_btXPImageText.SetStyleBorder(CGuiButton::STYLEXP);
	m_btXPImageTextInactive.SetStyleBorder(CGuiButton::STYLEXP);
	m_btXPInactive.SetStyleBorder(CGuiButton::STYLEXP);

	m_btFlatImage.SetImageBitmap(IDB_BOTON);
	m_btFlatImageInactive.SetImageBitmap(IDB_BOTON);
	m_btFlatImageText.SetImageBitmap(IDB_BOTON);
	m_btFlatImageTextInactive.SetImageBitmap(IDB_BOTON);

	m_btSemiflatImage.SetImageBitmap(IDB_BOTON);
	m_btSemiflatImageInactive.SetImageBitmap(IDB_BOTON);
	m_btSemiflatImageText.SetImageBitmap(IDB_BOTON);
	m_btSemiflatImageTextInactive.SetImageBitmap(IDB_BOTON);

	m_btXPImage.SetImageBitmap(IDB_BOTON);
	m_btXPImageInactive.SetImageBitmap(IDB_BOTON);
	m_btXPImageText.SetImageBitmap(IDB_BOTON);
	m_btXPImageTextInactive.SetImageBitmap(IDB_BOTON);

	m_btFlatImage.ShowText(FALSE);
	m_btFlatImageInactive.ShowText(FALSE);

	m_btSemiflatImage.ShowText(FALSE);
	m_btSemiflatImageInactive.ShowText(FALSE);

	m_btXPImage.ShowText(FALSE);
	m_btXPImageInactive.ShowText(FALSE);
	
	return TRUE;  // Geben Sie TRUE zurück, außer ein Steuerelement soll den Fokus erhalten
}

void CButtonsDlgDlg::OnSysCommand(UINT nID, LPARAM lParam)
{
	if ((nID & 0xFFF0) == IDM_ABOUTBOX)
	{
		CAboutDlg dlgAbout;
		dlgAbout.DoModal();
	}
	else
	{
		CDialog::OnSysCommand(nID, lParam);
	}
}

// Wollen Sie Ihrem Dialogfeld eine Schaltfläche "Minimieren" hinzufügen, benötigen Sie 
//  den nachstehenden Code, um das Symbol zu zeichnen. Für MFC-Anwendungen, die das 
//  Dokument/Ansicht-Modell verwenden, wird dies automatisch für Sie erledigt.

void CButtonsDlgDlg::OnPaint() 
{
	if (IsIconic())
	{
		CPaintDC dc(this); // Gerätekontext für Zeichnen

		SendMessage(WM_ICONERASEBKGND, (WPARAM) dc.GetSafeHdc(), 0);

		// Symbol in Client-Rechteck zentrieren
		int cxIcon = GetSystemMetrics(SM_CXICON);
		int cyIcon = GetSystemMetrics(SM_CYICON);
		CRect rect;
		GetClientRect(&rect);
		int x = (rect.Width() - cxIcon + 1) / 2;
		int y = (rect.Height() - cyIcon + 1) / 2;

		// Symbol zeichnen
		dc.DrawIcon(x, y, m_hIcon);
	}
	else
	{
		CDialog::OnPaint();
	}
}

// Die Systemaufrufe fragen den Cursorform ab, die angezeigt werden soll, während der Benutzer
//  das zum Symbol verkleinerte Fenster mit der Maus zieht.
HCURSOR CButtonsDlgDlg::OnQueryDragIcon()
{
	return (HCURSOR) m_hIcon;
}

--- NEW FILE: StdAfx.h ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: StdAfx.cpp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: resource.h ---
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by ButtonsDlg.rc
//
#define IDM_ABOUTBOX                    0x0010
#define IDD_ABOUTBOX                    100
#define IDS_ABOUTBOX                    101
#define IDD_BUTTONSDLG_DIALOG           102
#define IDR_MAINFRAME                   128
#define IDB_BOTON                       133
#define IDC_STANDARD                    1000
#define IDC_STANDARD_INACTIVE           1001
#define IDC_SEMIFLAT                    1002
#define IDC_SEMIFLAT_INACTIVE           1003
#define IDC_SEMIFLAT_IMAGE              1004
#define IDC_FLAT_IMAGE_INACTIVE         1005
#define IDC_SEMIFLAT_IMAGE_TEXT         1006
#define IDC_SEMIFLAT_IMAGE_TEXT_INACTIVE 1007
#define IDC_FLAT                        1008
#define IDC_FLAT_INACTIVE               1009
#define IDC_FLAT_IMAGE                  1010
#define IDC_SEMIFLAT_IMAGE_INACTIVE     1011
#define IDC_FLAT_IMAGE_TEXT             1012
#define IDC_FLAT_IMAGE_TEXT_INACTIVE    1013
#define IDC_XP_IMAGE_INACTIVE           1014
#define IDC_XP                          1015
#define IDC_XP_INACTIVE                 1016
#define IDC_XP_IMAGE                    1017
#define IDC_XP_IMAGE_TEXT               1018
#define IDC_XP_IMAGE_TEXT_INACTIVE      1019

// Next default values for new objects
// 
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE        129
#define _APS_NEXT_COMMAND_VALUE         40001
#define _APS_NEXT_CONTROL_VALUE         1008
#define _APS_NEXT_SYMED_VALUE           101
#endif
#endif

--- NEW FILE: ButtonsDlg.cpp ---
(This appears to be a binary file; contents omitted.)

[Anyedit-cvs]AnyEditToolkit/Samples/ButtonsDlg/res ButtonsDlg.ico,NONE,1.1 ButtonsDlg.rc2,NONE,1.1 bmp00001.bmp,NONE,1.1

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

Update of /cvsroot/anyedit/AnyEditToolkit/Samples/ButtonsDlg/res
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23803/Samples/ButtonsDlg/res

Added Files:
	ButtonsDlg.ico ButtonsDlg.rc2 bmp00001.bmp 
Log Message:
New sample with styles of CGuiButtons.

--- NEW FILE: ButtonsDlg.ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ButtonsDlg.rc2 ---
//
// BUTTONSDLG.RC2 - Ressourcen, die Microsoft Visual C++ nicht direkt bearbeitet
//

#ifdef APSTUDIO_INVOKED
	#error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED


/////////////////////////////////////////////////////////////////////////////
// Fügen Sie hier manuell bearbeitete Ressourcen hinzu...

/////////////////////////////////////////////////////////////////////////////

--- NEW FILE: bmp00001.bmp ---
(This appears to be a binary file; contents omitted.)

[Anyedit-cvs]AnyEditToolkit/Samples/ButtonsDlg/res - New directory

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

Update of /cvsroot/anyedit/AnyEditToolkit/Samples/ButtonsDlg/res
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23170/res

Log Message:
Directory /cvsroot/anyedit/AnyEditToolkit/Samples/ButtonsDlg/res added to the repository

[Anyedit-cvs]AnyEditToolkit/Samples/ButtonsDlg - New directory

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

Update of /cvsroot/anyedit/AnyEditToolkit/Samples/ButtonsDlg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22951/ButtonsDlg

Log Message:
Directory /cvsroot/anyedit/AnyEditToolkit/Samples/ButtonsDlg added to the repository

[Anyedit-cvs]AnyEditToolkit/GuiLib GuiTabWnd.cpp,1.3,1.4 GuiTabWnd.h,1.2,1.3

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

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

Modified Files:
	GuiTabWnd.cpp GuiTabWnd.h 
Log Message:
- Bugfix in GetActiveWnd.
- Added GetTabRect. Gives rect of tab.

Index: GuiTabWnd.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiTabWnd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GuiTabWnd.h	11 Oct 2004 18:01:23 -0000	1.2
--- GuiTabWnd.h	11 Oct 2004 20:27:10 -0000	1.3
***************
*** 123,126 ****
--- 123,127 ----
  
  public:
+ 	CRect GetTabRect(int iTabNr);
  	afx_msg void OnDestroy();
  };

Index: GuiTabWnd.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiTabWnd.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GuiTabWnd.cpp	11 Oct 2004 18:01:23 -0000	1.3
--- GuiTabWnd.cpp	11 Oct 2004 20:27:10 -0000	1.4
***************
*** 525,532 ****
  }
  
  CWnd* CGuiTabWnd::GetActiveWnd () const
  {
  		return m_Numtabs == -1 ? NULL : 
! 		((CGuiTab*) m_pArray [m_Numtabs])->pParent;
  }
  
--- 525,533 ----
  }
  
+ /// Get pointer of active window.
  CWnd* CGuiTabWnd::GetActiveWnd () const
  {
  		return m_Numtabs == -1 ? NULL : 
! 		((CGuiTab*) m_pArray [m_iSelectTab])->pParent;
  }
  
***************
*** 791,792 ****
--- 792,806 ----
  	return TRUE;
  }
+ 
+ /// Get rect of given tab number iTabNr.
+ CRect CGuiTabWnd::GetTabRect(int iTabNr)
+ {
+ 	CRect rect;
+ 	rect.SetRectEmpty();
+ 	CGuiTab* ct=(CGuiTab*) m_pArray[iTabNr];
+ 	if (ct!=NULL)
+ 	{
+ 		rect = ct->rect;
+ 	}
+ 	return rect;
+ }

[Anyedit-cvs]AnyEditToolkit/GuiLib GuiMDIFrame.cpp,1.2,1.3 GuiMDIFrame.h,1.1,1.2

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

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

Modified Files:
	GuiMDIFrame.cpp GuiMDIFrame.h 
Log Message:
Added DockControlBarLeftOf. Dock control bar side by side.

Index: GuiMDIFrame.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiMDIFrame.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GuiMDIFrame.cpp	2 Oct 2004 13:27:41 -0000	1.2
--- GuiMDIFrame.cpp	11 Oct 2004 20:25:56 -0000	1.3
***************
*** 478,479 ****
--- 478,520 ----
  return 0;
  }
+ 
+ /** Dock control bar side by side. pBar will be aligned left of pLeftOf.
+  *
+  * from Cristi Posea www.datamekanix.com
+  */
+ void CGuiMDIFrame::DockControlBarLeftOf(CControlBar* pBar, CControlBar* pLeftOf)
+ {
+     ASSERT(pBar != NULL);
+     ASSERT(pLeftOf != NULL);
+     ASSERT(pBar != pLeftOf);
+ 
+     // the neighbour must be already docked
+     CDockBar* pDockBar = pLeftOf->m_pDockBar;
+     ASSERT(pDockBar != NULL);
+     UINT nDockBarID = pLeftOf->m_pDockBar->GetDlgCtrlID();
+     ASSERT(nDockBarID != AFX_IDW_DOCKBAR_FLOAT);
+ 
+     bool bHorz = (nDockBarID == AFX_IDW_DOCKBAR_TOP ||
+         nDockBarID == AFX_IDW_DOCKBAR_BOTTOM);
+ 
+     // dock normally (inserts a new row)
+     DockControlBar(pBar, nDockBarID);
+ 
+     // delete the new row (the bar pointer and the row end mark)
+     pDockBar->m_arrBars.RemoveAt(pDockBar->m_arrBars.GetSize() - 1);
+     pDockBar->m_arrBars.RemoveAt(pDockBar->m_arrBars.GetSize() - 1);
+ 
+     // find the target bar
+     for (int i = 0; i < pDockBar->m_arrBars.GetSize(); i++)
+     {
+         void* p = pDockBar->m_arrBars[i];
+         if (p == pLeftOf) // and insert the new bar after it
+             pDockBar->m_arrBars.InsertAt(i + 1, pBar);
+     }
+ 
+     // move the new bar into position
+     CRect rBar;
+     pLeftOf->GetWindowRect(rBar);
+     rBar.OffsetRect(bHorz ? 1 : 0, bHorz ? 0 : 1);
+     pBar->MoveWindow(rBar);
+ }

Index: GuiMDIFrame.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/GuiMDIFrame.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiMDIFrame.h	26 Sep 2004 16:11:51 -0000	1.1
--- GuiMDIFrame.h	11 Oct 2004 20:25:56 -0000	1.2
***************
*** 66,69 ****
--- 66,70 ----
  // Operations
  public:
+ 	void DockControlBarLeftOf(CControlBar* pBar, CControlBar* pLeftOf);
  
  	virtual void EnableDocking(DWORD dwDockStyle);