[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.97,1.98 tc3DViewer.cpp,1.36,NONE tcChatBox.cpp,1.3,NONE tcGameView.cpp,1.13,NONE tcHookInfo.cpp,1.9,NONE tcMapView.cpp,1.33,NONE tcOOBView.cpp,1.9,NONE tcTerrainView.cpp,1.12,NONE

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

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

Modified Files:
	Game.cpp 
Removed Files:
	tc3DViewer.cpp tcChatBox.cpp tcGameView.cpp tcHookInfo.cpp 
	tcMapView.cpp tcOOBView.cpp tcTerrainView.cpp 
Log Message:
Changes related to GDI+ replacement

--- tcChatBox.cpp DELETED ---

--- tcOOBView.cpp DELETED ---

--- tcGameView.cpp DELETED ---

--- tcMapView.cpp DELETED ---

--- tcTerrainView.cpp DELETED ---

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** Game.cpp	16 Sep 2004 02:24:50 -0000	1.97
--- Game.cpp	2 Oct 2004 22:41:33 -0000	1.98
***************
*** 499,516 ****
  		/* start view has to be initialized first so that we can
  		share its 2D surface with the other windows */
! 		InitializeStartView(); 
! 		//InitializeOptionsView();
  		InitializeCreditView();
! 		//InitializeNetworkView();
! 		//InitializeScenarioSelectView();
! 		//InitializeDisplaySettingsView();
  
  		tcMultiplayerInterface::Get()->SetEvtHandler(this);
  
  		/*** Init edit control  ***/
! 		editControl = new tcEditControl(glCanvas, wxPoint(200,200),wxSize(100,50));
  		editControl->SetActive(false);
  
! 		chatBox = new tcChatBox(glCanvas, NULL, wxPoint(200, 200), wxSize(300, 180));
  		chatBox->SetActive(false);
  		chatBox->MoveToTop();
--- 499,519 ----
  		/* start view has to be initialized first so that we can
  		share its 2D surface with the other windows */
! 
! 		InitializeDisplaySettingsView();
! 		InitializeOptionsView();
  		InitializeCreditView();
! 		InitializeStartView(); 
! 
! 		InitializeNetworkView();
! 		InitializeScenarioSelectView();
! 
  
  		tcMultiplayerInterface::Get()->SetEvtHandler(this);
  
  		/*** Init edit control  ***/
! 		editControl = new tcEditControl(viewer, wxPoint(200,200), wxSize(100,50));
  		editControl->SetActive(false);
  
! 		chatBox = new tcChatBox(viewer, wxPoint(200, 200), wxSize(300, 180), "ChatBox");
  		chatBox->SetActive(false);
  		chatBox->MoveToTop();
***************
*** 686,703 ****
  void tcGame::InitializeOptionsView()
  {
- #if 0
- 	wxASSERT(startView);
  
! 	optionsView = new tcOptionsView(glCanvas, startView, wxPoint(0,0), frameSize);
  
! 	optionsView->AttachOptions(tcOptions::Get());
  
! 	if (optionsView->Init() == false)
! 	{
! 		throw exception();
! 	}
  
  	optionsView->SetActive(false);
- #endif
  }
  
--- 689,700 ----
  void tcGame::InitializeOptionsView()
  {
  
! 	wxASSERT(viewer);
  
! 	optionsView = new tcOptionsView(viewer, wxPoint(0,0), frameSize, "OptionsView");
  
! 	optionsView->Init();
  
  	optionsView->SetActive(false);
  }
  
***************
*** 708,712 ****
  void tcGame::InitializeNetworkView()
  {
! 	//networkView = new tcNetworkView(glCanvas, startView, wxPoint(0,0), frameSize);
  }
  
--- 705,711 ----
  void tcGame::InitializeNetworkView()
  {
! 	wxASSERT(viewer);
! 
! 	networkView = new tcNetworkView(viewer, wxPoint(0,0), frameSize, "NetworkView");
  }
  
***************
*** 796,803 ****
  void tcGame::InitializeDisplaySettingsView()
  {
! //	wxASSERT(startView);
  
! //	displaySettingsView = 
! //		new tcDisplaySettingsView(glCanvas, startView, wxPoint(0,0), frameSize);
  }
  
--- 795,808 ----
  void tcGame::InitializeDisplaySettingsView()
  {
! 	wxASSERT(viewer);
  
!    // displaySettingsView =
! 	//	new tcDisplaySettingsView(viewer, wxPoint(0,0), frameSize, "DisplaySettings");
! 	wxSize viewerSize = viewer->GetSize();
! 
!     displaySettingsView =
! 		new tcDisplaySettingsView(viewer, wxPoint(0,0), viewerSize, "DisplaySettings");
! 
! 	displaySettingsView->SetActive(false);
  }
  
***************
*** 808,816 ****
  void tcGame::InitializeScenarioSelectView()
  {
! #if 0
! 	wxASSERT(startView);
  
  	scenarioSelectView = 
! 		new tcScenarioSelectView(glCanvas, startView, wxPoint(0,0), frameSize);
  
  	if (scenarioSelectView->Init() == false)
--- 813,820 ----
  void tcGame::InitializeScenarioSelectView()
  {
! 	wxASSERT(viewer);
  
  	scenarioSelectView = 
! 		new tcScenarioSelectView(viewer, wxPoint(0,0), frameSize, "ScenarioSelect");
  
  	if (scenarioSelectView->Init() == false)
***************
*** 820,824 ****
  
  	scenarioSelectView->SetActive(false);
- #endif
  }
  
--- 824,827 ----
***************
*** 1317,1325 ****
  	if (meScreenMode != lastMode)
  	{
- 		//optionsView->SetActive(false);
  		startView->SetActive(false);
  		creditView->SetActive(false);
! 		//scenarioSelectView->SetActive(false);
! 		//networkView->SetActive(false);
  		chatBox->SetActive(false);
  	}
--- 1320,1329 ----
  	if (meScreenMode != lastMode)
  	{
  		startView->SetActive(false);
+ 		optionsView->SetActive(false);
  		creditView->SetActive(false);
! 		displaySettingsView->SetActive(false);
! 		scenarioSelectView->SetActive(false);
! 		networkView->SetActive(false);
  		chatBox->SetActive(false);
  	}

--- tcHookInfo.cpp DELETED ---

--- tc3DViewer.cpp DELETED ---