Menu
▾
▴
[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
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] |
