From: boca4711 <boc...@us...> - 2004-10-17 08:42:03
|
Update of /cvsroot/anyedit/AnyEditToolkit/GuiLib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24056/GuiLib Modified Files: MenuBar.cpp MenuBar.h Log Message: Added missing OnPaint handler Index: MenuBar.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/MenuBar.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MenuBar.cpp 15 Oct 2004 14:01:52 -0000 1.4 --- MenuBar.cpp 17 Oct 2004 08:41:50 -0000 1.5 *************** *** 229,232 **** --- 229,233 ---- ON_WM_SETCURSOR() ON_WM_SYSCOLORCHANGE() + ON_WM_PAINT() //}}AFX_MSG_MAP ON_REGISTERED_MESSAGE(MB_SET_MENU_NULL, OnSetMenuNull) *************** *** 3272,3276 **** { CPaintDC pDC(this); // device context for painting - // TODO: Add your message handler code here // Do not call CControlBar::OnPaint() for painting messages CRect rect; GetClientRect(rect); --- 3273,3276 ---- *************** *** 3295,3311 **** if (m_pMenuControl) { if (IsFloating()) { ! m_pMenuControl->DelayLayoutAndDraw(&pDC, rect.Size(),bFlota); ! ! } else { if (m_dwStyle & CBRS_ORIENT_HORZ) ! m_pMenuControl->DelayLayoutAndDraw(&pDC, CSize(GetClipBoxLength(TRUE), rect.Height()),bFlota); else ! m_pMenuControl->DelayLayoutAndDraw(&pDC, CSize(rect.Width(), GetClipBoxLength(FALSE)),bFlota); } } - } - - --- 3295,3306 ---- if (m_pMenuControl) { if (IsFloating()) { ! m_pMenuControl->DelayLayoutAndDraw(&pDC, rect.Size(), bFlota); } else { if (m_dwStyle & CBRS_ORIENT_HORZ) ! m_pMenuControl->DelayLayoutAndDraw(&pDC, CSize(GetClipBoxLength(TRUE), rect.Height()), bFlota); else ! m_pMenuControl->DelayLayoutAndDraw(&pDC, CSize(rect.Width(), GetClipBoxLength(FALSE)), bFlota); } } } Index: MenuBar.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditToolkit/GuiLib/MenuBar.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MenuBar.h 15 Oct 2004 14:01:52 -0000 1.2 --- MenuBar.h 17 Oct 2004 08:41:50 -0000 1.3 *************** *** 385,388 **** --- 385,389 ---- afx_msg void OnSize(UINT nType, int cx, int cy); afx_msg BOOL OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message); + afx_msg void OnPaint(); //}}AFX_MSG afx_msg LRESULT OnSetMenuNull(WPARAM wParam, LPARAM lParam); *************** *** 482,486 **** HWND OleMenuDescriptor(BOOL& bSend, UINT nMsg, WPARAM wParam, LPARAM lParam); CWnd* GetCmdSentOleWnd(); - afx_msg void OnPaint(); }; --- 483,486 ---- |