[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.120,1.121 gcb.cpp,1.17,1.18 tcMapData.cpp,1.14,1.15 tcCustomControl.cpp,1.5,NONE tcEditControl.cpp,1.7,NONE

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

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

Modified Files:
	Game.cpp gcb.cpp tcMapData.cpp 
Removed Files:
	tcCustomControl.cpp tcEditControl.cpp 
Log Message:
Final GDI+ removal

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** Game.cpp	16 Feb 2005 23:13:49 -0000	1.120
--- Game.cpp	20 Feb 2005 21:54:34 -0000	1.121
***************
*** 37,41 ****
  #include "wx/datetime.h"
  
- #include "tcCustomControl.h"
  #include "commandlist.h" // for custom command queue handler
  #include "tcCommandQueue.h"
--- 37,40 ----
***************
*** 157,161 ****
  	infoConsole->Print(s);
  	infoConsole->Draw();
- 	mpGraphicsEngine->RenderAll();
  }
  
--- 156,159 ----
***************
*** 467,472 ****
--- 465,472 ----
  
  		/*** Init edit control  ***/
+         /*
  		editControl = new tcEditControl(glCanvas, wxPoint(200,200), wxSize(100,50));
  		editControl->SetActive(false);
+         */
  
  		chatBox = new tcChatBox(glCanvas, wxPoint(200, 200), wxSize(300, 180), "ChatBox");
***************
*** 679,683 ****
  
  	messageCenter = new tcMessageCenter(glCanvas, wxPoint(0,0), frameSize, "MessageCenter");
!     messageCenter->SetBaseRenderBin(30);
  
      tcMessageInterface::SetMessageCenter(messageCenter);
--- 679,683 ----
  
  	messageCenter = new tcMessageCenter(glCanvas, wxPoint(0,0), frameSize, "MessageCenter");
!     messageCenter->SetBaseRenderBin(40);
  
      tcMessageInterface::SetMessageCenter(messageCenter);
***************
*** 705,709 ****
  		wxSize(mnBriefingWidth, leftConsoleHeight), "xml/briefing_left.xml") ;
  
! 	briefingConsoleLeft->SetBaseRenderBin(20);
  
  	if (!briefingConsoleLeft)
--- 705,709 ----
  		wxSize(mnBriefingWidth, leftConsoleHeight), "xml/briefing_left.xml") ;
  
! 	briefingConsoleLeft->SetBaseRenderBin(30);
  
  	if (!briefingConsoleLeft)
***************
*** 852,856 ****
  		wxSize(mrectWorldMap.right - mrectWorldMap.left - 1, 
  		mrectWorldMap.bottom - mrectWorldMap.top - 1));
! 	worldMap->SetBaseRenderBin(20);
  
  	if (!worldMap)
--- 852,856 ----
  		wxSize(mrectWorldMap.right - mrectWorldMap.left - 1, 
  		mrectWorldMap.bottom - mrectWorldMap.top - 1));
! 	worldMap->SetBaseRenderBin(25);
  
  	if (!worldMap)
***************
*** 881,885 ****
  		wxPoint(mrectLowerLeft.left, mrectLowerLeft.top), wxSize(200,200),
  		"xml/info_console.xml", "InfoConsole");
! 	infoConsole->SetBaseRenderBin(20);
  	infoConsole->LoadBackgroundImage("start_background.jpg");
  	messageConsole = infoConsole;
--- 881,885 ----
  		wxPoint(mrectLowerLeft.left, mrectLowerLeft.top), wxSize(200,200),
  		"xml/info_console.xml", "InfoConsole");
! 	infoConsole->SetBaseRenderBin(30);
  	infoConsole->LoadBackgroundImage("start_background.jpg");
  	messageConsole = infoConsole;
***************
*** 901,905 ****
  	hookInfo = new tcHookInfo(glCanvas, wxPoint(mrectLowerLeft.right,mrectLowerLeft.top),
  		wxSize(200,200));
! 	hookInfo->SetBaseRenderBin(20);
  	if (!hookInfo)
  	{
--- 901,905 ----
  	hookInfo = new tcHookInfo(glCanvas, wxPoint(mrectLowerLeft.right,mrectLowerLeft.top),
  		wxSize(200,200));
! 	hookInfo->SetBaseRenderBin(30);
  	if (!hookInfo)
  	{
***************
*** 925,929 ****
  
  	objectControl->LoadBackgroundImage("console_b.jpg");
! 
  	objectControl->AttachUserInfo(&mcUserInfo);
  
--- 925,929 ----
  
  	objectControl->LoadBackgroundImage("console_b.jpg");
!     objectControl->SetBaseRenderBin(30);
  	objectControl->AttachUserInfo(&mcUserInfo);
  
***************
*** 951,955 ****
  	popupControl = new tcPopupControl(glCanvas, wxPoint(1400, 400), 
  		wxSize(400, 400));
! 	popupControl->SetBaseRenderBin(30);
  	if (!popupControl)
  	{
--- 951,955 ----
  	popupControl = new tcPopupControl(glCanvas, wxPoint(1400, 400), 
  		wxSize(400, 400));
! 	popupControl->SetBaseRenderBin(40);
  	if (!popupControl)
  	{
***************
*** 993,998 ****
  #endif
  
- 	tcCustomControl::AttachCommandInterface(commandQueue);
- 	tcCustomControl::InitGdi();
  
  
--- 993,996 ----
***************
*** 1033,1037 ****
  	briefingConsoleLeft->Clear();
  
- 	tcCustomControl::ReleaseGdi();
  }
  
--- 1031,1034 ----
***************
*** 1431,1435 ****
  
  	viewer->Update(gameDateZulu);
! 	//mpGraphicsEngine->RenderAll();
  	viewer->Frame();
  
--- 1428,1432 ----
  
  	viewer->Update(gameDateZulu);
! 
  	viewer->Frame();
  
***************
*** 1778,1783 ****
  	if ((directorTime > 0.1f) && doRender)
  	{
- 		if (enableGraphicsEngine) mpGraphicsEngine->RenderAll();
- 
  		viewer->Frame();
  	}
--- 1775,1778 ----
***************
*** 1816,1829 ****
  bool tcGame::Finish()
  {
- //	mpGraphicsEngine->DeleteAllSurfaces();
- 	/*
- 	if (mpGraphicsEngine != NULL)
- 	{
- 	delete mpGraphicsEngine;
- 	}
- 	*/
- 
  	tcSound::Get()->UnInit();
- 	tcCustomControl::ReleaseGdi();
  
  	if (director) delete director;
--- 1811,1815 ----
***************
*** 2456,2460 ****
  	tacticalMap = NULL;
  	worldMap = NULL;
- 	editControl = NULL;
  	optionsView = NULL;
  	hookInfo = NULL;
--- 2442,2445 ----

Index: tcMapData.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcMapData.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tcMapData.cpp	2 Nov 2004 04:23:57 -0000	1.14
--- tcMapData.cpp	20 Feb 2005 21:54:35 -0000	1.15
***************
*** 1138,1142 ****
  	if (apData == NULL) {return;}
  
- 
  	// create map image using map data
  
--- 1138,1141 ----
***************
*** 1170,1174 ****
  				}
  				apData[(M-1-m)*N + n] = pval + nAlphaOffset;
- 				//apWindow->SetPixel(n,M-1-m,pval + nAlphaOffset);
  			}
  		}
--- 1169,1172 ----

Index: gcb.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/gcb.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** gcb.cpp	28 Dec 2004 23:51:25 -0000	1.17
--- gcb.cpp	20 Feb 2005 21:54:35 -0000	1.18
***************
*** 35,39 ****
  #include "tcDisplayModes.h"
  
- using namespace Gdiplus;
  
  IMPLEMENT_APP(GcbApp)
--- 35,38 ----
***************
*** 172,176 ****
  	{
  		SetWorkingDirectory();
- 		InitializeGdiPlus();
  
  	    // Reassign stderr and stdout
--- 171,174 ----
***************
*** 214,219 ****
      WTL("FCLOSE"); // special string to close file
  
- 	GdiplusShutdown(mgdiplusToken);
- 
      return wxApp::OnExit();
  }
--- 212,215 ----
***************
*** 252,264 ****
  }
  
- /**
-  * Initializes GDI+.
-  */
- void GcbApp::InitializeGdiPlus()
- {
-     GdiplusStartupInput gdiplusStartupInput;
- 
-     GdiplusStartup(&mgdiplusToken, &gdiplusStartupInput, NULL);
- }
  
  /**
--- 248,251 ----
***************
*** 267,279 ****
  void GcbApp::InitializeGameFrame()
  {
-     /*
-     if (gameFrame == NULL)
-     {
-     wxMessageBox("Failed to create the game frame.");
-     WTL("Failed to create the game frame.");
- 
-     throw exception();
-     }
-     */
      try
      {
--- 254,257 ----

--- tcEditControl.cpp DELETED ---

--- tcCustomControl.cpp DELETED ---