[Wgui-cvs] wgui/tests CalcApp.cpp,1.26,1.27 ConfigEditor.cpp,1.5,1.6 MessagingTest.cpp,1.5,1.6 Notepad.cpp,1.5,1.6 TestView1.cpp,1.79,1.80 TestView2.cpp,1.13,1.14

[Rob W. <gre...@us...>]

Update of /cvsroot/wgui/wgui/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26926/tests

Modified Files:
	CalcApp.cpp ConfigEditor.cpp MessagingTest.cpp Notepad.cpp 
	TestView1.cpp TestView2.cpp 
Log Message:
Work on the message box.
Changed the single click message types to include the word SINGLE.

Index: ConfigEditor.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/tests/ConfigEditor.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ConfigEditor.cpp	25 Jun 2004 19:37:51 -0000	1.5
--- ConfigEditor.cpp	7 Jan 2005 22:08:39 -0000	1.6
***************
*** 136,140 ****
  	m_pStatusLabel = new CLabel(CRect(5, 325, 290, 345), this, "Status: Select a configuration level to edit.");
  
! 	CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_LCLICK);
    CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_VALUECHANGE);
  
--- 136,140 ----
  	m_pStatusLabel = new CLabel(CRect(5, 325, 290, 345), this, "Status: Select a configuration level to edit.");
  
! 	CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_SINGLELCLICK);
    CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_VALUECHANGE);
  
***************
*** 191,195 ****
          }
  			}
! 			case CMessage::CTRL_LCLICK:
  			{
  				if (pMessage->Destination() == this)
--- 191,195 ----
          }
  			}
! 			case CMessage::CTRL_SINGLELCLICK:
  			{
  				if (pMessage->Destination() == this)

Index: MessagingTest.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/tests/MessagingTest.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MessagingTest.cpp	25 Jun 2004 19:37:51 -0000	1.5
--- MessagingTest.cpp	7 Jan 2005 22:08:39 -0000	1.6
***************
*** 111,115 ****
  	}
  
! 	CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_LCLICK);
  
  	// queue the test message
--- 111,115 ----
  	}
  
! 	CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_SINGLELCLICK);
  
  	// queue the test message
***************
*** 127,131 ****
  		switch (pMessage->MessageType())
  		{
! 		case CMessage::CTRL_LCLICK:
  		{
  			if (pMessage->Destination() == this)
--- 127,131 ----
  		switch (pMessage->MessageType())
  		{
! 		case CMessage::CTRL_SINGLELCLICK:
  		{
  			if (pMessage->Destination() == this)

Index: Notepad.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/tests/Notepad.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Notepad.cpp	21 Jul 2004 18:38:24 -0000	1.5
--- Notepad.cpp	7 Jan 2005 22:08:39 -0000	1.6
***************
*** 87,91 ****
  	SetWindowText(std::string("Notepad - wGui version ") + wGui::CwgStringResourceHandle(wGui::WGRES_VERSION_STRING).String());
  	CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_RESIZE);
! 	CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_LCLICK);
  
  	AttachMenu(new CMenu(CRect(0, 0, 80, 22), this));
--- 87,91 ----
  	SetWindowText(std::string("Notepad - wGui version ") + wGui::CwgStringResourceHandle(wGui::WGRES_VERSION_STRING).String());
  	CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_RESIZE);
! 	CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_SINGLELCLICK);
  
  	AttachMenu(new CMenu(CRect(0, 0, 80, 22), this));
***************
*** 119,123 ****
  		switch (pMessage->MessageType())
  		{
! 		case CMessage::CTRL_LCLICK:
  		{
  			TIntMessage* pCtrlMessage = dynamic_cast<TIntMessage*>(pMessage);
--- 119,123 ----
  		switch (pMessage->MessageType())
  		{
! 		case CMessage::CTRL_SINGLELCLICK:
  		{
  			TIntMessage* pCtrlMessage = dynamic_cast<TIntMessage*>(pMessage);

Index: TestView2.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/tests/TestView2.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** TestView2.cpp	5 Jan 2005 21:09:33 -0000	1.13
--- TestView2.cpp	7 Jan 2005 22:08:39 -0000	1.14
***************
*** 35,39 ****
  	m_pExitButton = new wGui::CButton(ClientToView(wGui::CRect(20, 80, 160, 100)), this, "Exit");
  
! 	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_LCLICK);
  	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_MESSAGEBOXRETURN);
  }
--- 35,39 ----
  	m_pExitButton = new wGui::CButton(ClientToView(wGui::CRect(20, 80, 160, 100)), this, "Exit");
  
! 	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_SINGLELCLICK);
  	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_MESSAGEBOXRETURN);
  }
***************
*** 48,52 ****
  		switch (pMessage->MessageType())
  		{
! 		case wGui::CMessage::CTRL_LCLICK:
  		{
  			if (pMessage->Destination() == this)
--- 48,52 ----
  		switch (pMessage->MessageType())
  		{
! 		case wGui::CMessage::CTRL_SINGLELCLICK:
  		{
  			if (pMessage->Destination() == this)

Index: TestView1.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/tests/TestView1.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** TestView1.cpp	27 Dec 2004 04:59:36 -0000	1.79
--- TestView1.cpp	7 Jan 2005 22:08:39 -0000	1.80
***************
*** 67,72 ****
  	SetWindowText(std::string("Test App 1 - wGui version ") + wGui::CwgStringResourceHandle(wGui::WGRES_VERSION_STRING).String());
  	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_VALUECHANGE);
! 	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_LCLICK);
! 	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_RCLICK);
  	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_RESIZE);
  	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_TIMER);
--- 67,72 ----
  	SetWindowText(std::string("Test App 1 - wGui version ") + wGui::CwgStringResourceHandle(wGui::WGRES_VERSION_STRING).String());
  	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_VALUECHANGE);
! 	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_SINGLELCLICK);
! 	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_SINGLERCLICK);
  	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_RESIZE);
  	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_TIMER);
***************
*** 239,243 ****
  			break;
  		}
! 		case wGui::CMessage::CTRL_LCLICK:
  		{
  			wGui::TIntMessage* pCtrlMessage = dynamic_cast<wGui::TIntMessage*>(pMessage);
--- 239,243 ----
  			break;
  		}
! 		case wGui::CMessage::CTRL_SINGLELCLICK:
  		{
  			wGui::TIntMessage* pCtrlMessage = dynamic_cast<wGui::TIntMessage*>(pMessage);
***************
*** 356,360 ****
  			break;
  		}
! 		case wGui::CMessage::CTRL_RCLICK:
  		{
  			if (pMessage && pMessage->Destination() == this)
--- 356,360 ----
  			break;
  		}
! 		case wGui::CMessage::CTRL_SINGLERCLICK:
  		{
  			if (pMessage && pMessage->Destination() == this)

Index: CalcApp.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/tests/CalcApp.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** CalcApp.cpp	2 Apr 2004 17:26:16 -0000	1.26
--- CalcApp.cpp	7 Jan 2005 22:08:39 -0000	1.27
***************
*** 86,90 ****
  {
  	SetWindowText(std::string("wGui Calculator - wGui version ") + wGui::CwgStringResourceHandle(wGui::WGRES_VERSION_STRING).String());
! 	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_LCLICK);
  	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::KEYBOARD_KEYDOWN);
  	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::KEYBOARD_KEYUP);
--- 86,90 ----
  {
  	SetWindowText(std::string("wGui Calculator - wGui version ") + wGui::CwgStringResourceHandle(wGui::WGRES_VERSION_STRING).String());
! 	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::CTRL_SINGLELCLICK);
  	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::KEYBOARD_KEYDOWN);
  	wGui::CMessageServer::Instance().RegisterMessageClient(this, wGui::CMessage::KEYBOARD_KEYUP);
***************
*** 118,122 ****
  		switch (pMessage->MessageType())
  		{
! 		case wGui::CMessage::CTRL_LCLICK:
  			if (pMessage->Destination() == this)
  			{
--- 118,122 ----
  		switch (pMessage->MessageType())
  		{
! 		case wGui::CMessage::CTRL_SINGLELCLICK:
  			if (pMessage->Destination() == this)
  			{