[Wgui-cvs] wgui/src wg_button.cpp,1.40,1.41 wg_checkbox.cpp,1.24,1.25 wg_dropdown.cpp,1.26,1.27 wg_f
Status: Beta
Brought to you by:
greenwire
|
From: Rob W. <gre...@us...> - 2005-01-07 22:08:49
|
Update of /cvsroot/wgui/wgui/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26926/src Modified Files: wg_button.cpp wg_checkbox.cpp wg_dropdown.cpp wg_frame.cpp wg_menu.cpp wg_message_server.cpp wg_messagebox.cpp wg_scrollbar.cpp wg_toolbar.cpp wg_view.cpp Log Message: Work on the message box. Changed the single click message types to include the word SINGLE. Index: wg_view.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_view.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** wg_view.cpp 16 Jul 2004 16:41:36 -0000 1.42 --- wg_view.cpp 7 Jan 2005 22:08:38 -0000 1.43 *************** *** 30,33 **** --- 30,34 ---- #include "wg_message_server.h" #include "wg_application.h" + #include "wg_frame.h" #include "std_ex.h" *************** *** 54,57 **** --- 55,59 ---- CMessageServer::Instance().RegisterMessageClient(this, CMessage::APP_PAINT); + CMessageServer::Instance().RegisterMessageClient(this, CMessage::APP_DESTROY_FRAME, CMessageServer::PRIORITY_FIRST); CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_RESIZE); CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONDOWN, CMessageServer::PRIORITY_FIRST); *************** *** 155,158 **** --- 157,173 ---- } break; + case CMessage::APP_DESTROY_FRAME: + if (pMessage->Destination() == this || pMessage->Destination() == 0) + { + CFrame* pFrame = dynamic_cast<CFrame*>(const_cast<CMessageClient*>(pMessage->Source())); + if (pFrame) + { + pFrame->SetNewParent(0); + CMessageServer::Instance().QueueMessage(new CMessage(CMessage::APP_PAINT, 0, this)); + delete pFrame; + } + bHandled = true; + } + break; case CMessage::CTRL_RESIZE: { Index: wg_messagebox.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_messagebox.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wg_messagebox.cpp 5 Jan 2005 21:09:32 -0000 1.6 --- wg_messagebox.cpp 7 Jan 2005 22:08:38 -0000 1.7 *************** *** 66,70 **** switch(pMessage->MessageType()) { ! case CMessage::CTRL_LCLICK: { if (pMessage->Destination() == this) --- 66,70 ---- switch(pMessage->MessageType()) { ! case CMessage::CTRL_SINGLELCLICK: { if (pMessage->Destination() == this) Index: wg_dropdown.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_dropdown.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wg_dropdown.cpp 16 Jul 2004 16:41:36 -0000 1.26 --- wg_dropdown.cpp 7 Jan 2005 22:08:38 -0000 1.27 *************** *** 54,58 **** this, CwgBitmapResourceHandle(WGRES_DOWN_ARROW_BITMAP)); CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONDOWN); ! CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_LCLICK); CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_VALUECHANGE); Draw(); --- 54,58 ---- this, CwgBitmapResourceHandle(WGRES_DOWN_ARROW_BITMAP)); CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONDOWN); ! CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_SINGLELCLICK); CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_VALUECHANGE); Draw(); *************** *** 125,129 **** break; } ! case CMessage::CTRL_LCLICK: { if (pMessage->Destination() == this) --- 125,129 ---- break; } ! case CMessage::CTRL_SINGLELCLICK: { if (pMessage->Destination() == this) Index: wg_checkbox.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_checkbox.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wg_checkbox.cpp 12 Dec 2004 09:08:18 -0000 1.24 --- wg_checkbox.cpp 7 Jan 2005 22:08:38 -0000 1.25 *************** *** 38,42 **** m_BackgroundColor = COLOR_WHITE; CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONUP); ! CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_LCLICK); Draw(); } --- 38,42 ---- m_BackgroundColor = COLOR_WHITE; CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONUP); ! CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_SINGLELCLICK); Draw(); } *************** *** 111,121 **** { case CMouseMessage::LEFT: ! MessageType = CMessage::CTRL_LCLICK; break; case CMouseMessage::RIGHT: ! MessageType = CMessage::CTRL_RCLICK; break; case CMouseMessage::MIDDLE: ! MessageType = CMessage::CTRL_MCLICK; break; } --- 111,121 ---- { case CMouseMessage::LEFT: ! MessageType = CMessage::CTRL_SINGLELCLICK; break; case CMouseMessage::RIGHT: ! MessageType = CMessage::CTRL_SINGLERCLICK; break; case CMouseMessage::MIDDLE: ! MessageType = CMessage::CTRL_SINGLEMCLICK; break; } *************** *** 147,151 **** break; } ! case CMessage::CTRL_LCLICK: if (pMessage->Destination() == this) { --- 147,151 ---- break; } ! case CMessage::CTRL_SINGLELCLICK: if (pMessage->Destination() == this) { Index: wg_scrollbar.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_scrollbar.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** wg_scrollbar.cpp 12 Dec 2004 09:08:19 -0000 1.44 --- wg_scrollbar.cpp 7 Jan 2005 22:08:38 -0000 1.45 *************** *** 68,72 **** CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONUP); CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_MOVE); ! CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_LCLICK); Draw(); } --- 68,72 ---- CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONUP); CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_MOVE); ! CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_SINGLELCLICK); Draw(); } *************** *** 235,239 **** } break; ! case CMessage::CTRL_LCLICK: { if (pMessage->Destination() == this) --- 235,239 ---- } break; ! case CMessage::CTRL_SINGLELCLICK: { if (pMessage->Destination() == this) Index: wg_menu.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_menu.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** wg_menu.cpp 12 Dec 2004 09:08:19 -0000 1.55 --- wg_menu.cpp 7 Jan 2005 22:08:38 -0000 1.56 *************** *** 59,63 **** CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_MOVE); ! CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_LCLICK); CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_TIMER); --- 59,63 ---- CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_MOVE); ! CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_SINGLELCLICK); CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_TIMER); *************** *** 165,169 **** break; } ! case CMessage::CTRL_LCLICK: { TIntMessage* pCtrlMessage = dynamic_cast<TIntMessage*>(pMessage); --- 165,169 ---- break; } ! case CMessage::CTRL_SINGLELCLICK: { TIntMessage* pCtrlMessage = dynamic_cast<TIntMessage*>(pMessage); *************** *** 174,178 **** if (pCtrlMessage->Source() == iter->first.pPopup) { ! CMessageServer::Instance().QueueMessage(new TIntMessage(CMessage::CTRL_LCLICK, m_pParentWindow, this, pCtrlMessage->Value())); bHandled = true; --- 174,178 ---- if (pCtrlMessage->Source() == iter->first.pPopup) { ! CMessageServer::Instance().QueueMessage(new TIntMessage(CMessage::CTRL_SINGLELCLICK, m_pParentWindow, this, pCtrlMessage->Value())); bHandled = true; *************** *** 282,286 **** else { ! CMessageServer::Instance().QueueMessage(new TIntMessage(CMessage::CTRL_LCLICK, m_pParentWindow, this, iter->first.iItemId)); } break; --- 282,286 ---- else { ! CMessageServer::Instance().QueueMessage(new TIntMessage(CMessage::CTRL_SINGLELCLICK, m_pParentWindow, this, iter->first.iItemId)); } break; *************** *** 607,611 **** pDestination = m_pParentMenu; } ! CMessageServer::Instance().QueueMessage(new TIntMessage(CMessage::CTRL_LCLICK, pDestination, this, iter->first.iItemId)); HideAll(); } --- 607,611 ---- pDestination = m_pParentMenu; } ! CMessageServer::Instance().QueueMessage(new TIntMessage(CMessage::CTRL_SINGLELCLICK, pDestination, this, iter->first.iItemId)); HideAll(); } Index: wg_button.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_button.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** wg_button.cpp 12 Dec 2004 09:08:18 -0000 1.40 --- wg_button.cpp 7 Jan 2005 22:08:38 -0000 1.41 *************** *** 151,161 **** { case CMouseMessage::LEFT: ! MessageType = CMessage::CTRL_LCLICK; break; case CMouseMessage::RIGHT: ! MessageType = CMessage::CTRL_RCLICK; break; case CMouseMessage::MIDDLE: ! MessageType = CMessage::CTRL_MCLICK; break; } --- 151,161 ---- { case CMouseMessage::LEFT: ! MessageType = CMessage::CTRL_SINGLELCLICK; break; case CMouseMessage::RIGHT: ! MessageType = CMessage::CTRL_SINGLERCLICK; break; case CMouseMessage::MIDDLE: ! MessageType = CMessage::CTRL_SINGLEMCLICK; break; } Index: wg_message_server.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_message_server.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wg_message_server.cpp 12 Dec 2004 19:45:06 -0000 1.29 --- wg_message_server.cpp 7 Jan 2005 22:08:38 -0000 1.30 *************** *** 142,148 **** if (iter->second.second) { ! iter->second.second = false; ! bFinished = iter->second.first->HandleMessage(pMessage); ! break; } } --- 142,148 ---- if (iter->second.second) { ! iter->second.second = false; ! bFinished = iter->second.first->HandleMessage(pMessage); ! break; } } Index: wg_toolbar.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_toolbar.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wg_toolbar.cpp 16 Jul 2004 16:41:36 -0000 1.16 --- wg_toolbar.cpp 7 Jan 2005 22:08:38 -0000 1.17 *************** *** 36,40 **** { m_BackgroundColor = COLOR_LIGHTGRAY; ! CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_LCLICK); Draw(); } --- 36,40 ---- { m_BackgroundColor = COLOR_LIGHTGRAY; ! CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_SINGLELCLICK); Draw(); } *************** *** 144,148 **** switch(pMessage->MessageType()) { ! case CMessage::CTRL_LCLICK: { if (pMessage->Destination() == this) --- 144,148 ---- switch(pMessage->MessageType()) { ! case CMessage::CTRL_SINGLELCLICK: { if (pMessage->Destination() == this) *************** *** 156,160 **** } } ! CMessageServer::Instance().QueueMessage(new TIntMessage(CMessage::CTRL_LCLICK, m_pParentWindow, this, iButtonID)); bHandled = true; } --- 156,160 ---- } } ! CMessageServer::Instance().QueueMessage(new TIntMessage(CMessage::CTRL_SINGLELCLICK, m_pParentWindow, this, iButtonID)); bHandled = true; } Index: wg_frame.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_frame.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wg_frame.cpp 5 Jan 2005 21:09:32 -0000 1.28 --- wg_frame.cpp 7 Jan 2005 22:08:38 -0000 1.29 *************** *** 60,64 **** CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONUP); CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_MOVE); ! CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_LCLICK); } --- 60,64 ---- CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONUP); CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_MOVE); ! CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_SINGLELCLICK); } *************** *** 72,79 **** void CFrame::CloseFrame(void) { ! // suicide the frame by detaching it from it's parent, queing up an APP_PAINT message, then deleting itself ! SetNewParent(0); ! CMessageServer::Instance().QueueMessage(new CMessage(CMessage::APP_PAINT, 0, this)); ! delete this; } --- 72,76 ---- void CFrame::CloseFrame(void) { ! CMessageServer::Instance().QueueMessage(new CMessage(CMessage::APP_DESTROY_FRAME, 0, this)); } *************** *** 249,253 **** break; } ! case CMessage::CTRL_LCLICK: { if (pMessage->Destination() == this) --- 246,250 ---- break; } ! case CMessage::CTRL_SINGLELCLICK: { if (pMessage->Destination() == this) |