[Wgui-cvs] wgui/src wg_menu.cpp,1.52,1.53
Status: Beta
Brought to you by:
greenwire
|
From: Rob W. <gre...@us...> - 2004-07-16 18:53:00
|
Update of /cvsroot/wgui/wgui/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10911/src Modified Files: wg_menu.cpp Log Message: Draw architecture changes. Index: wg_menu.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_menu.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** wg_menu.cpp 16 Jul 2004 16:41:36 -0000 1.52 --- wg_menu.cpp 16 Jul 2004 18:52:51 -0000 1.53 *************** *** 131,135 **** { CMouseMessage* pMouseMessage = dynamic_cast<CMouseMessage*>(pMessage); ! if (m_bVisible && pMouseMessage && m_WindowRect.HitTest(ViewToWindow(pMouseMessage->Point)) == CRect::RELPOS_INSIDE) { UpdateCachedRects(); --- 131,136 ---- { CMouseMessage* pMouseMessage = dynamic_cast<CMouseMessage*>(pMessage); ! if (m_bVisible && pMouseMessage && ! m_WindowRect.SizeRect().HitTest(ViewToWindow(pMouseMessage->Point)) == CRect::RELPOS_INSIDE) { UpdateCachedRects(); *************** *** 148,152 **** { m_pPopupTimer->StopTimer(); ! if (m_pHighlightedItem->pPopup) { m_pPopupTimer->StartTimer(1000); --- 149,153 ---- { m_pPopupTimer->StopTimer(); ! if (m_pHighlightedItem && m_pHighlightedItem->pPopup) { m_pPopupTimer->StartTimer(1000); *************** *** 300,304 **** { CMouseMessage* pMouseMessage = dynamic_cast<CMouseMessage*>(pMessage); ! if (m_bVisible && pMouseMessage && m_WindowRect.HitTest(ViewToWindow(pMouseMessage->Point)) == CRect::RELPOS_INSIDE) { UpdateCachedRects(); --- 301,306 ---- { CMouseMessage* pMouseMessage = dynamic_cast<CMouseMessage*>(pMessage); ! if (m_bVisible && pMouseMessage && ! m_WindowRect.SizeRect().HitTest(ViewToWindow(pMouseMessage->Point)) == CRect::RELPOS_INSIDE) { UpdateCachedRects(); *************** *** 476,479 **** --- 478,482 ---- CMessageServer::Instance().QueueMessage(new CMessage(CMessage::APP_PAINT, 0, this)); m_pHighlightedItem = 0; + Draw(); } |