[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.91,1.92 tcChatBox.cpp,1.2,1.3

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28730/src/sim

Modified Files:
	Game.cpp tcChatBox.cpp 
Log Message:


Index: tcChatBox.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcChatBox.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcChatBox.cpp	8 Aug 2004 00:31:35 -0000	1.2
--- tcChatBox.cpp	5 Sep 2004 01:02:03 -0000	1.3
***************
*** 39,43 ****
  using namespace Gdiplus;
  
! BEGIN_EVENT_TABLE(tcChatBox, tcStandardWindow)
  EVT_COMMAND(1, wxEVT_COMMAND_TEXT_UPDATED, tcChatBox::SendChatText)
  END_EVENT_TABLE()
--- 39,43 ----
  using namespace Gdiplus;
  
! BEGIN_EVENT_TABLE(tcChatBox, tcXmlWindow)
  EVT_COMMAND(1, wxEVT_COMMAND_TEXT_UPDATED, tcChatBox::SendChatText)
  END_EVENT_TABLE()
***************
*** 128,132 ****
                               const wxPoint& pos, const wxSize& size, 
                               const wxString& name, const wxString& configFile) 
!                              : tcStandardWindow(parent, pos, size, configFile, name, surfaceHost)
  {
  
--- 128,132 ----
                               const wxPoint& pos, const wxSize& size, 
                               const wxString& name, const wxString& configFile) 
!                              : tcXmlWindow(parent, pos, size, configFile, name, surfaceHost)
  {
  

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** Game.cpp	17 Aug 2004 02:22:56 -0000	1.91
--- Game.cpp	5 Sep 2004 01:02:03 -0000	1.92
***************
*** 46,50 ****
  #include "cspDate.h"
  #include "tcDirector.h"
! #include "tcStandardWindow.h"
  #include "tcNetworkView.h"
  #include "tcDisplaySettingsView.h"
--- 46,50 ----
  #include "cspDate.h"
  #include "tcDirector.h"
! #include "tcXmlWindow.h"
  #include "tcNetworkView.h"
  #include "tcDisplaySettingsView.h"
***************
*** 706,714 ****
  {
  	wxASSERT(startView);
- 	scenarioSelectView = new tcScenarioSelectView(glCanvas, 
- 		wxPoint(0,0), frameSize, "ScenarioSelect", startView);
  
! 	scenarioSelectView->AttachSimState(simState);
! 	scenarioSelectView->LoadBackgroundImage("start_background.jpg");
  
  	if (scenarioSelectView->Init() == false)
--- 706,712 ----
  {
  	wxASSERT(startView);
  
! 	scenarioSelectView = 
! 		new tcScenarioSelectView(glCanvas, startView, wxPoint(0,0), frameSize);
  
  	if (scenarioSelectView->Init() == false)