[Wgui-cvs] wgui/src wg_message_server.cpp,1.28,1.29 wg_window.cpp,1.54,1.55

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

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

Modified Files:
	wg_message_server.cpp wg_window.cpp 
Log Message:
Commented out some code in TestView1.cpp so that it wouldn't segfault.  This is a temporary measure that needs to be fixed properly.



Index: wg_message_server.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/src/wg_message_server.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** wg_message_server.cpp	3 Jun 2004 18:40:52 -0000	1.28
--- wg_message_server.cpp	12 Dec 2004 19:45:06 -0000	1.29
***************
*** 25,28 ****
--- 25,29 ----
  #include "wgui_include_config.h"
  #include "wg_message_server.h"
+ #include "wg_application.h"
  #include "std_ex.h"
  #include "wg_message_client.h"
***************
*** 69,73 ****
  void CMessageServer::RegisterMessageClient(CMessageClient* pClient, CMessage::EMessageType eMessageType, unsigned char Priority)
  {
! 	m_MessageClients[eMessageType].insert(std::make_pair(Priority, std::make_pair(pClient, false)));
  }
  
--- 70,82 ----
  void CMessageServer::RegisterMessageClient(CMessageClient* pClient, CMessage::EMessageType eMessageType, unsigned char Priority)
  {
! 	if (!pClient)
! 	{
! 		CApplication::Instance()->GetApplicationLog().AddLogEntry(
! 			"CMessageServer::RegisterMessageClient : Attempting to register a non-existent message client.", APP_LOG_ERROR);
! 	}
! 	else
! 	{
! 		m_MessageClients[eMessageType].insert(std::make_pair(Priority, std::make_pair(pClient, false)));
! 	}
  }
  

Index: wg_window.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/src/wg_window.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** wg_window.cpp	12 Dec 2004 09:08:19 -0000	1.54
--- wg_window.cpp	12 Dec 2004 19:45:06 -0000	1.55
***************
*** 276,280 ****
  		for (std::list<CWindow*>::const_iterator iter = m_ChildWindows.begin(); iter != m_ChildWindows.end(); ++iter)
  		{
! 			(*iter)->PaintToSurface(ScreenSurface, FloatingSurface, NewOffset);
  		}
  	}
--- 276,283 ----
  		for (std::list<CWindow*>::const_iterator iter = m_ChildWindows.begin(); iter != m_ChildWindows.end(); ++iter)
  		{
! 			if (*iter)
! 			{
! 				(*iter)->PaintToSurface(ScreenSurface, FloatingSurface, NewOffset);
! 			}
  		}
  	}